●音量スライダを入れまくるとシャットダウンすることがある

（SDKの不具合だそうだが）コマンドが混ざったときに誤判定する、また、SoC側も誤読をしているはず。
　TWL側のI2Cのフラグチェックが甘く、↑との合わせ技でif～elseの間でフラグが変わってしまうと意図しないステートに入って誤ったデータが流れる
　フラグチェックをまともにやるよう変更し、いくらか改善したが、SoCが誤読するのはどうしようもないので、どうにかしてもらう。
　TWLでは押しボタンスイッチであり、マイコンの中でチャタリング除去と、キーリピートなどをするため、発生したと聞かないが、発生しうる。
●TWL から の割り込み通知を一応実装
●レジスタマップが変更になるので作業

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

trunk/i2c_twl.c

@@ -110,21 +110,14 @@ __interrupt void int_iic_twl(  )
 
     while( 1 )
     {
-        if( IICAIF == 1 )
+        u8 my_iics = IICS;
-        {
-            // 受信 //
-            IICAIF = 0;
-            temp = IICA;
-            IICA = 0xFF;
-//      WREL = 1;
-
-            // 通常アクセス(ライト) //
-            LREL = 1;           // スタートコンディション待ちへ(連続書き込み未対応のため)
-            vreg_twl_write( vreg_adrs, temp );
-            return;             // 受信おしまい //
 
+        if( my_iics & 0x01 )    // SPD
+        {                       // 強制終了
+            LREL = 1;
+            return;
         }
-        else if( STD )
+        else if( my_iics & 0x02 )  // ( STD && !SPD )
         {
             // 送信 // (スタートコンディション検出)
             pre_dat = vreg_twl_read( vreg_adrs );       // mcu内部アドレスを渡す。一バイト目の準備 IICBに書き込むとウェイト解除
@@ -145,10 +138,17 @@ __interrupt void int_iic_twl(  )
             LREL = 1;
             return;
         }
-        else if( SPD )
+        else if( IICAIF && (( my_iics & 0x03 ) == 0 ))   // !STD && !SPD )
-        {                       // 強制終了
+        {
-            LREL = 1;
+            // 受信 //
-            return;
+            IICAIF = 0;
+            temp = IICA;
+            WREL = 1;
+
+            // 通常アクセス(ライト) //
+            LREL = 1;           // スタートコンディション待ちへ(連続書き込み未対応のため)
+            vreg_twl_write( vreg_adrs, temp );
+            return;             // 受信おしまい //
         }
     }
 }

trunk/pm.c

@@ -79,27 +79,27 @@ void PM_init(  )
 
     // 0. バッテリ残量IC クイックスタート
     dat_16._u16 = swap_endian_16( 0x4000 ); // quick start
-    if( iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_MODE, 2, &dat_16.chars.lsb ) != ERR_SUCCESS )
+    if( iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_MODE, 2, &dat_16 ) != ERR_SUCCESS )
     {
-        vreg_ctr[ VREG_C_STATUS_1 ] |= 0x01;
+        vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR;
     }
     else
     {
 
         // 1. ロック解除
         dat_16._u16 = swap_endian_16( 0x4057 ); // unlock key
-        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16._u16 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16 );
 
         // 2. 初期パラメータを一時保存
         iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam );
 
         // 3. 一時的にOCVを変更
         dat_16._u16 = swap_endian_16( 0xD4C0 ); // マジックナンバー的なもの。メーカー指定
-        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16._u16 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16 );
 
         // 4. 一時的にRCOMPを変更
         dat_16._u16 = swap_endian_16( 0xFF00 );
-        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &dat_16._u16 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &dat_16 );
 
         // 電池メーカーの識別
         BT_DET_P = 1;
@@ -124,7 +124,7 @@ void PM_init(  )
 
         // 7. OCVに「とある値」を書く
         dat_16._u16 = swap_endian_16( 0xD4C0 );
-        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16._u16 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16 );
 
         // 8. 150～600ms待つ。600msは厳守
         wait_ms( 200 );
@@ -143,7 +143,7 @@ void PM_init(  )
 
         // 11. ロック
         dat_16._u16 = swap_endian_16( 0x0000 ); // lock key
-        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16._u16 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16 );
 
         // おしまい //
     }
