From 6c8ee1b510fdef1e34f8b14b90123d827ee575bb Mon Sep 17 00:00:00 2001
From: n2232 <n2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Tue, 15 Mar 2011 07:58:25 +0000
Subject: [PATCH] =?UTF-8?q?SDK2.x=E5=90=91=E3=81=91=20V1.30=20=EF=BC=88?=
 =?UTF-8?q?=E6=B5=81=E5=87=BA=E3=81=97=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=EF=BC=89=E4=B8=8D=E8=89=AF=E7=84=A1=E7=B7=9ASW?=
 =?UTF-8?q?=E3=81=AE=E3=83=81=E3=83=A3=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C=20IS=E3=83=87=E3=83=90=E3=83=83=E3=82=AC?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@325 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/batt_params.h |  11 ++++++----
 trunk/bsr_system.h  |   3 ++-
 trunk/config.h      |   6 ++++--
 trunk/hoge.bin      | Bin 16387 -> 16387 bytes
 trunk/loader.c      |  48 +++++++++++++++++++++++------------------
 trunk/sw.c          |  51 ++++++++++++++++++++++++++++----------------
 trunk/sw.h          |   2 +-
 trunk/task_misc.c   |   3 ++-
 8 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/trunk/batt_params.h b/trunk/batt_params.h
index 1356f41..31d565d 100644
--- a/trunk/batt_params.h
+++ b/trunk/batt_params.h
@@ -17,7 +17,7 @@ const u8 BT_PARAM[][64] = {
         0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00
         },
     { // ID = 1 120 ohm  （ダミーでマクセル）
-        0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30,
+		0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30,
         0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10,
         0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0,
         0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10,
@@ -25,7 +25,7 @@ const u8 BT_PARAM[][64] = {
         0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70,
         0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0,
         0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00
-    },
+	},
     { // ID = 2 360 hom  （ダミーでマクセル）
         0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30,
         0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10,
@@ -65,8 +65,10 @@ const u8 BT_PARAM[][64] = {
         0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00,
         0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0,
         0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0
-        },
+        }
+		/*,
     { // ID = 6 8.2kohm　（ダミーでパナ）
+	ROM不足のため、埋蔵金を使うことになりました。
         0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40,
         0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10,
         0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50,
@@ -76,7 +78,8 @@ const u8 BT_PARAM[][64] = {
         0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0,
         0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0
     }
-    // ID = 7 白箱
+*/
+		// ID = 7 白箱
     /// パラメータ無し
 };
 
diff --git a/trunk/bsr_system.h b/trunk/bsr_system.h
index a79e76d..75bfcb4 100644
--- a/trunk/bsr_system.h
+++ b/trunk/bsr_system.h
@@ -28,7 +28,7 @@ enum model_
   MODEL_SHIROBAKO,
   MODEL_JIKKI_NOBATT,
   MODEL_CAPTURE_BOX,
-  MODEL_RESERVED2,
+  MODEL_ISBAKO,         // ただし、system_status.modelは MODEL_JIKKI にしておくので未使用
   MODEL_RESERVED3,
 };
 
@@ -43,6 +43,7 @@ typedef struct _system_status_
   unsigned char captureBox:1;         // キャプチャ箱 SDKには実機と返す
   unsigned char taikendai:1;
   unsigned char taikendai_nbd:1;
+  unsigned char is_dev:1;
   enum model_   model;
 }system_status_;
 
diff --git a/trunk/config.h b/trunk/config.h
index 500bcd4..85eabd5 100644
--- a/trunk/config.h
+++ b/trunk/config.h
@@ -17,9 +17,11 @@
 //  一時ファーム
 
 
-#define MCU_VER_MAJOR    0x01
-#define MCU_VER_MINOR    0x20
 
+#define MCU_VER_MAJOR    0x01
+#define MCU_VER_MINOR    0x30
+
+// ↑改訂の時は↓気をつけないと体験台の生産できないからね！
 #ifdef _TAIKENDAI_SEISAN_SPECIAL_
 #define MCU_VER_MINOR    0x80
 #endif
