From f8af9cb24638b858ee7d826780d2c5dce76941e9 Mon Sep 17 00:00:00 2001 From: n2232 Date: Tue, 15 Feb 2011 08:09:43 +0000 Subject: [PATCH] =?UTF-8?q?=E6=AD=A9=E6=95=B0=E8=A8=88=E3=83=90=E3=82=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E3=83=BB=E6=AF=8E=E6=99=82=E4=B8=80?= =?UTF-8?q?=E6=AD=A9=E7=9B=AE=E3=81=AE=E6=99=82=E3=81=AB=E7=B4=AF=E8=A8=88?= =?UTF-8?q?=E3=81=AE=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AA=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=20=E3=83=BB=E5=86=85=E9=83=A8=E3=81=A7=E5=B9=B4=E3=81=AE?= =?UTF-8?q?=E6=AF=94=E8=BC=83=E3=82=92=E8=AA=A4=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=80=822021=E5=B9=B4=E3=81=AB=E3=83=90=E3=82=B0?= =?UTF-8?q?=E3=81=8C=E7=99=BA=E8=A6=9A=E3=81=99=E3=82=8B=E3=81=AE=E3=82=92?= =?UTF-8?q?=E5=9B=9E=E9=81=BF=E3=81=A7=E3=81=8D=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 充電ICの不具合（仕様）の回避 ・アダプタを抜いた瞬間に電池残量100%で充電完了　となってしまうのを回避。 　SoCへ通知するステータスもケア済み git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@312 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/config.h | 2 +- trunk/hoge.bin | Bin 16387 -> 16387 bytes trunk/jhl_defs.h | 2 -- trunk/led.c | 7 +++- trunk/pedo_alg_thre_det2.c | 36 +++++++++++-------- trunk/pm.c | 69 ++++++++++++++++++++++--------------- trunk/pm.h | 2 +- trunk/task_misc.c | 6 ++-- trunk/task_sys.c | 2 +- 9 files changed, 74 insertions(+), 52 deletions(-) diff --git a/trunk/config.h b/trunk/config.h index 4417db6..956ddf0 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -15,7 +15,7 @@ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x1B +#define MCU_VER_MINOR 0x1C #define _firm_format_v3_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 94163ffc190704578aa9d0a82ddfce53ba5b3473..7da6b52ba5f768193b235f29b00be826b7f871fe 100644 GIT binary patch delta 3835 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 delta 3677 zcmZ`+3vd)g8s3@NN3wZsvLTyy=COJ3NHVk8ytB#X1(8Iu1U(d@upvh{E+us0VO0cz zno>mW7U+8@mf3jfsdacBqL#4~61*Z>DiQ8d3mlu}-~>HtYXa7$7SMKK_W@d;Y^nvTgbGro!4`V^E& zo%T}~#R_1&?0OwNuRZNIV2}UO6%f=BqyB3ucA#QRjCMK4U5RJ_UW#UKE9h~T2@M=c zG`3JB-R*WBiMqrWUV8HlOVh#jK&XtAc&yTXrO~{(EFjfu${udFZ@hzf_{iS41!UZs z_C)tc-`FtfI&s{$AG9V3LX}{v;%yquJa;6<FEpMBAsef|HlSIybC&f8&J%1~TZzSDvO ztsk*S!7MnO@)7YeTy1H^^fgN^u^E10`J2&pnD!$%N--c$)=vz`87fD1spCs^MV!XNO315N^o+m?(kS zIhjNwtj@_E{Hj=VAhB4iIIEGz|I&*xipG90AMFJkBj(QBqez~`29^XgIjiHZ>Y{e-~Tw}m#0(3`tQnYLvy~?@;5KX7;Ctnq`$lk6>0!=&DY&IH7YjQ}tp*ML zcb^HqS8k2bV3oI2L0wkq5tZ&KSD?cxZ7(~Vi@{sVtQrNpqf7zgPf3m9^bJ+~P^A+; z;m;`iVDNiYbwj1;>SFR#YEx$v5bmDiwiC1a|h?p}rAUPaD5in~OZn9r;}S`L!fp3Xt9 zNya`^zRsJd@I9S%-lRDu$7`0wC;9j~WeeU^S=_>ZQLFN4vbcf2I>%?q;%arXE72bK ze11M*f`{`hU^c9JKv``BGD}u##wi+ZL{Cx3l%2g!Qz@-V0&RGT9pmmpReI*<~{NpxV7>t9uW+ zSv_{PO}-`+ulKgfo~3eotL%>h4XmeC_AZqt?~^I#eX?%a$X8b(6SOXJF5{~`x5AyK zQ~p>5OyM@74nAEtMSKV! zDk>%7;ctqvadm#DsF-*Q`iuTfjKIUi7H-7JXJ{G*k>UZ>PE*Dzrn!HKxp@1OJ#d@Xh!(f;XKd)Zt6;h|oYBgChb%*x+%Y z371cUt(?Bz$oVsr`Y_X=(8n4T`l(9yH3h{+_^2(rxsMH6n%^Cen{axc!R)u31XwQA zi9+G9(jVeBLgJjcctz2;hYYb2#vmr&`EB^+=^r(4+?EozeDP`j9nHUO3|+8T0Y6fR zJ}m^xUqQzz&?>`aSiK+iTSk6g1s z&>E=Qi^uNB*wmTZ;BE!&(%}XOdsCM1KR&@9P7*Q|BIS@)1~z84p*Mn`AWQS?v0XAK zuu7p+8Q~N+6r=YGQBo0TeI@i=IP`ru^q+9(Y8W@c%k8?%%SKxEl9?fesuVG_1oNDCj4Yt}#icbYG1m?(uMcIBRDJ4yKk0Bo1L~ zX_hi8MRxtxRT=1;U9TAq<|9FRBdkpr{uz9=8tC!gId zUn8`6Qu5nPkw`#$c~mU>iRxCwpATCr%FJDym@~V~pE0sqcJ7wnIivmW0O2ySzEl zqz#e4<!Mk~KzbBd4ib;47&KRWkBTi~I(`}gn4G|vA<(P;h) DX#-?m diff --git a/trunk/jhl_defs.h b/trunk/jhl_defs.h index ca5b913..e6cd773 100644 --- a/trunk/jhl_defs.h +++ b/trunk/jhl_defs.h @@ -97,8 +97,6 @@ unsigned char MIN; unsigned char SEC; - - # endif #endif diff --git a/trunk/led.c b/trunk/led.c index ec2f820..e1414e9 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -70,6 +70,10 @@ u8 frame_sleep; st_LED_dim_status LED_dim_status_sleep; +// [dۂ +extern bit BT_IN_CHG_delayed_n; + + // ======================================================== #define led_fade_to( now, goal ) now = fade_to( now, goal ) @@ -382,7 +386,8 @@ static u8 led_pow_batt_low() // ܂ } - if(( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_EMPTY ) || !BT_IN_CHG_n ) + if(( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_EMPTY ) || !BT_IN_CHG_delayed_n ) + // drcʂ5%i`10%j@܂́Aꖢł[d { // ԓ_ led_fade_to( LED_duty_pow_blu, 0 ); diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index 7aaa887..b5d731d 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -201,7 +201,7 @@ void pedometer() static void hosu_increment_if_necessary() { - u8 year_compd; // hourE␳ς݌ݔNBcomp(ensation) + u8 year_compd; // hourE␳ς݌ݔNBcomp(ensation -ed) // ݎ擾 DI(); @@ -225,7 +225,7 @@ static void hosu_increment_if_necessary() // ݃|C^̍XV if( ! ( vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 && // vonAŏ̈܂ł͑O񂩂̌oߎԂvZȂ vreg_ctr[ VREG_C_ACC_HOSU_M ] == 0 && - vreg_ctr[ VREG_C_ACC_HOSU_H ] == 0 )) //. SrbgorŃ[肷̂̓fW^H݂̕ + vreg_ctr[ VREG_C_ACC_HOSU_H ] == 0 )) //. SrbgORŃ[肷̂̓fW^H݂̕ { // v~܂ĂԂlĕKvȂi߂ // ␳vZ@U뎞ōɂȂꍇAA23ɏ㏑ @@ -249,25 +249,31 @@ static void hosu_increment_if_necessary() last_hour_fny = now_longhour; // O@CNg - if( pool.vreg_c_ext.pedo_log[ p_record ] == HOSU_NODATA ) // ̎ԑэŏ̃JEg̎ + if( pool.vreg_c_ext.pedo_log[ p_record ] == HOSU_MAX ) + { + // Ȃł܂ + //. v̍vƗ݌vȂȂ̂邽߂낤ǁAǂȂ́H + return; + } + else if( pool.vreg_c_ext.pedo_log[ p_record ] == HOSU_NODATA ) // ̎ԑэŏ̃JEg̎ { // ꂵȂ1Ȃ pool.vreg_c_ext.pedo_log[ p_record ] = 1; } - else if( pool.vreg_c_ext.pedo_log[ p_record ] != HOSU_MAX ) - { + else + { // ʏpX pool.vreg_c_ext.pedo_log[ p_record ] += 1; + } - // ݐς̍XV // - if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 ) //. 낢뎸s... + // ݐς̍XV // + if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 ) // JXg`FbN + { + if( ++vreg_ctr[ VREG_C_ACC_HOSU_M ] == 0 ) { - if( ++vreg_ctr[ VREG_C_ACC_HOSU_M ] == 0 ) - { - if( ++vreg_ctr[ VREG_C_ACC_HOSU_H ] == 0 ){ - vreg_ctr[ VREG_C_ACC_HOSU_L ] = 255; //. JXg orz - vreg_ctr[ VREG_C_ACC_HOSU_M ] = 255; - vreg_ctr[ VREG_C_ACC_HOSU_H ] = 255; - } + if( ++vreg_ctr[ VREG_C_ACC_HOSU_H ] == 0 ){ + vreg_ctr[ VREG_C_ACC_HOSU_L ] = 255; //. 낢뎸s... + vreg_ctr[ VREG_C_ACC_HOSU_M ] = 255; + vreg_ctr[ VREG_C_ACC_HOSU_H ] = 255; } } } @@ -495,7 +501,7 @@ static unsigned long my_sqrt(unsigned long x) static u16 calc_hours_spend( u8 year ) { // N̓ - if( cal_log_latest.year_bcd == year ) + if( bcdtob( cal_log_latest.year_bcd ) == year ) { if( now_longhour > last_hour_fny ) { diff --git a/trunk/pm.c b/trunk/pm.c index b4e96ea..5a6461d 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -24,14 +24,14 @@ u8 raw_adc_temperature; BT_VENDER battery_manufacturer = BT_VENDER_NOT_CHECKED; st_bt_comp bt_comp; // obep[^\ u8 reg_shadow; // NTR PMIC WX^~[ -bit bt_chg_ready; // obep[^MρB[dJn +bit bt_authorized; // obep[^MρB[dJn u8 chg_led_override; // A_v^ƂA[d邵ȂɊւ炸΂炭_ u16 bt_volt16; bit ntr_pm_bt_low_old; bit BT_CHG_STAT_Change; - +bit BT_IN_CHG_delayed_n; u8 pmic_version; u8 mgic_version[2]; @@ -128,7 +128,7 @@ void tsk_batt( ) } // WM0łCHG_ENABLEs /WL_RST ɔzĂA[d䂵Ȃ - if( !temp_zone_charge_disable && bt_chg_ready && !PM_EXTDC_n ) + if( !temp_zone_charge_disable && bt_authorized && !PM_EXTDC_n ) { BT_CHG_ENABLE(); // x͈OKŏ[dĊJ } @@ -139,27 +139,40 @@ void tsk_batt( ) // [d // // 荞݁B + // CCIC̕s̂߁A/CHG̃lQ[gƒJɒx { - static u8 anti_chatter; + static u8 anti_chatter; - if( BT_IN_CHG_n ) // [d*ĂȂ* (_킩Â炢ȁI) - { - anti_chatter = 0; - LED_CHARGE = 0; - } - else - { + if( !BT_IN_CHG_n ) + { + // Ƀ`^O if( anti_chatter < 2 ) // drŃA_v^āAdɂ킳 { // Ə[dLED̂ anti_chatter++; } - else - { - LED_CHARGE = 1; - } - } + else + { + BT_IN_CHG_delayed_n = 0; + } + } + else + { + // "Jɒx" todo:Ƃ@H + if( !BT_CHG_Ena_n && vreg_ctr[ VREG_C_BT_REMAIN ] < 60 ) + { + BT_IN_CHG_delayed_n = 0; // [dƈB[dIĂ͂Ȃ + } + else + { + BT_IN_CHG_delayed_n = 1; + anti_chatter = 0; + } + } + + LED_CHARGE = ( ! BT_IN_CHG_delayed_n )? 1: 0; // LEDɔf } + // A_v^‚ȂuԁA[dłb킴Ɠ_BdĂ邱Ƃ킩点邽߁B if( chg_led_override != 0 ){ // 猩΂킩邪Au(NbN)鎖BC‚l邩ȁcH chg_led_override -= 1; LED_CHARGE = 1; @@ -256,7 +269,7 @@ void BT_chk() BT_model_detect(); if( system_status.model != MODEL_JIKKI ) { - bt_chg_ready = false; + bt_authorized = false; return; // ܂ } @@ -274,7 +287,7 @@ void BT_chk() } BT_mgic_init(); // @픻s܂ } - bt_chg_ready = true; + bt_authorized = true; renge_task_immed_add( tski_BT_temp_update ); // drxĎX^[g } @@ -598,14 +611,14 @@ void BT_get_left(){ { // @ // u8 temp_v[2]; - u8 temp_force_fule_left; + u8 temp_force_fuel_left; // cʃ[h if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp_fuel ) != ERR_SUCCESS ) { // cICNACK cobe͂ꂽ vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR; - bt_chg_ready = false; + bt_authorized = false; vreg_ctr[ VREG_C_BT_REMAIN ] = 0; system_status.force_off = true; } @@ -638,27 +651,27 @@ void BT_get_left(){ if( bt_volt16 > V_TH_30 ) { - temp_force_fule_left = 100; + temp_force_fuel_left = 100; hysteresis = 0; } else if( bt_volt16 - hysteresis > V_TH_LO ) { - temp_force_fule_left = 30; + temp_force_fuel_left = 30; hysteresis = 0; } else if( bt_volt16 > V_TH_EMPTY ) { - temp_force_fule_left = BATT_TH_LO; // + temp_force_fuel_left = BATT_TH_LO; // hysteresis = 500; } else if( bt_volt16 > V_TH_ZERO ) { - temp_force_fule_left = BATT_TH_EMPTY; + temp_force_fuel_left = BATT_TH_EMPTY; hysteresis = 500; } else if( bt_volt16 > V_TH_FORCE_OFF ) { - temp_force_fule_left = 0; + temp_force_fuel_left = 0; hysteresis = 500; } else @@ -672,20 +685,20 @@ void BT_get_left(){ // [diA_v^hĂĵɏ[dĂȂ // AiȂƂjf̓drcʂ60%ȏiCCICoOj // = [dBdrւĂMGIC100%ԂȂ - if( !BT_CHG_Ena_n && BT_IN_CHG_n && vreg_ctr[ VREG_C_BT_REMAIN ] > 60 ){ + if( !BT_CHG_Ena_n && BT_IN_CHG_delayed_n ){ vreg_ctr[ VREG_C_BT_REMAIN ] = 100; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0; } else { // ȂɃLbv - if( temp_force_fule_left > temp_fuel[0] ) + if( temp_force_fuel_left > temp_fuel[0] ) { vreg_ctr[ VREG_C_BT_REMAIN ] = temp_fuel[0]; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp_fuel[1]; } else { - vreg_ctr[ VREG_C_BT_REMAIN ] = temp_force_fule_left; + vreg_ctr[ VREG_C_BT_REMAIN ] = temp_force_fuel_left; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0; } } diff --git a/trunk/pm.h b/trunk/pm.h index fd751e6..7cf1575 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -161,7 +161,7 @@ task_status_immed tski_PM_LCD_off(); task_status_immed tski_PM_BL_set(); -#define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); while( !BT_IN_CHG_n ){;}; LED_CHARGE = 0; bt_chg_ready = false; } +#define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); LED_CHARGE = 0; bt_authorized = false; } // @ĂԑOɁA݉xĂKv܂B diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 6f79c04..3c27c04 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -251,7 +251,7 @@ extern u8 raw_adc_temperature; extern u8 iic_burst_state; extern bit temp_zone_charge_disable; -extern bit bt_chg_ready; +extern bit bt_authorized; /* ======================================================== @@ -265,7 +265,7 @@ extern bit bt_chg_ready; 5) V 6) ( rcomp & 0xFF ) 7) raw_adc_temperature - 8) ( !temp_zone_charge_disable | ( bt_chg_ready << 1 ) ) + 8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ) 9) ======================================================== */ u8 extinfo_read() @@ -286,7 +286,7 @@ u8 extinfo_read() infos[4] = mgic_version[1]; infos[5] = (u8)( _dbg_rcomp & 0xFF ); infos[6] = raw_adc_temperature; - infos[7] = ( !temp_zone_charge_disable | ( bt_chg_ready << 1 ) ); + infos[7] = ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ); infos[8] = system_status.info_fullcolor; iic_burst_state++; diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 8729cea..1b3ce19 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -29,7 +29,7 @@ static void send_getup_to_soc(); //========================================================= extern bit info_led_off; extern bit going_to_sleep; -extern bit bt_chg_ready; +extern bit bt_authorized; static u8 timeout_sleep; extern u8 chg_led_override;