From 59d9360560d7ce975783516f621e9b6c8e278c33 Mon Sep 17 00:00:00 2001
From: N2232 <N2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Tue, 25 May 2010 07:53:10 +0000
Subject: [PATCH] =?UTF-8?q?0.16=E5=85=AC=E9=96=8B=E4=BA=88=E5=AE=9A?=
 =?UTF-8?q?=E5=93=81=20=EF=BC=88=E5=B7=BB=E3=81=8D=E6=88=BB=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E8=A6=8B?=
 =?UTF-8?q?=E3=81=88=E3=82=8B=E3=81=8C=E6=B0=97=E3=81=AB=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=EF=BC=89=20=E3=83=BB=E3=83=90=E3=83=83=E3=83=86?=
 =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E8=BB=A2=E9=80=81=E4=BB=98=E8=BF=91=E3=82=92=E5=AE=9F=E8=A3=85?=
 =?UTF-8?q?=20=E3=83=BB=E3=83=90=E3=83=83=E3=83=86=E3=83=AA=E6=AE=8B?=
 =?UTF-8?q?=E9=87=8F=E3=83=8A=E3=82=B7=E6=99=82=E3=81=AE=E3=83=91=E3=82=BF?=
 =?UTF-8?q?=E3=83=BC=E3=83=B3=E3=83=86=E3=82=B9=E3=83=88=E5=AE=9F=E8=A3=85?=
 =?UTF-8?q?=E3=80=81=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9BLED=E3=81=AE?=
 =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC=E3=83=A9=E3=82=A4=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20=E3=83=BBBL=E3=82=AA=E3=83=95?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=82=82PWM=E6=AD=A2=E3=82=81=E3=82=8B?=
 =?UTF-8?q?=E3=81=BE=E3=81=A7=E3=81=AB=E3=82=A6=E3=82=A7=E3=82=A4=E3=83=88?=
 =?UTF-8?q?=E3=81=8C=E3=81=84=E3=82=8B=E3=82=89=E3=81=97=E3=81=8F=EF=BC=9F?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=20=E3=83=BB=E3=83=90=E3=83=83=E3=83=86?=
 =?UTF-8?q?=E3=83=AA=E6=AE=8B=E9=87=8FIC=E3=80=81=E9=80=9A=E9=9B=BB?=
 =?UTF-8?q?=E7=9B=B4=E5=BE=8C=E8=B5=B7=E5=8B=95=E3=81=AB=E3=81=97=E3=81=B0?=
 =?UTF-8?q?=E3=82=89=E3=81=8F=E3=82=A6=E3=82=A7=E3=82=A4=E3=83=88=E3=81=8C?=
 =?UTF-8?q?=E3=81=84=E3=82=8B=E3=82=89=E3=81=97=E3=81=84=E3=81=8C=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E7=9A=84=E3=81=AA=E6=95=B0=E5=AD=97=E3=81=8C=E3=82=8F?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E6=9A=AB?=
 =?UTF-8?q?=E5=AE=9A=E3=81=A7100ms=20=E3=83=BB=E3=82=AB=E3=83=A1=E3=83=A9L?=
 =?UTF-8?q?ED=E3=81=AE=E5=AE=9F=E8=A3=85=E3=82=92=E6=94=B9=E8=89=AF?=
 =?UTF-8?q?=E3=80=80TWL=E3=81=A7blink->on=E3=82=92=E9=80=A3=E5=B0=84?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=81=A8=E4=B8=80=E7=99=BA=E6=B6=88?=
 =?UTF-8?q?=E7=81=AF=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8B=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E3=81=9F=E3=82=81?=
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@173 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/batt_params.h   |  27 ++++++--
 trunk/config.h        |   6 +-
 trunk/led.c           | 147 +++++++++++++++++++++++-------------------
 trunk/led.h           |   3 +-
 trunk/pm.c            |  83 +++++++++++-------------
 trunk/self_flash.c    |   8 +--
 trunk/task_misc.c     |  13 ++--
 trunk/task_sys.c      |  25 ++++---
 trunk/vreg_twl.c      |   7 ++
 trunk/yav_mcu_bsr.plg | 128 +-----------------------------------
 trunk/yav_mcu_bsr.pri | 143 ++++++++++++++++++++++++----------------
 trunk/yav_mcu_bsr.prk |  32 +++++----
 trunk/yav_mcu_bsr.sdb |  72 +++++++++++----------
 13 files changed, 318 insertions(+), 376 deletions(-)

diff --git a/trunk/batt_params.h b/trunk/batt_params.h
index aa07085..17987aa 100644
--- a/trunk/batt_params.h
+++ b/trunk/batt_params.h
@@ -66,13 +66,26 @@ const u8 BT_PARAM[][64] = {
     /// パラメータ無し
 };
 
-// temp_co_xxxxは256倍しておく
-const unsigned char  BT_MAXELL_RCOMP      = 135;
-const signed short BT_MAXELL_TEMPCOUP   = -256* 0.15;
-const signed short BT_MAXELL_TEMPCODN   = -256* 2.15;
 
 
-const unsigned char  BT_PANA_RCOMP      = 171;
-const signed short BT_PANA_TEMPCOUP   = -256* 0.00;
-const signed short BT_PANA_TEMPCODN   = -256* 2.30;
+
+typedef struct {
+    unsigned char rcomp;
+    signed short temp_co_up;  // 256倍したものを入れとく
+    signed short temp_co_dn;  //  〃
+} st_bt_comp;
+
+
+// 電池残量補正パラメータ
+const st_bt_comp BT_COMP[] = {
+//    rcomp R_co_up     R_co_down
+    { 135,  -256* 0.15, -256* 2.15 }, // maxell
+    { 180,           0,          0 }, // dummy
+    { 180,           0,          0 }, // dummy
+    { 180,           0,          0 }, // dummy
+    { 180,           0,          0 }, // dummy
+    { 171,  -256* 0.00, -256* 2.30 }, // panasonic
+    { 180,           0,          0 }  // dummy
+};
+
 #endif