@@ -172,11 +172,11 @@ void PM_init(  )
  ======================================================== */
 task_status_immed PM_bt_temp_update(  )
 {
-    s16       newrcomp;
-    static s8 temp_old;
     static u8 count = 0;        // たまにしか書きに行かない
-    static s16 temperature;
 
+    static u8 rawdat_old;
+    static s16 temperature;  // todo
+    u16       newrcomp;
 
 /*
 	サーミスタ - 10kΩ分圧点の時、
@@ -184,27 +184,35 @@ task_status_immed PM_bt_temp_update(  )
 	村田 T[℃] = 81.48  - 111.97 x ratio
 	TDK  T     = 81.406 - 111.81 x ratio
 */
-    temperature = (s16)(( 163 * 256 ) - ( 224 * raw_adc_temperature )) / 2 ;
+    if( rawdat_old != raw_adc_temperature ){
-    vreg_ctr[VREG_C_BT_TEMP] = (u8)( temperature / 256 );
+        DBG_P_n = 1;
+        temperature = 81.45 - 111.9 * raw_adc_temperature/256.0;
+        vreg_ctr[VREG_C_BT_TEMP] = (u8)temperature;
+        DBG_P_n = 0;
+    }
 
-    // 時々／大きく変化があったら書きにゆく
+
-    if( ( abs( vreg_ctr[VREG_C_BT_TEMP] - temp_old ) > 3 ) || ( count == 0 ) )
+        // 時々書きにゆく
+    if( count == 0 )
     {
-        if( ( s8 ) vreg_ctr[VREG_C_BT_TEMP] > 20 )
+        DBG_P_n = 1;
+        if( vreg_ctr[VREG_C_BT_TEMP] > 20 )
         {
-            newrcomp = -( ( ( s16 ) vreg_ctr[VREG_C_BT_TEMP] - 20 ) * temp_co_up );
+            newrcomp = -( ( temperature - 20 ) * temp_co_up );
         }
         else
         {
-            newrcomp = -( ( ( s16 ) vreg_ctr[VREG_C_BT_TEMP] - 20 ) * temp_co_dn );
+            newrcomp = -( ( temperature - 20 ) * temp_co_dn );
         }
         newrcomp += rcomp;
 
-        newrcomp = swap_endian_16( newrcomp );
+        newrcomp = swap_endian_16( (u16)newrcomp );
+        DBG_P_n = 0;
+
         if( iic_mcu_write
             ( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &newrcomp ) == ERR_SUCCESS )
         {
-            temp_old = vreg_ctr[VREG_C_BT_TEMP];
+            rawdat_old = raw_adc_temperature;
         }
     }
     count += 1;
@@ -660,6 +668,20 @@ void tsk_batt(  )
     {
         vreg_ctr[ VREG_C_BT_REMAIN ] = 99;
     }
+
+    // PMIC-NTRに電池残量を教えてあげる
+    if( vreg_ctr[ VREG_C_BT_REMAIN ] < 5 )
+    {
+        iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, 1 );  // 1で電池切れ
+    }
+    else
+    {
+        iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, 0 );
+    }
+
+    
+
+
     vreg_ctr[ VREG_C_FREE0 ] = vreg_ctr[ VREG_C_BT_REMAIN ];
     vreg_ctr[ VREG_C_FREE1 ] = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL );
 

trunk/pm.h

@@ -38,8 +38,7 @@ enum PMIC_REG_ADRS
 //=========================================================
 // CODEC上のPMIC互換レジスタ
 #define CODEC_REG_PM 0x10
-#define CODEC_REG_BL 0x11
+#define CODEC_REG_BT 0x18
-#define CODEC_REG_BT 0x12
 
 // TWLがSPIでPMICに投げたコマンド
 #define REG_BIT_TWL_REQ_OFF_REQ  ( 1 << 6 )

trunk/renge/renge_task_immediate.h

@@ -12,7 +12,7 @@
  *****************************************************************************/
 extern task_status_immed ntr_pmic_comm();
 extern task_status_immed tsk_cbk_accero();
-extern task_status_immed do_command0();
+extern task_status_immed do_command();
 
 extern task_status_immed acc_read();
 extern task_status_immed acc_write();

trunk/task_misc.c

@@ -152,7 +152,7 @@ void tsk_misc_stat(  )
   COMMANDレジスタへの書き込み
 　  0なら呼ばれません。ケア不要
  ======================================================== */
