From 3cbb3d9054db0bb61cf1f3a4b46fe12504d8f0ea Mon Sep 17 00:00:00 2001 From: n2232 Date: Wed, 30 Mar 2011 06:06:04 +0000 Subject: [PATCH] =?UTF-8?q?=E2=96=A0SDK2.2=201.31=20wifi=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81=20=E3=83=81=E3=83=A3?= =?UTF-8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0=E9=99=A4=E5=8E=BB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=20=E8=A9=A6=E9=81=8A=E5=8F=B0HOME=E4=B8=8D=E5=85=B7?= =?UTF-8?q?=E5=90=88=E5=9B=9E=E9=81=BF=E3=81=AE=E9=80=94=E4=B8=AD?= 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@326 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/config.h | 2 +- trunk/hoge.bin | Bin 16387 -> 16387 bytes trunk/pedo_alg_thre_det2.c | 2 +- trunk/sw.c | 28 +++++++++++++++++++++++++++- trunk/vreg_ctr.c | 2 +- trunk/yav_mcu_bsr.prj | 2 +- trunk/yav_mcu_bsr.prk | 16 +++++++++------- 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/trunk/config.h b/trunk/config.h index 85eabd5..89d36ee 100644 --- a/trunk/config.h +++ b/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_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index c55888cae445044bbbc6a82befced918e646a51a..8e348e57f77d073e3292199bcc1f813bbd2ac1e7 100644 GIT binary patch delta 3858 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 diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index a75ce12..b32a0cf 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/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 ); diff --git a/trunk/sw.c b/trunk/sw.c index 64772a0..216f6df 100644 --- a/trunk/sw.c +++ b/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 ); diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index ec14457..9adc116 100644 --- a/trunk/vreg_ctr.c +++ b/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++ ) diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 400c5ae..98c2151 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/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 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 7fb3233..03e2d63 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/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