diff --git a/trunk/config.h b/trunk/config.h
index 6a85c3f..311d82f 100644
--- a/trunk/config.h
+++ b/trunk/config.h
@@ -2,12 +2,12 @@
 #define __config__
 
 //#define _debug_led_
-#define _FORCE_OFF_1SEC_
+//#define _FORCE_OFF_1SEC_
 //#define _ALLOW_NOBATT_
-
+//#define _FORCE_INFO_LED_FULLCOLOR_
 
 #define MCU_VER_MAJOR    0x00
-#define MCU_VER_MINOR    0x18
+#define MCU_VER_MINOR    0x16
 
 //#define PM_CCIC_TIM
 
diff --git a/trunk/led.c b/trunk/led.c
index ca4965a..f1ed853 100644
--- a/trunk/led.c
+++ b/trunk/led.c
@@ -27,8 +27,7 @@
 // ========================================================
 static void led_pow_normal(  );
 static void led_pow_hotaru(  );
-static void led_pow_normal_old(  );
-static void led_pow_hotaru_old(  );
+static void led_pow_bt_empty();
 
 
 
@@ -47,7 +46,10 @@ u8* p_LED_duty_WiFi;
 u8 LED_duty_pow_blu_Mirror = 0;
 bit LED_pow_red_Mirror;
 
-bit infoLed_off;
+bit info_led_off;
+bit info_led_override;
+bit cam_led_update;
+
 
 // ========================================================
 #define led_fade_to( now, goal )       now = fade_to( now, goal )
@@ -136,7 +138,7 @@ void LED_init(  )
 #endif
 
     TO0 = 0;                    // タイマー動作中で、タイマー出力にしてないときのピンのラッチ。タイマー出力を使わないなら０
-    TOE0 = 0b0000000001101010; // TOxをタイマーモジュールが制御？
+    TOE0 = 0b0000000011101010; // TOxをタイマーモジュールが制御？
 
     TS0 = 0b0000000011101111;  // 動作開始
 
@@ -175,7 +177,7 @@ void LED_init(  )
             LED_duty_old_pow_blu = LED_duty_pow_blu_Mirror;
         }
     }
-    infoLed_off = 0;
+    info_led_off = 0;
 }
 
 