-task_status_immed do_command0(  )
+task_status_immed do_command(  )
 {
 
     // 本体電源など

trunk/task_sys.c

@@ -291,7 +291,7 @@ static void chk_emergencyExit(){
         {
             // デバッガなりがリセットをかけた
             vreg_ctr[VREG_C_COMMAND0] |= REG_BIT_RESET1_REQ;
-            renge_task_immed_add( do_command0 );
+            renge_task_immed_add( do_command );
         }
     }
 }

trunk/user_define.h

@@ -193,10 +193,12 @@
 #define ACCEL_INT1           P2.5
 #endif
 
-/*
+
+
 #define DBG_M_n              P2.1
 #define DBG_P_n              P2.2
-*/
+
+
 
 #define KR_SW_POW            ( 1 << 3 )
 #define KR_SW_WIFI           ( 1 << 4 )

trunk/vreg_ctr.c

@@ -90,7 +90,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
         vreg_ctr[adrs] = data;
         if( data != 0 )
         {
-            renge_task_immed_add( do_command0 );
+            renge_task_immed_add( do_command );
         }
         break;
 

trunk/yav_mcu_bsr.plg

@@ -1,127 +1,6 @@
 C:\WINDOWS\system32\cmd.exe /c echo touch magic.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 -qvjl1wt -sainter_asm -zp -no loader.c
-loader.c(138) : CC78K0R warning W0401: Conversion may lose significant digits
-loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits
-loader.c(145) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    3 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 -qvjl1wt -sainter_asm -zp -no pm.c
-pm.c(191) : CC78K0R warning W0745: Expected function prototype
-pm.c(195) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(199) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(603) : 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\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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no i2c_mcu.c
-i2c_mcu.c(103) : CC78K0R warning W0401: Conversion may lose significant digits
-i2c_mcu.c(180) : 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\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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no led.c
-led.c(422) : CC78K0R warning W0401: Conversion may lose significant digits
-led.c(423) : 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\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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no vreg_ctr.c
-vreg_ctr.c(60) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(103) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(106) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(108) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(109) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(111) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    7 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 -qvjl1wt -sainter_asm -zp -no vreg_twl.c
-vreg_twl.c(47) : 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\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 -qvjl1wt -sainter_asm -zp -no adc.c
-adc.c(73) : CC78K0R warning W0745: Expected function prototype
-adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(81) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(96) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(99) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(224) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(44) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    7 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 -qvjl1wt -sainter_asm -zp -no accero.c
-accero.c(91) : CC78K0R warning W0745: Expected function prototype
-accero.c(93) : 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\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 -qvjl1wt -sainter_asm -zp -no self_flash.c
-self_flash.c(234) : 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 -qvjl1wt -sainter_asm -zp -no reboot.c
-reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot'
-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\reboot.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 -qvjl1wt -sainter_asm -zp -no sw.c
-sw.c(66) : 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\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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no task_misc.c
-task_misc.c(40) : CC78K0R warning W0401: Conversion may lose significant digits
-task_misc.c(32) : 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_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 -qvjl1wt -sainter_asm -zp -no task_sys.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_sys.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 -kp -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 ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.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
-Object Conversion Complete,      0 error(s) and     0 warning(s) found.
 C:\WINDOWS\system32\cmd.exe /c ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex
 C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored
 
-Build Total error(s) : 0  Total warning(s) : 33 
+Build Total error(s) : 0  Total warning(s) : 0 

trunk/yav_mcu_bsr.pri

@@ -78,7 +78,7 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=247, 21, 863, 1013
+Geometry=50, 50, 863, 1017
 Window=Normal
 DispStart=251
 CaretPos=253,0
@@ -139,14 +139,6 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
-[Source1]
-Geometry=0, 0, 863, 1013
-Window=Normal
-DispStart=81
-CaretPos=1,0
-Mode=Normal
-DispFile=task_sys.c
-Accumulative=ON
 [Assemble]
 Geometry=0, 0, 0, 0
 Window=Hide
@@ -822,9 +814,9 @@ L529=IICWL1
 L530=IICWH1
 L531=SVA1
 [Local Variable]
