From c7972ac35c9d24e67bf423e908bedb495cd27538 Mon Sep 17 00:00:00 2001 From: n2232 Date: Thu, 10 Feb 2011 02:13:26 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=81=8D=E3=82=8F=E3=81=A9=E3=81=84?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=81=A7=E3=82=A2?= =?UTF-8?q?=E3=83=80=E3=83=97=E3=82=BF=E3=82=92=E6=8A=9C=E3=81=8D=E5=B7=AE?= =?UTF-8?q?=E3=81=97=E3=81=99=E3=82=8B=E3=81=A8=E3=80=81=E3=82=A2=E3=83=80?= =?UTF-8?q?=E3=83=97=E3=82=BF=E3=81=8C=E5=88=BA=E3=81=95=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=82=8B=E3=81=AE=E3=81=AB=E5=85=85=E9=9B=BB=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=80=82=E4=BF=AE=E6=AD=A3=20=E3=83=BB=E9=9B=BB?= =?UTF-8?q?=E6=B1=A0=E6=AE=8B=E9=87=8F=E3=81=8C=E5=B0=91=E3=81=AA=E3=81=84?= =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=81=A7=E3=82=A2=E3=83=80=E3=83=97=E3=82=BF?= =?UTF-8?q?=E3=82=92=E5=88=BA=E3=81=97=E3=80=81=E5=85=85=E9=9B=BB=E3=81=8C?= =?UTF-8?q?=E5=8D=81=E5=88=86=E3=81=A7=E3=81=AA=E3=81=84=E3=81=86=E3=81=A1?= =?UTF-8?q?=E3=81=AB=E3=82=A2=E3=83=80=E3=83=97=E3=82=BF=E3=82=92=E6=8A=9C?= =?UTF-8?q?=E3=81=8F=E3=81=A8=E4=B8=80=E7=9E=AC=E9=9B=BB=E6=B1=A0=E6=AE=8B?= =?UTF-8?q?=E9=87=8F=E3=81=8C100%=E3=81=AB=EF=BC=88LED=E3=82=82=E9=9D=92?= =?UTF-8?q?=E3=81=AB=EF=BC=89=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= 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@310 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/config.h | 2 +- trunk/hoge.bin | Bin 16387 -> 16387 bytes trunk/pm.c | 6 ++++-- trunk/task_sys.c | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/trunk/config.h b/trunk/config.h index e1e50d8..4417db6 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -15,7 +15,7 @@ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x1A +#define MCU_VER_MINOR 0x1B #define _firm_format_v3_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index d72762d6d0ff61bb5e68e0f288f6c7d3c5824b3a..94163ffc190704578aa9d0a82ddfce53ba5b3473 100644 GIT binary patch delta 4556 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 delta 4519 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 diff --git a/trunk/pm.c b/trunk/pm.c index 0862998..b4e96ea 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -669,8 +669,10 @@ void BT_get_left(){ } } - // 充電許可(=アダプタも刺さってる)のに充電してない = 充電完了 - if( !BT_CHG_Ena_n && BT_IN_CHG_n ){ + // 充電許可(=アダプタも刺さってる)のに充電してない + // かつ、(少なくとも)素の電池残量が60%以上(CCICバグ回避) + // = 充電完了。電池がへたってくるとMGICが100%を返さない + if( !BT_CHG_Ena_n && BT_IN_CHG_n && vreg_ctr[ VREG_C_BT_REMAIN ] > 60 ){ vreg_ctr[ VREG_C_BT_REMAIN ] = 100; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0; } diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 16b931c..8729cea 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -415,7 +415,10 @@ void tsk_sys( ) CKC = 0b00001001; OSMC = 0x00; - STOP( ); + if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある + { + STOP( ); + } // 起きる // // 起きる条件は