@@ -215,10 +217,9 @@ enum LED_ILUM_MODE{
  ======================================================== */
 void tsk_led_pow(  )
 {
-    // お知らせランプフルカラー版 /////////////////////
+    info_led_override = 0;
     switch ( vreg_ctr[VREG_C_LED_POW] )
     {
-        // 自動切り替え
     case ( LED_POW_ILM_AUTO ):
         switch ( system_status.pwr_state )
         {
@@ -258,6 +259,10 @@ void tsk_led_pow(  )
         LED_duty_pow_blu_Mirror = LED_BRIGHT_MAX;
         LED_pow_red_Mirror = 0;
         break;
+
+    case ( LED_POW_ILM_FORCE_BT_EMPTY ):
+        led_pow_bt_empty();
+        break;
     }
 
     // 実際にLEDの更新
@@ -272,7 +277,7 @@ void tsk_led_pow(  )
         LED_old_pow_red = LED_pow_red_Mirror;
     }
 
-    if( vreg_ctr[VREG_C_BT_REMAIN] <= BATT_TH_EMPTY )
+    if( info_led_override )
     {
         if( system_status.info_fullcolor )
         {
@@ -294,37 +299,11 @@ void tsk_led_pow(  )
  ======================================================== */
 static void led_pow_normal(  )
 {
-    static u8 delay;
-    static u8 red_blink_poi;
-
     u8 temp;
 
     if( vreg_ctr[VREG_C_BT_REMAIN] <= BATT_TH_EMPTY )
     {
-        // 赤点滅
-        led_fade_to( LED_duty_pow_blu_Mirror, 0 );
-
-        // 赤の点滅パターンも指定できる
-        delay += 1;
-        if( delay < 64 ) // フレームの保持時間稼ぎ
-        {
-            return;
-        }
-        delay = 0;
-
-        if( led_red_batt_empty.dats[ red_blink_poi / 8 ] & ( 1 << ( red_blink_poi % 8 )) )
-        {
-            LED_pow_red_Mirror = 1;
-        }
-        else
-        {
-            LED_pow_red_Mirror = 0;
-        }
-        red_blink_poi += 1;
-        if( red_blink_poi >= 32 )
-        {
-            red_blink_poi = 0;
-        }
+        led_pow_bt_empty();
     }
     else if( vreg_ctr[VREG_C_BT_REMAIN] <= BATT_TH_LO )
     {
@@ -341,6 +320,40 @@ static void led_pow_normal(  )
 }
 
 
+static void led_pow_bt_empty()
+{
+    static u8 delay;
+    static u8 red_blink_poi;
+
+    info_led_override = 1;
+
+    // 赤点滅
+    led_fade_to( LED_duty_pow_blu_Mirror, 0 );
+
+    // 赤の点滅パターンも指定できる
+    delay += 1;
+    if( delay < 64 ) // フレームの保持時間稼ぎ
+    {
+        return;
+    }
+    delay = 0;
+
+    if( led_red_batt_empty.dats[ red_blink_poi / 8 ] & ( 1 << ( red_blink_poi % 8 )) )
+    {
+        LED_pow_red_Mirror = 1;
+    }
+    else
+    {
+        LED_pow_red_Mirror = 0;
+    }
+    red_blink_poi += 1;
+    if( red_blink_poi >= 32 )
+    {
+        red_blink_poi = 0;
+    }
+}
+
+
 /* ========================================================
   ホタルパターン
  ======================================================== */
@@ -398,7 +411,7 @@ static void led_pow_hotaru(  )
         }
         else
         {
-            LED_duty_pow_blu_Mirror += 2;
+            LED_duty_pow_blu_Mirror += 1;
         }
     }
 
@@ -512,7 +525,7 @@ void tsk_led_notify(  )
     static u8 loops_to_go;
     static st_LED_dim_status LED_dim_status_info_R, LED_dim_status_info_G, LED_dim_status_info_B;
 
-    if( vreg_ctr[VREG_C_BT_REMAIN] <= BATT_TH_EMPTY )
+    if( info_led_override )
     {
         // 電池切れが優先する
         return;
@@ -531,7 +544,7 @@ void tsk_led_notify(  )
         LED_dim_status_info_B.now = 0;
     }
 
-    if( !infoLed_off )
+    if( !info_led_off )
     {
         // 次のフレームに進める？
         if( time_to_next_frame == 0 )
@@ -602,7 +615,6 @@ void tsk_led_notify(  )
 
 
 
-
 /******************************************************//**
   LED_Cam          TO02
 \n  BLINK,*_PLUSE の時は、1周期分は必ずその状態になります。
@@ -615,15 +627,18 @@ void tsk_led_cam(  )
     static u8 state_led_cam_twl;
     u8 LED_CAM_mirror;
 
-    if( task_interval != 0 )
+    if( !cam_led_update )
     {
-        task_interval -= 1;
-        return;
+        if( task_interval != 0 )
+        {
+            task_interval -= 1;
+            return;
+        }
     }
+    cam_led_update = 0;  // TWL のブリンク設定（一発だけ点灯）のため
 
     // ブリンクのように待たせたいとき以外は毎週起動する
     //  (レジスタの変更にすぐに反応する)
-
     switch ( vreg_ctr[VREG_C_LED_CAM] )
     {
     case ( CAM_LED_OFF ):
@@ -677,33 +692,33 @@ void tsk_led_cam(  )
         }
         break;
 
-    case ( CAM_LED_BY_TWL ):
+    case( CAM_LED_BY_TWL ):
         switch ( vreg_twl[ REG_TWL_INT_ADRS_CAM ] ){  // switchのネストとか…
-          case( TWL_CAMLED_OFF ):
-                LED_CAM_mirror = 0;
-                state_led_cam = 0;
-                break;
+        case( TWL_CAMLED_OFF ):
+            LED_CAM_mirror = 0;
+            state_led_cam = 0;
+            break;
 
-          case( TWL_CAMLED_BLINK ):
-                if( state_led_cam == 0 )
-                {
-                    LED_CAM_mirror = 1;
-                    state_led_cam = 1;
-                }
-                else
-                {
-                    LED_CAM_mirror = 0;
-                    state_led_cam = 0;
-                }
-                task_interval = 250;
-                break;
-
-          case( TWL_CAMLED_ON ):
-          case( TWL_CAMLED_DEF_ON ):
-          default:
+        case( TWL_CAMLED_BLINK ):
+            if( state_led_cam == 0 )
+            {
                 LED_CAM_mirror = 1;
                 state_led_cam = 1;
-                break;
+            }
+            else
+            {
+                LED_CAM_mirror = 0;
+                state_led_cam = 0;
+            }
+            task_interval = 250;
+            break;
+
+        case( TWL_CAMLED_ON ):
+        case( TWL_CAMLED_DEF_ON ):
+        default:
+            LED_CAM_mirror = 1;
+            state_led_cam = 1;
+            break;
         }
     }
 
diff --git a/trunk/led.h b/trunk/led.h
index 02754da..602ec5c 100644
--- a/trunk/led.h
+++ b/trunk/led.h
@@ -57,7 +57,8 @@ enum LED_ILUM_MODE
   LED_POW_ILM_HOTARU,
   LED_POW_ILM_OFF,
   LED_POW_ILM_ONLY_RED,
-  LED_POW_ILM_ONLY_BLUE
+  LED_POW_ILM_ONLY_BLUE,
+  LED_POW_ILM_FORCE_BT_EMPTY
 };
 
 
diff --git a/trunk/pm.c b/trunk/pm.c
index e1ea143..e5119c3 100644
--- a/trunk/pm.c
+++ b/trunk/pm.c
@@ -19,22 +19,18 @@
 
 
 
-// ========================================================
-
-
 // ========================================================
 u8        raw_adc_temperature;
-u8        rcomp;
-// float     temp_co_up;
-// float     temp_co_dn;
-// 256倍してある
-s16 temp_co_up;
-s16 temp_co_dn;
+
 BT_VENDER battery_manufacturer = BT_VENDER_NOT_CHECKED;
 
+st_bt_comp bt_comp;
+
 u8 reg_shadow;        // NTR PMIC レジスタミラー
 
 
+
+
 // ========================================================
 #ifdef _PMIC_TWL_
 u8 blset;
@@ -174,8 +170,18 @@ err PM_BL_set( u8 dat )
         intset |= REG_BIT_BL_L_OFF;
     }
 
+//    if( blset != 0 )  // BLを付ける場合はウェイトを挟まないとPWMが来ておらず
+                      /// シャットダウンすることがある
+    {
+        wait_ms( 16 + 10 );
+//        wait_ms( 84 ); ミツミの1stバグ回避
+    }
+    iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, blset );
+
+#if 0
 //    SoCがPWMを出すようレジスタをセットしてから遅延が有るため、ステータスを先に
 //    更新してしまう。
+#endif
     vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & 0b10011111 )
                               | ( (( blset << 6 ) | ( blset << 4 )) & 0b01100000 ));
     // PMICのBLのビットと、MCUのSTATUSレジスタのビット位置が逆なため入れ替え
@@ -193,15 +199,6 @@ err PM_BL_set( u8 dat )
         }
     }
 
-// Write
-    if( blset != 0 )  // BLを付ける場合はウェイトを挟まないとPWMが来ておらず
-                      /// シャットダウンすることがある
-    {
-        wait_ms( 16 );
-//        wait_ms( 84 ); ミツミの1stバグ回避
-    }
-    iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, blset );
-
     return( ERR_SUCCESS );         // ここでは異常チェック不要
 }
 
@@ -678,12 +675,12 @@ void tsk_batt(  )
 /********************************************************
 電池関係の初期化
 
-　　　ゲージ　　｜　有り　｜　無し
+　　　ゲージ　　｜　有り　　　　　｜　無し
 　　ーーーーーーーーーーーーーーーーーーーーーーー
-　　　電池　有り｜　実機　｜　実機（ゲージ故障）
+　　　電池　有り｜　実機　　　　　｜　？
 　　ーーーーーーーーーーーーーーーーーーーーーーー
-　　　　　　無し｜　白箱　｜　ＴＳ
-　　　　　　　　｜　実機　｜
+　　　　　　無し｜　白箱　　　　　｜　ＴＳ
+　　　　　　　　｜　実機電池無し　｜
 　　ーーーーーーーーーーーーーーーーーーーーーーー
 
 　　ゲージ有り、電池無し　の白箱／実機判別は、
@@ -696,7 +693,7 @@ void BT_init(  )
     u8      temp;
     u8      origParam[4];
     union{
-        u16 _u16;               // ↓でわかるように、little endian です。注意。
+        u16 _u16;               // endian 注意
         struct{
             u8  lsb;
             u8  msb;
@@ -704,8 +701,8 @@ void BT_init(  )
     }dat_16;
 
 
-//    BT_DET_P = 1;          // チャージに時間が掛かるので、先に上げておく
-//    BT_TEMP_P = 1;
+    //    BT_DET_P = 1;          // チャージに時間が掛かるので、先に上げておく
+    //    BT_TEMP_P = 1;
 
     // 電池温度測定(TS,白箱判定も兼ねる) //
     while( ADCEN != 0 )
@@ -813,13 +810,7 @@ void BT_init(  )
             iic_mcu_set_wo_dma(  );
             iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 64, &BT_PARAM[ battery_manufacturer ] );
 
-            rcomp = BT_PANA_RCOMP;
-            temp_co_up = BT_PANA_TEMPCOUP;
-            temp_co_dn = BT_PANA_TEMPCODN;
-/*
-            todo
-*/
-
+            bt_comp = BT_COMP[ battery_manufacturer ];
         }
 
         // 6. 150ms以上待つ
@@ -835,7 +826,8 @@ void BT_init(  )
         // 9. SOCを読む。ベリファイのため。
         temp = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC );
 
-        if( 1 ){
+        if(( temp >= 0x74 ) && ( temp <= 0x75 ))
+            {
             // カスタムモデル書き込みOK！
         }else{
             // 失敗だったらリトライするのか？
@@ -891,24 +883,24 @@ task_status_immed BT_temp_update(  )
 //        temperature = 81.45 - 111.9 * raw_adc_temperature/256.0;
         // それぞれ256倍してある
         temperature = ( 20851 - 112 * raw_adc_temperature + (256/2) ) /256;
-        vreg_ctr[VREG_C_BT_TEMP] = temperature;
+        vreg_ctr[VREG_C_BT_TEMP] = (u8)temperature;
     }
 
     // 時々書きにゆく
     if( count == 0 )
     {
         newrcomp = 0;
-        if( vreg_ctr[VREG_C_BT_TEMP] > 20 )
+        if( temperature > 20 )
         {
-            newrcomp = ( ( temperature - 20 ) * temp_co_up )/256;
+            newrcomp = ( ( temperature - 20 ) * bt_comp.temp_co_up )/256;
         }
         else
         {
-            newrcomp = ( ( temperature - 20 ) * temp_co_dn )/256;
+            newrcomp = ( ( temperature - 20 ) * bt_comp.temp_co_dn )/256;
         }
-        newrcomp = rcomp + newrcomp;
+        newrcomp = bt_comp.rcomp + newrcomp;
 
-        newrcomp = swap_endian_16( (u16)newrcomp );
+        newrcomp = newrcomp;
         _dbg_rcomp = newrcomp;
 
         if( iic_mcu_write
@@ -932,9 +924,7 @@ task_status_immed BT_temp_update(  )
 **********************************************************/
 void BT_get_left(){
     static u8 bt_left_state; // バッテリ残量で割り込みのため
-
-    // 電池残量の取得
-    static u8 bt_voltage_low_count; // todo どうにかせんとね
+    static u8 bt_voltage_low_count;  // 電圧でシャットダウンさせる
     u8 temp[2];
 
     // 電池電圧で強制断が優先される
@@ -953,13 +943,16 @@ void BT_get_left(){
         else
         {
             bt_voltage_low_count += 1;
-
-            if( bt_voltage_low_count == 3*4 ) // およそ3sec
+            if( bt_voltage_low_count >= 4* 10 )
             {
                 vreg_ctr[ VREG_C_BT_REMAIN ] = 0;
+            }
+
+            if( bt_voltage_low_count == 4* 10 ) // およそ10sec(そんなに頻繁には更新されないみたい)
+            {
                 set_irq( VREG_C_IRQ1, REG_BIT_BT_REMAIN );
             }
-            else if( bt_voltage_low_count == 12 + 3 * 5 )
+            else if( bt_voltage_low_count == 12 + 4* ( 10 + 6 ))
             {                   // …時間切れ。強制的に切る
                 system_status.pwr_state = OFF_TRIG;
                 renge_task_interval_run_force = 1;
diff --git a/trunk/self_flash.c b/trunk/self_flash.c
index 2cea8fa..9e09753 100644
--- a/trunk/self_flash.c
+++ b/trunk/self_flash.c
@@ -176,8 +176,7 @@ void firm_update(  )
         if( FSL_IVerify( target_block ) != FSL_OK ){
             // 再度消去→書き込み ベリファイを繰り返すだけじゃダメでした... todo…？
             // リストア
-            firm_duplicate( UPDATE_BLOCK_LAST +1,
-                            FIRM_TOP );
+            firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP );
             FSL_ForceReset();
             // 戻ってこない //
         }
@@ -236,10 +235,9 @@ void firm_restore(  )
        0x4800 - 0x7FFF (ブロック 18 - 27) から
        0x2000 - 0x47FF (ブロック  8 - 17) へコピー
      */
-    firm_duplicate( UPDATE_BLOCK_LAST +1,
-                    FIRM_TOP );
+    firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP );
     // todo
-    //    　リストア失敗したら、LEDちかちかとかさせて、サービス送りにしてもらう
+    //    　リストア失敗したら、LEDちかちかとかさせて、サービス送りにしてもらう？
 
     // リブート
     FSL_InvertBootFlag(  );
diff --git a/trunk/task_misc.c b/trunk/task_misc.c
index 399feee..b3e6986 100644
--- a/trunk/task_misc.c
+++ b/trunk/task_misc.c
@@ -98,8 +98,7 @@ void tsk_misc(  )
     {
         /* ========================================================
            PM互換レジスタへの書き込み
-           ポーリングしかしてないけど...
-           todo 割り込みも？
+           ポーリングしかしてない。割り込み？
            ======================================================== */
         if( !PM_IRQ_n ){
             renge_task_immed_add( ntr_pmic_comm );
@@ -264,17 +263,17 @@ task_status_immed tski_mcu_info_read()
         break;
 
     case( 5 ):
-        IICA = (u8)(( _dbg_rcomp >> 8 ) & 0xFF );
-        break;
-
-    case( 6 ):
         IICA = (u8)( _dbg_rcomp & 0xFF );
         break;
 
-    case( 7 ):
+    case( 6 ):
         IICA = raw_adc_temperature;
         break;
 
+    case( 7 ):
+        IICA = P4.3;  // 充電許可
+        break;
+
     default:
         goto end;
     }
diff --git a/trunk/task_sys.c b/trunk/task_sys.c
index 51b6480..f800495 100644
--- a/trunk/task_sys.c
+++ b/trunk/task_sys.c
@@ -22,7 +22,7 @@ static void chk_emergencyExit();
 
 
 //=========================================================
-extern bit infoLed_off;
+extern bit info_led_off;
 
 
 /* ========================================================
@@ -76,6 +76,7 @@ void tsk_sys(  )
         BT_DET_P = 1;          // チャージに時間が掛かるので、先に上げておく
         BT_TEMP_P = 1;
         iic_mcu_start(  );
+        wait_ms( 100 );
         BT_init(  );            // 実機やバッテリの判定、電池残量ICの設定
 
         if( system_status.poweron_reason == EXT_POWER )
@@ -232,7 +233,7 @@ void tsk_sys(  )
         vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF;
         vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF;
         vreg_ctr[ VREG_C_LED_TUNE ] = LED_TUNE_ILM_OFF;
-        infoLed_off = 1;
+        info_led_off = 1;
         if( system_status.info_fullcolor )
         {
             if( LED_duty_pow_blu != 0 )
@@ -299,6 +300,7 @@ void tsk_sys(  )
         {
             if( !bt_status_old ){
                 iic_mcu_start(  );
+                wait_ms( 100 );
                 BT_init(  );        // 実機やバッテリの判定、電池残量ICの設定
             }
             bt_status_old = 1;
@@ -371,14 +373,14 @@ void tsk_sys(  )
 static void chk_emergencyExit(){
     static u8 shirobako_power_control_count;
 
-    if( shirobako_power_control_count == 0 )  // PM_chk_LDSW() はI2C_mを使用し、高コスト
+    if( shirobako_power_control_count == 0 )
     {
-        if( !RESET1_n )
+        if( !RESET1_n )         // PM_chk_LDSW() はI2C_mを使用し、高コスト
         {
-            // リセットが下がってる
             if( PM_chk_LDSW(  ) == 0 )
             {
-                // PMICが異常終了判断をした
+                // リセットが下がってる
+                /// PMICが異常終了判断をした
                 system_status.pwr_state = OFF_TRIG;
                 renge_task_interval_run_force = 1;
             }
@@ -391,14 +393,19 @@ static void chk_emergencyExit(){
     }
     else
     {
-        if( shirobako_power_control_count == 240 )
+        if( shirobako_power_control_count == 240 ) // <- 240はマジックナンバー
         // デバッガが何かした。reset1を解除するまでは無視
         {
-            if( RESET1_n )
+            if( RESET1_n )      // リセットネゲート待ち
             {
                 shirobako_power_control_count = 0;
             }
-        }else if( shirobako_power_control_count == 200 )
+            else
+            {
+                // nothing to do
+            }
+        }
+        else if( shirobako_power_control_count == 200 )
         // デバッガが何かしたいらしい
         {
             // 白箱は電源を切りたいらしい
diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c
index 7247ad0..f0dc490 100644
--- a/trunk/vreg_twl.c
+++ b/trunk/vreg_twl.c
@@ -17,8 +17,11 @@ TWL
 // ========================================================
 u8      vreg_twl[_REG_TWL_INT_ADRS_ENDMARK];
 
+
 u8 twl_vol_read_old;
 extern bit twl_ver_read;
+extern bit cam_led_update;
+
 
 
 /* ========================================================
@@ -53,6 +56,10 @@ void vreg_twl_write( u8 adrs, u8 data )
 
       case ( REG_TWL_INT_ADRS_CAM ):
         vreg_twl[ REG_TWL_INT_ADRS_CAM ] = ( data & 0x03 );
+        if( ( data & 0x03 ) == TWL_CAMLED_BLINK )
+        {
+            cam_led_update = 1;
+        }
         tsk_led_cam();  // todo 大丈夫？
         break;
 
diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg
index 59df9e8..57a3d75 100644
--- a/trunk/yav_mcu_bsr.plg
+++ b/trunk/yav_mcu_bsr.plg
@@ -1,134 +1,8 @@
 C:\WINDOWS\system32\cmd.exe /c touch magic.c
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no loader.c
-loader.c(126) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    1 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no pm.c
-pm.c(67) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(106) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(180) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(188) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(484) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(487) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(894) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(1008) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.h(71) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.h(72) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.h(77) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and   11 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no i2c_ctr.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no main.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
 "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no magic.c
 Compilation complete,    0 error(s) and    0 warning(s) found.
 "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm
 Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no WDT.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no i2c_mcu.c
-i2c_mcu.c(194) : CC78K0R warning W0401: Conversion may lose significant digits
-i2c_mcu.c(320) : CC78K0R warning W0410: Illegal pointer conversion
-Compilation complete,    0 error(s) and    2 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no i2c_twl.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no led.c
-led.c(87) : CC78K0R warning W0745: Expected function prototype
-led.c(147) : CC78K0R warning W0411: Illegal pointer combination
-led.c(154) : CC78K0R warning W0411: Illegal pointer combination
-led.c(564) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    4 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no rtc.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no vreg_ctr.c
-vreg_ctr.c(146) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(147) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(149) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(151) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(152) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    5 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no vreg_twl.c
-vreg_twl.c(51) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_twl.c(55) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    2 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no adc.c
-adc.c(112) : CC78K0R warning W0745: Expected function prototype
-adc.c(163) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(171) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(172) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(270) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(305) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    6 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no renge\renge.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no accero.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no self_flash.c
-self_flash.c(201) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    1 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no sw.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no task_debug.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no task_misc.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no task_sys.c
-task_sys.c(184) : CC78K0R warning W0401: Conversion may lose significant digits
-task_sys.c(419) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    2 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no pedo_alg_thre_det2.c
-pedo_alg_thre_det2.c(60) : CC78K0R warning W0745: Expected function prototype
-pedo_alg_thre_det2.c(75) : CC78K0R warning W0401: Conversion may lose significant digits
-pedo_alg_thre_det2.c(142) : CC78K0R warning W0401: Conversion may lose significant digits
-pedo_alg_thre_det2.c(155) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    4 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pedo_alg_thre_det2.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no ini_VECT.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2wt -sainter_asm -zp -no task_status.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_status.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
 "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel"  -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0  loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel 
 Link complete,     0 error(s) and     0 warning(s) found.
 "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki  bsr.lmf
@@ -139,4 +13,4 @@ intel-HEX to bsr bin converter
  file converted!
 
 
-Build Total error(s) : 0  Total warning(s) : 38 
+Build Total error(s) : 0  Total warning(s) : 0 
diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri
index c2a4876..449cda4 100644
--- a/trunk/yav_mcu_bsr.pri
+++ b/trunk/yav_mcu_bsr.pri
@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=196, 23, 873, 815
+Geometry=17, 71, 873, 815
 Window=Normal
-DispStart=331
-CaretPos=335,0
+DispStart=39
+CaretPos=80,0
 Mode=Normal
 DispFile=
 Address1=
@@ -139,11 +139,19 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
+[Source1]
+Geometry=0, 0, 873, 815
+Window=Normal
+DispStart=554
+CaretPos=1,0
+Mode=Normal
+DispFile=led.c
+Accumulative=ON
 [Assemble]
 Geometry=19, 497, 600, 400
 Window=Normal
-DispStart=16664
-CaretPos=16664,27
+DispStart=693
+CaretPos=693,27
 Address1=
 Address2=
 Address3=
@@ -257,7 +265,7 @@ Boundary=0
 Mode=Proper
 [Sfr]
 Geometry=613, 51, 596, 915
-Window=Hide
+Window=Normal
 Address1=
 Address2=
 Address3=
@@ -274,13 +282,13 @@ Address13=
 Address14=
 Address15=
 Address16=
-Boundary=0, 0
-Mode=Hex
+Boundary=202, 89
+Mode=Bin
 Attribute=Show
 Sort=Unsort
 Pickup=OFF
 SelectSort=Address
-Last Name=IF0
+Last Name=TSR01
 Line=531
 L1=P0
 L2=P1
@@ -884,7 +892,7 @@ ES=1
 CS=1
 [Event Manager]
 Geometry=50, 50, 500, 200
-Window=Normal
+Window=Hide
 Sort by=Unsort
 Detail=OFF
 [Event Set]
@@ -957,52 +965,59 @@ Detail=OFF
 Last Name=
 Count=0
 [Variable]
-Geometry=884, 10, 440, 653
+Geometry=827, 13, 440, 653
 Window=Normal
 Boundary=18088086
-0=.p7.0,P,S,A,+,1
-1=.p5.1,P,S,A,+,1
-2=.pu7.0,P,S,A,+,1
-3=.pm7.0,P,S,A,+,1
-4=.pu5.1,P,S,A,+,1
-5=.pm5.1,P,S,A,+,1
-6=.temperature,D,N,A,+,1
-7=.raw_adc_temperature,D,N,A,+,1
-8=.info_LED,.,N,A,+,1
-9=.list_id,P,N,A,+,1
-10=.TDR02,P,S,A,+,1
-11=.P4.2,P,S,A,+,1
-12=.pool,.,N,A,+,1
-13=.p_LED_duty_WiFi,.,N,A,+,1
-14=.system_status,.,N,A,+,1
-15=.psw,P,R,A,+,1
-16=.vreg_ctr,P,N,A,+,1
-17=.tasks_immed,P,N,A,+,1
-18=.rcomp,D,N,A,+,1
-19=.temp_co_dn,D,N,A,+,1
-20=.raw_adc_temperature,P,N,A,+,1
-21=.temperature,D,N,A,+,1
-22=.temp_co_up,D,N,A,+,1
-Line=23
+0=.tdr07,P,S,A,+,1
+1=.tdr03,P,S,A,+,1
+2=.tdr06,P,S,A,+,1
+3=.TOE0,B,S,A,+,1
+4=.vreg_twl,P,N,A,+,1
+5=.p7.0,P,S,A,+,1
+6=.p5.1,P,S,A,+,1
+7=.pu7.0,P,S,A,+,1
+8=.pm7.0,P,S,A,+,1
+9=.pu5.1,P,S,A,+,1
+10=.pm5.1,P,S,A,+,1
+11=.P20.5,P,S,A,+,1
+12=.vreg_ctr,P,N,A,+,1
+13=.temperature,D,N,A,+,1
+14=.raw_adc_temperature,D,N,A,+,1
+15=.info_LED,.,N,A,+,1
+16=.list_id,P,N,A,+,1
+17=.TDR02,P,S,A,+,1
+18=.P4.2,P,S,A,+,1
+19=.pool,.,N,A,+,1
+20=.p_LED_duty_WiFi,.,N,A,+,1
+21=.system_status,.,N,A,+,1
+22=.psw,P,R,A,+,1
+23=.vreg_ctr,P,N,A,+,1
+24=.tasks_immed,P,N,A,+,1
+25=.rcomp,D,N,A,+,1
+26=.temp_co_dn,D,N,A,+,1
+27=.raw_adc_temperature,P,N,A,+,1
+28=.temperature,D,N,A,+,1
+29=.temp_co_up,D,N,A,+,1
+Line=30
 [Quick Watch]
-0=TDR02,P,A,1
-1=vreg_ctr,P,A,1
-2=info_LED,P,A,1
-3=pool,P,A,1
-4=rcomp,P,A,1
-5=temp_co_up,P,A,1
-6=temp_co_dn,P,A,1
-7=temperature,P,A,1
-8=raw_adc_temperature,P,A,1
-9=pu70,P,A,1
-10=pm7.0,P,A,1
-11=pu7.0,P,A,1
-12=p7.0,P,A,1
-13=p5.1,P,A,1
-14=pu5.1,P,A,1
-15=pm5.1,P,A,1
+0=temperature,P,A,1
+1=raw_adc_temperature,P,A,1
+2=pu70,P,A,1
+3=pm7.0,P,A,1
+4=pu7.0,P,A,1
+5=p7.0,P,A,1
+6=p5.1,P,A,1
+7=pu5.1,P,A,1
+8=pm5.1,P,A,1
+9=vreg_twl,P,A,1
+10=vreg_ctr,P,A,1
+11=P20.5,P,A,1
+12=tdr07,P,A,1
+13=tdr03,P,A,1
+14=tdr06,P,A,1
+15=TOE0,P,A,1
 [Software Break]
-Geometry=1085, 803, 500, 296
+Geometry=805, 623, 500, 296
 Window=Normal
 Width=150 30 200 100
 Name0=Swb00001
@@ -1013,11 +1028,27 @@ Name1=Swb00015
 Address1=led.c#_tsk_led_cam+0x76
 Window1=ASM
 Status1=ON
-Name2=Swb00002
-Address2=task_status.c#_tsk_status+0x70
+Name2=Swb00005
+Address2=vreg_ctr.c#_vreg_ctr_write+0x1a2
 Window2=ASM
-Status2=ON
-Count=3
+Status2=OFF
+Name3=Swb00006
+Address3=vreg_twl.c#_vreg_twl_write+0x27
+Window3=ASM
+Status3=ON
+Name4=Swb00002
+Address4=task_status.c#_tsk_status+0x84
+Window4=ASM
+Status4=ON
+Name5=Swb00003
+Address5=main.c#_main_loop+0x0
+Window5=ASM
+Status5=ON
+Name6=Swb00004
+Address6=led.c#_tsk_led_notify+0x118
+Window6=ASM
+Status6=ON
+Count=7
 [Reset]
 Debugger=ON
 Symbol=OFF
diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk
index 8c25c0b..22aa63b 100644
--- a/trunk/yav_mcu_bsr.prk
+++ b/trunk/yav_mcu_bsr.prk
@@ -1,29 +1,27 @@
 [ProjectManager]
 FrameMax=1
-FrameX=255
-FrameY=34
+FrameX=-1095
+FrameY=54
 FrameCX=1299
 FrameCY=1044
 OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0
 OpenFile2=jhl_defs.h,0,250,539,1494,1265,0,10,8,0
 OpenFile3=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0
 OpenFile4=task_sys.c,0,330,330,1574,1056,0,172,37,0
-OpenFile5=loader.c,0,296,307,1286,923,20,214,20,0
-OpenFile6=pm.h,0,254,446,1244,1062,0,115,0,0
-OpenFile7=vreg_ctr.h,0,632,184,1876,910,8,40,25,0
-OpenFile8=pedo_alg_thre_det2.c,0,132,132,1376,858,0,12,0,0
-OpenFile9=adc.c,0,286,286,1530,1012,0,145,0,0
-OpenFile10=self_flash.c,0,154,154,1398,880,7,365,7,0
-OpenFile11=ProjectWindow
+OpenFile5=pm.h,0,254,446,1244,1062,0,115,0,0
+OpenFile6=vreg_ctr.h,0,632,184,1876,910,8,40,25,0
+OpenFile7=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile12=magic.c,0,323,248,1567,974,0,17,0,0
-OpenFile13=led.h,0,22,22,1023,650,25,29,25,0
-OpenFile14=led.c,0,315,193,1559,919,0,656,0,0
-OpenFile15=config.h,0,288,71,1532,797,26,27,26,0
-OpenFile16=sw.c,0,574,367,1818,1093,0,36,0,0
-OpenFile17=vreg_twl.c,0,286,286,1530,1012,2,65,2,0
-OpenFile18=OutputWindow
-OutputPos=0,536,1002,34,1092
+OpenFile8=magic.c,0,323,248,1567,974,0,17,0,0
+OpenFile9=led.c,0,315,193,1559,919,0,656,0,0
+OpenFile10=vreg_twl.c,0,286,286,1530,1012,2,65,2,0
+OpenFile11=adc.c,0,286,286,1530,1012,0,173,0,0
+OpenFile12=sw.c,0,574,367,1818,1093,0,57,43,0
+OpenFile13=loader.c,0,296,307,1286,923,0,126,20,0
+OpenFile14=config.h,0,316,50,1560,776,29,10,29,0
+OpenFile15=batt_params.h,0,0,0,1244,757,0,66,0,0
+OpenFile16=OutputWindow
+OutputPos=0,573,1039,440,1498
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0
diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb
index 46c38f1..728438e 100644
--- a/trunk/yav_mcu_bsr.sdb
+++ b/trunk/yav_mcu_bsr.sdb
@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4bf114e2
+T=4bf64019
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -11,7 +11,7 @@ T=4bf114e2
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4bf28b7e
+T=4bfb353e
 1=incs.h
 2=adc.h
 3=led.h
@@ -21,11 +21,11 @@ T=4bf28b7e
 7=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 8=fsl_user.h
 [i2c_ctr.c]
-T=4bf2324a
+T=4bf615a7
 1=config.h
 2=incs.h
 [main.c]
-T=4bf3b1c1
+T=4bf636cb
 1=incs_loader.h
 2=WDT.h
 3=rtc.h
@@ -35,29 +35,30 @@ T=4bf3b1c1
 7=adc.h
 8=pool.h
 [magic.c]
-T=4bf3b865
+T=4bfb2eee
 1=config.h
 [WDT.c]
 T=4bf0d1e1
 1=incs_loader.h
 [i2c_mcu.c]
-T=4bf11863
+T=4bf64703
 1=incs_loader.h
 2=i2c_mcu.h
 [i2c_twl.c]
-T=4bf0d1e0
+T=4bf67bea
 1=config.h
 2=incs.h
 3=i2c_twl_defs.h
+4=i2c_twl.h
 [led.c]
-T=4bf3a163
+T=4bfb2ecc
 1=incs.h
 2=led.h
 [rtc.c]
 T=4bf0d1e1
 1=incs.h
 [vreg_ctr.c]
-T=4bf3a2ff
+T=4bfa4164
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -68,20 +69,20 @@ T=4bf3a2ff
 8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 9=fsl_user.h
 [vreg_twl.c]
-T=4bf3b1c1
+T=4bfa1ed9
 1=incs.h
 2=jhl_defs.h
 3=led.h
 4=vreg_twl.h
 5=vreg_ctr.h
 [adc.c]
-T=4bf213b1
+T=4bfa2806
 1=incs.h
 2=adc.h
 3=pm.h
 4=led.h
 [renge\renge.c]
-T=4bf0d1e0
+T=4bf4e91e
 1=renge\renge.h
 2=renge\renge_task_intval.h
 3=renge\renge_task_immediate.h
@@ -90,32 +91,33 @@ T=4bf0d1e0
 6=user_define.h
 7=bsr_system.h
 [accero.c]
-T=4bf1000a
+T=4bfa4024
 1=config.h
 2=incs.h
 3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
-T=4bf0d1e0
+T=4bfb28ce
 1=incs_loader.h
 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 3=fsl_user.h
 4=i2c_ctr.h
 5=pool.h
 [sw.c]
-T=4bf3afad
+T=4bf66789
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
 4=led.h
 5=pm.h
 6=rtc.h
+7=sw.h
 [task_debug.c]
 T=4bf0d1e1
 1=incs.h
 2=renge\renge.h
 3=pm.h
 [task_misc.c]
-T=4bf27c33
+T=4bfb28ce
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -124,7 +126,7 @@ T=4bf27c33
 6=i2c_mcu.h
 7=led.h
 [task_sys.c]
-T=4bf3b993
+T=4bfb2557
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -147,7 +149,7 @@ T=4bf0d1e1
 T=4bf0d1e1
 1=config.h
 [task_status.c]
-T=4bf0d1e1
+T=4bfa418a
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -169,11 +171,11 @@ T=4bf0d1e1
 T=4bf0d1e0
 1=config.h
 [config.h]
-T=4bf3afad
+T=4bfb2ee6
 [user_define.h]
-T=4bf376de
+T=4bf6321a
 [bsr_system.h]
-T=4bf0d1e1
+T=4bf6321a
 [renge\renge.h]
 T=4bf0d1e0
 1=renge\renge_defs.h
@@ -184,10 +186,10 @@ T=4bf0d1e0
 T=4bf0d1e0
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4bf21233
+T=4bf61f5f
 1=config.h
 [vreg_twl.h]
-T=4bf0d1e0
+T=4bfa0ef0
 [loader.h]
 T=4bf0d1e0
 [i2c_mcu.h]
@@ -201,13 +203,13 @@ T=4bf0d1e0
 [i2c_ctr.h]
 T=4bf0d1e1
 [pm.h]
-T=4bf376de
+T=4bf65407
 [rtc.h]
 T=4bf0d1e1
 [reboot.h]
 T=4bf0d1e1
 [incs.h]
-T=4bf0d1e0
+T=4bf6286a
 1=jhl_defs.h
 2=user_define.h
 3=bsr_system.h
@@ -215,9 +217,12 @@ T=4bf0d1e0
 5=vreg_ctr.h
 6=vreg_twl.h
 7=i2c_mcu.h
-8=rtc.h
-9=accero.h
-10=pm.h
+8=i2c_twl.h
+9=rtc.h
+10=accero.h
+11=pm.h
+12=sw.h
+13=WDT.h
 [accero.h]
 T=4bf0d1e1
 1=jhl_defs.h
@@ -228,22 +233,23 @@ T=4bf0d1e0
 T=4bf0d1e1
 1=jhl_defs.h
 [led.h]
-T=4bf3815d
+T=4bf67158
 [batt_params.h]
-T=4bf28b27
+T=4bfb23e6
 [i2c_twl_defs.h]
 T=4bf0d1e1
 [renge\renge_task_intval.h]
 T=4bf0d1e0
 1=renge\renge_defs.h
 [i2c_twl.h]
-T=4bf0d1e0
+T=4bf4e29e
 [sw.h]
-T=4bf0d1e0
+T=4bf6321a
+1=config.h
 [self_flash.h]
 T=4bf0d1e0
 [pool.h]
-T=4bf0d1e0
+T=4bf5cdae
 1=pedometer.h
 [pedo_lpf_coeff.h]
 T=4bf0d1e1