-Geometry=0, 0, 0, 0
+Geometry=1180, 798, 400, 300
-Window=Hide
+Window=Normal
-Boundary=0
+Boundary=13041851
 Mode=Proper
 [Trace View]
 Geometry=0, 0, 0, 0
@@ -968,74 +960,59 @@ Count=0
 Geometry=1143, 7, 440, 503
 Window=Normal
 Boundary=13762700
-0=.iic_mcu_bus_status,P,N,A,+,1
+0=.P2,B,S,A,+,1
-1=.vreg_ctr[0x0e],P,N,A,+,1
+1=.PM2,B,S,A,+,1
-2=.PMK23,P,S,A,+,1
+2=.raw_adc_temperature,P,N,A,+,1
-3=.PM12.0,P,S,A,+,1
+3=.vreg_ctr,P,N,A,+,1
-4=.P12.0,P,S,A,+,1
+4=.reg1_old,P,N,A,+,1
-5=.system_status.pwr_state,P,N,A,+,1
+5=.reg_shadow,P,N,A,+,1
-6=.vreg_ctr[0x1b],P,N,A,+,1
+Line=6
-7=.reg_shadow,H,N,A,+,1
-8=.timeout,P,N,A,+,1
-9=.PU7,B,S,A,+,1
-10=.PM7,B,S,A,+,1
-11=.RESF,P,S,A,+,1
-12=.SW_pow_count,P,N,A,+,1
-13=.SW_pow_mask,P,N,A,+,1
-14=.SW_pow_count,P,N,A,+,1
-15=.P7.0,P,S,A,+,1
-16=.KRM,P,S,A,+,1
-17=.PU7.3,P,S,A,+,1
-18=.PM7.3,P,S,A,+,1
-19=.P7.3,P,S,A,+,1
-20=.PU7.1,P,S,A,+,1
-21=.P7.1,P,S,A,+,1
-22=.PM7.1,P,S,A,+,1
-23=.vreg_ctr[15],P,N,A,+,1
-24=.PU4.3,P,S,A,+,1
-25=.vreg_twl,P,N,A,+,1
-26=.PM4.3,P,S,A,+,1
-27=.P4.3,P,S,A,+,1
-28=.system_status.pwr_state,P,N,A,+,1
-Line=29
 [Quick Watch]
-0=PM7,B,A,1
+0=vreg_ctr[VREG_C_IRQ3],P,A,1
-1=PU7,B,A,1
+1=vreg_ctr[0x1b],P,A,1
-2=SW_pow_mask,P,A,1
+2=system_status.pwr_state,P,A,1
-3=SW_pow_count,P,A,1
+3=P12.0,P,A,1
-4=RESF,P,A,1
+4=PM12,P,A,1
-5=timeout,P,A,1
+5=PM12.0,P,A,1
-6=reg_shadow,P,A,1
+6=PMK23,P,A,1
-7=vreg_ctr[VREG_C_IRQ3],P,A,1
+7=vreg_ctr[0x0e],P,A,1
-8=vreg_ctr[0x1b],P,A,1
+8=iic_mcu_bus_status,P,A,1
-9=system_status.pwr_state,P,A,1
+9=diff,P,A,1
-10=P12.0,P,A,1
+10=reg_shadow,P,A,1
-11=PM12,P,A,1
+11=reg1_old,P,A,1
-12=PM12.0,P,A,1
+12=vreg_ctr,P,A,1
-13=PMK23,P,A,1
+13=raw_adc_temperature,P,A,1
-14=vreg_ctr[0x0e],P,A,1
+14=PM2,P,A,1
-15=iic_mcu_bus_status,P,A,1
+15=P2,B,A,1
 [Software Break]
-Geometry=0, 0, 0, 0
+Geometry=1069, 594, 500, 200
-Window=Hide
+Window=Normal
 Width=150 30 200 100
-Name0=Swb00004
+Name0=Swb00003
-Address0=task_sys.c#_tsk_sys+0xe6
+Address0=pm.c#_ntr_pmic_comm+0x90
 Window0=ASM
 Status0=ON
-Name1=Swb00002
+Name1=Swb00004
-Address1=accero.c#_acc_hosu_set+0x16
+Address1=pm.c#_ntr_pmic_comm+0x69
 Window1=ASM
 Status1=ON
