■SDK2.2

1.31
wifi不良スイッチ チャタリング除去追加
試遊台HOME不具合回避の途中


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@326 013db118-44a6-b54f-8bf7-843cb86687b1

trunk/config.h

@@ -19,7 +19,7 @@
 
 
 #define MCU_VER_MAJOR    0x01
-#define MCU_VER_MINOR    0x30
+#define MCU_VER_MINOR    0x31
 
 // ↑改訂の時は↓気をつけないと体験台の生産できないからね！
 #ifdef _TAIKENDAI_SEISAN_SPECIAL_

trunk/pedo_alg_thre_det2.c

@@ -453,7 +453,7 @@ static u16 get_long_hour()
     // 時・分境界の前？後？
     if( ( min_bcd > vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] )
         || ( ( min_bcd >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] )
-                && ( sec_bcd > vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC ] ))
+                && ( sec_bcd >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC ] ))
         )
     {
         return( long_hour );

trunk/sw.c

@@ -23,6 +23,7 @@
 #define FORCEOFF_THREASHOLD (u8)( 4000 / INTERVAL_TSK_SW )
 */
 #define TIME_MUKAN  (u8)( 300 / INTERVAL_TSK_SW )
+#define TIME_MUKAN_HOME  (u16)( 5000 / INTERVAL_TSK_SW )
 
 //=========================================================
 u16     SW_pow_count;
@@ -35,6 +36,9 @@ bit     SW_HOME_n;
 
 u16     off_timeout_timer;
 
+
+u16     sw_home_mukan_time;
+
 //=========================================================
 // 押した時間を数える。押しっぱなしでも0に戻らない
 // maskが非0の時は、一度離すまで無視する
@@ -141,7 +145,29 @@ void tsk_sw(  )
             default:
                 SW_HOME_n = 1;  // 放されてる状態
         }
-//		if( !( system_status.taikendai || system_status.taikendai_nbd ))
+#if 0
+        if( system_status.taikendai )
+        {
+// ここから
+            if( sw_home_mukan_time != 0 )
+            {
+                sw_home_mukan_time--;
+            }
+            else
+            {
+                
+                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 );
+                
+                if( SW_wifi_count == CLICK_THRESHOLD +1 ) // 押した判定発生！
+                {
+                    sw_home_mukan_time = TIME_MUKAN_HOME;
+                }
+            }
+            // ここまで
+        }
+        else
+#endif
         {
             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 );

trunk/vreg_ctr.c

@@ -80,7 +80,7 @@ void vreg_ctr_reset(  )
     vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20;
     vreg_ctr[ VREG_C_VOL_OPTION ] = 0;
 //    vreg_ctr[ VREG_C_VOL_CAL_MIN ] = 0x36;            ここで書いちゃダメ！
-//    vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36;
+//    vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36;     電源入れるたびにデフォルト値になってしまう
     {
         u8 i;
         for( i = 0; i < sizeof( uni_info_LED ); i++ )

trunk/yav_mcu_bsr.prj

@@ -840,7 +840,7 @@ G=1
 E=0
 E0=flash.elk
 E1=a.elk
-GO=0
+GO=1
 GOValue=85
 GOStart=FC00
 GOSizeValue=1024

trunk/yav_mcu_bsr.prk

@@ -1,7 +1,7 @@
 [ProjectManager]
 FrameMax=0
-FrameX=110
-FrameY=50
+FrameX=1936
+FrameY=64
 FrameCX=1435
 FrameCY=1045
 OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0
@@ -9,13 +9,15 @@ OpenFile2=self_flash.c,0,352,352,1596,1078,0,142,5,0
 OpenFile3=ini_VECT.c,0,330,330,1574,1056,6,93,6,0
 OpenFile4=renge\renge.c,0,348,332,1592,1058,0,31,0,0
 OpenFile5=renge\renge.h,0,264,264,1508,990,3,4,3,0
-OpenFile6=ProjectWindow
+OpenFile6=vreg_twl.c,0,225,225,1340,826,0,70,0,0
+OpenFile7=task_debug.c,0,275,275,1390,876,0,1,0,0
+OpenFile8=config.h,0,390,41,1505,642,29,21,29,0
+OpenFile9=pedo_alg_thre_det2.c,0,72,264,1187,865,0,406,0,0
+OpenFile10=ProjectWindow
 PrjPos=0,0,706,0,291
-OpenFile7=vreg_twl.c,0,225,225,1340,826,0,70,0,0
-OpenFile8=pedo_alg_thre_det2.c,0,72,264,1187,865,55,396,55,0
-OpenFile9=OutputWindow
+OpenFile11=sw.c,0,250,250,1365,851,0,171,11,0
+OpenFile12=OutputWindow
 OutputPos=0,34,740,376,1323
-OpenFile10=config.h,0,225,225,1340,826,6,17,6,0
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0