diff --git a/trunk/hoge.bin b/trunk/hoge.bin
index 40c6a8e1d067fd6d5e6789317d1175798cce9f23..c55888cae445044bbbc6a82befced918e646a51a 100644
GIT binary patch
delta 5066
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
Y&OYIMPn(6lTr_8IQ@n2S-K<djAG{Yq?*IS*

delta 4963
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
NRnE{&K5i9?{{zRu0OSAw

diff --git a/trunk/loader.c b/trunk/loader.c
index 28fe63f..577564c 100644
--- a/trunk/loader.c
+++ b/trunk/loader.c
@@ -103,8 +103,8 @@ void main(  )
         {
             // 通常の電源投入
             // 電池接続時、ちょっと待ってみる(チャタリング対策)
-            u16      pwup_delay0 = 0;
-            for( pwup_delay0 = 0; pwup_delay0 != 0xFFFF; pwup_delay0++ ){};
+            u16      pwup_delay0;
+            for( pwup_delay0 = 0xFFFF; pwup_delay0 != 0; pwup_delay0-- ){;};
         }
 
         hdwinit2(  );
@@ -137,32 +137,38 @@ void main(  )
 
         // 試遊台判定 
         //  デバッガつないでると上手に判定できないことがあります。
+        if( !DIPSW_0 && !DIPSW_1 )
+		{
+            system_status.is_dev = 1;
+		}
+		else
+		{
 #ifndef _FORCE_TAIKENDAI_
-        if( !DIPSW_0 )
+	        if( !DIPSW_0 )
 #else
-        if(1)
+		    if(1)
 #endif
-        {
-            system_status.taikendai = 1;
-        }
-        else
-        {
-            system_status.taikendai = 0;
-        }
+			{
+				system_status.taikendai = 1;
+			}
+			else
+			{
+				system_status.taikendai = 0;
+			}
 
 #ifndef _FORCE_TAIKENDAI_NBD_
-        if( !DIPSW_1 )
+			if( !DIPSW_1 )
 #else
-        if(1)
+	        if(1)
 #endif
-        {
-            system_status.taikendai_nbd = 1;
-        }
-        else
-        {
-            system_status.taikendai_nbd = 0;
-        }
-
+			{
+				system_status.taikendai_nbd = 1;
+			}
+			else
+			{
+				system_status.taikendai_nbd = 0;
+			}
+		}
 		// 通常運転
         main_loop(  );
     }
diff --git a/trunk/sw.c b/trunk/sw.c
index 1edc228..64772a0 100644
--- a/trunk/sw.c
+++ b/trunk/sw.c
@@ -22,12 +22,14 @@
 #define HOLD_THREASHOLD     (u8)( 2000 / INTERVAL_TSK_SW )
 #define FORCEOFF_THREASHOLD (u8)( 4000 / INTERVAL_TSK_SW )
 */
+#define TIME_MUKAN  (u8)( 300 / INTERVAL_TSK_SW )
 
 //=========================================================
 u16     SW_pow_count;
 bit     SW_pow_mask;
 
 u8      SW_home_count, SW_wifi_count, SW_home_count_rel;
+u8      sw_wifi_mukan_time;
 
 bit     SW_HOME_n;
 
@@ -61,13 +63,14 @@ u16     off_timeout_timer;
         }                                             \
         if( count == CLICK_THRESHOLD )                \
         {                                             \
+            count += 1;                               \
             set_irq( VREG_C_IRQ0, irq_bit_name );     \
         }                                             \
     }                                                 \
     else                                              \
     {                                                 \
         count = 0;                                    \
-    }
+    }                                             
 
 
 
@@ -108,20 +111,20 @@ void tsk_sw(  )
         else if( SW_pow_count == ( HOLD_THREASHOLD ) )
         {
             set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD );
-			if( off_timeout_timer == 0 )
-			{
-				off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16;
-			}
+            if( off_timeout_timer == 0 )
+            {
+                off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16;
+            }
         }
 
-		if( off_timeout_timer != 0 )   // 長押し割り込み後、タイムアウトで強制オフ。
-		{
-			off_timeout_timer -= 1;
-			if( off_timeout_timer == 1 )
-			{
-	            system_status.force_off = true;
-			}
-		}
+        if( off_timeout_timer != 0 )   // 長押し割り込み後、タイムアウトで強制オフ。
+        {
+            off_timeout_timer -= 1;
+            if( off_timeout_timer == 1 )
+            {
+                system_status.force_off = true;
+            }
+        }
 
         count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask );        // ボタン押し時間のカウント
 
@@ -139,11 +142,23 @@ void tsk_sw(  )
                 SW_HOME_n = 1;  // 放されてる状態
         }
 //		if( !( system_status.taikendai || system_status.taikendai_nbd ))
-		{
-			chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK );
-			chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE );
-		}
+        {
+            chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK );
+            chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE );
+        }
         // wifi sw //
-        chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK );
+        /// 最悪な実装なのはわかっているが、メモリ不足と、市場に出てしまった不良スイッチを救うため
+        if( sw_wifi_mukan_time != 0 )
+        {
+            sw_wifi_mukan_time--;
+        }
+        else
+        {
+            chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK );
+            if( SW_wifi_count == CLICK_THRESHOLD +1 ) // 押した判定発生！
+            {
+                sw_wifi_mukan_time = TIME_MUKAN;
+            }
+        }
     }
 }
diff --git a/trunk/sw.h b/trunk/sw.h
index 88aaea1..a520355 100644
--- a/trunk/sw.h
+++ b/trunk/sw.h
@@ -7,7 +7,7 @@ extern u16     SW_pow_count;
 extern bit     SW_pow_mask;
 
 #define INTERVAL_TSK_SW  8
-#define CLICK_THRESHOLD  2
+#define CLICK_THRESHOLD  5
 
 #define HOLD_THREASHOLD     (u16)( 3000 /INTERVAL_TSK_SW )
 #define TIME_PWSW_CLICK     (u8)(   220 /INTERVAL_TSK_SW )
diff --git a/trunk/task_misc.c b/trunk/task_misc.c
index 3c27c04..929b024 100644
--- a/trunk/task_misc.c
+++ b/trunk/task_misc.c
@@ -279,7 +279,8 @@ u8 extinfo_read()
 
 	// static でとるほどのものでないので毎回スタックからとってくる
     //  switchとかにするとromが困る... なんだかなぁ。
-    infos[0] = system_status.captureBox? MODEL_CAPTURE_BOX: (u8)system_status.model;
+    infos[0] = system_status.captureBox? MODEL_CAPTURE_BOX
+		: ( system_status.is_dev? MODEL_ISBAKO: (u8)system_status.model );
     infos[1] = pmic_version;
     infos[2] = battery_manufacturer; 
     infos[3] = mgic_version[0];