-Name2=Swb00003
+Name2=Swb00006
-Address2=accero.c#_acc_hosu_set+0x24
+Address2=pm.c#_ntr_pmic_comm+0x61
 Window2=ASM
 Status2=ON
-Name3=Swb00001
+Name3=Swb00007
-Address3=task_sys.c#_tsk_sys+0xbe
+Address3=pm.c#_ntr_pmic_comm+0x30
 Window3=ASM
 Status3=ON
-Count=4
+Name4=Swb00001
+Address4=pm.c#_ntr_pmic_comm+0xbc
+Window4=ASM
+Status4=ON
+Name5=Swb00014
+Address5=pm.c#_PM_bt_temp_update+0x96
+Window5=ASM
+Status5=ON
+Count=6
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prk

@@ -20,7 +20,12 @@ OpenFile13=led.c,0,286,286,1469,912,45,278,46,0
 OpenFile14=ProjectWindow
 PrjPos=0,2,754,3,253
 OpenFile15=config.h,0,225,465,1115,1086,26,8,25,0
-OpenFile16=OutputWindow
+OpenFile16=task_debug.c,0,22,22,1266,779,0,21,0,0
+OpenFile17=task_sys.c,0,88,88,1332,845,44,294,44,0
+OpenFile18=vreg_ctr.c,0,66,66,1310,823,0,133,72,0
+OpenFile19=task_misc.c,0,44,44,1288,801,28,155,28,0
+OpenFile20=i2c_twl.c,0,110,110,1354,867,0,156,0,0
+OpenFile21=OutputWindow
 OutputPos=0,629,1096,785,1585
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]

trunk/yav_mcu_bsr.sdb

@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4af77c45
+T=4afa979d
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -11,13 +11,13 @@ T=4af77c45
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4af7dd7e
+T=4afa979b
 1=incs.h
 2=adc.h
 3=led.h
 4=pm.h
 [i2c_ctr.c]
-T=4af7e20d
+T=4afa8711
 1=incs.h
 [main.c]
 T=4af281ee
@@ -38,7 +38,7 @@ T=4af931e2
 1=incs.h
 2=i2c_mcu.h
 [i2c_twl.c]
-T=4add157f
+T=4afaab09
 1=incs.h
 2=i2c_twl_defs.h
 [ini_VECT.c]
@@ -52,7 +52,7 @@ T=4af37126
 T=4af7b267
 1=incs.h
 [vreg_ctr.c]
-T=4af7e20d
+T=4afa872b
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -60,13 +60,13 @@ T=4af7e20d
 5=accero.h
 6=pm.h
 [vreg_twl.c]
-T=4afa2469
+T=4afa8711
 1=incs.h
 2=jhl_defs.h
 3=vreg_twl.h
 4=vreg_ctr.h
 [adc.c]
-T=4afa2469
+T=4afa580e
 1=incs.h
 2=adc.h
 3=pm.h
@@ -92,7 +92,7 @@ T=4af2385f
 T=4ae01bca
 1=incs_loader.h
 [sw.c]
-T=4af7c32c
+T=4afa8711
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -101,18 +101,18 @@ T=4af7c32c
 6=pm.h
 7=rtc.h
 [task_debug.c]
-T=4af3e136
+T=4afa8711
 1=incs.h
 2=renge\renge.h
 3=pm.h
 [task_misc.c]
-T=4af78f0e
+T=4afa8739
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [task_sys.c]
-T=4af8c0c9
+T=4afa8724
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -134,10 +134,10 @@ T=4aca8c17
 [jhl_defs.h]
 T=4af224f5
 [user_define.h]
-T=4af79ef8
+T=4afa979d
 1=config.h
 [config.h]
-T=4afa3b77
+T=4afa41be
 [bsr_system.h]
 T=4af27e29
 [renge\renge.h]
@@ -147,10 +147,10 @@ T=4abc82ef
 [renge\renge_defs.h]
 T=4ac96e5c
 [renge\renge_task_immediate.h]
-T=4ad68780
+T=4afa8168
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4af781cc
+T=4afa8712
 1=config.h
 [loader.h]
 T=4aca8c17
@@ -166,7 +166,7 @@ T=4aca8c17
 [i2c_ctr.h]
 T=4aca8c17
 [pm.h]
-T=4af23bbb
+T=4afa901e
 [rtc.h]
 T=4af40cbb
 [adc.h]