レジスタマップの変更に対応

一部のマクロを関数に置き換え
温度の計算をまじめに行う。浮動小数点を使ったら1msも掛かった
　場合によっては戻す


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

trunk/adc.c

@@ -104,7 +104,7 @@ void tsk_adc(  )
 
             // TUNE_LED //
             {
-                // ここで？仕様？　
+                // ここで？仕様？
                 switch ( vreg_ctr[VREG_C_LED_TUNE] )
                 {
                 case ( 1 ):            // “_“”

trunk/config.h

@@ -9,7 +9,6 @@
 
 
 //#define _PARRADIUM_
-
 //#define _MODEL_TEG2_
 //#define _MODEL_WM0_
 #define _MODEL_TS0_

trunk/i2c_ctr.c

@@ -93,7 +93,8 @@ __interrupt void int_iic_ctr(  )
             if( !( ( vreg_ctr[VREG_C_IRQ0] == 0 )
                    && ( vreg_ctr[VREG_C_IRQ1] == 0 )
                    && ( vreg_ctr[VREG_C_IRQ2] == 0 )
-                   && ( vreg_ctr[VREG_C_IRQ3] == 0 ) ) )
+                   && ( vreg_ctr[VREG_C_IRQ3] == 0 )
+                   && ( vreg_ctr[VREG_C_IRQ4] == 0 ) ) )
             {
                 IRQ0_neg;
                 while( !IRQ0 )

trunk/jhl_defs.h

@@ -23,41 +23,4 @@ typedef unsigned char err;
 }
 
 
-// 割り込みマスクが必要と言うことでこんな事をする羽目になりました
-#if 0
-// マスクされてたら、フラグは立てるが、割り込みは入れない。
-#define set_irq( irqreg, bitpos )               \
-{                                               \
-  vreg_ctr[ irqreg ] |= bitpos;                 \
-  if( ( vreg_ctr[ irqreg+8 ] & bitpos ) == 0 ){ \
-    IRQ0_ast;                                   \
-  }                                             \
-}
-#endif
-
-#ifndef _PARRADIUM_
-// マスクされてたら、フラグも立てず、割り込みも入れない。
-#define set_irq( irqreg, bitpos )               \
-{                                               \
-  if( ( vreg_ctr[ irqreg+8 ] & bitpos ) == 0 ){ \
-    IRQ0_neg;                                   \
-    vreg_ctr[ irqreg ] |= bitpos;               \
-    while( !IRQ0 );                             \
-    IRQ0_ast;                                   \
-  }                                             \
-}
-
-#else
-
-#define set_irq( irqreg, bitpos )               \
-{                                               \
-  if( ( vreg_ctr[ irqreg+8 ] & bitpos ) == 0 ){ \
-    IRQ0_neg;                                   \
-    vreg_ctr[ irqreg ] |= bitpos;               \
-    IRQ0_ast;                                   \
-  }                                             \
-}
-
-#endif
-
 #endif

trunk/main.c

@@ -97,3 +97,5 @@ static void read_dipsw(  )
     system_status.dipsw1 = ( DIPSW_1 == 0 ) ? 0 : 1;
 //  PU4 &= ~0x03;
 }
+
+

trunk/pm.c

@@ -14,7 +14,7 @@
 
 
 // ========================================================
-
+u8 command_bl_set;
 
 
 
@@ -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 ) != ERR_SUCCESS )
+    if( iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_MODE, 2, &dat_16.chars.lsb ) != ERR_SUCCESS )
     {
-        vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR;
+        vreg_ctr[ VREG_C_STATUS_1 ] |= 0x01;
     }
     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 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16._u16 );
 
         // 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 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16._u16 );
 
         // 4. 一時的にRCOMPを変更
         dat_16._u16 = swap_endian_16( 0xFF00 );
-        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &dat_16 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &dat_16._u16 );
 
         // 電池メーカーの識別
         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 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16._u16 );
 
         // 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 );
+        iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16._u16 );
 
         // おしまい //
     }
@@ -246,22 +246,20 @@ err PM_LCD_off(  )
     return ( ERR_SUCCESS );
 }
 
-err PM_BL_on(  )
+err PM_BL_set(  )
 {
+    // 何もしない
     wait_ms( 10 );
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
+    vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L )
-    return ( PM_chk_LDSW(  ) );
+        | ( command_bl_set & REG_BIT_CMD_BL_U_ON )? REG_BIT_BL_U
-}
+        | ( command_bl_set & REG_BIT_CMD_BL_L_ON )? REG_BIT_BL_L
-
+        );
-err PM_BL_off(  )
-{
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
     return ( ERR_SUCCESS );
 }
 
-
 err PM_LCD_vcom_set(  )
 {
+    // 何もしない
     return ( ERR_SUCCESS );
 }
 
@@ -287,16 +285,12 @@ err PM_LCD_off(  )
 }
 
 
-err PM_BL_on(  )
+err PM_BL_set(  )
 {
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
+    vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L )
-    return ( ERR_SUCCESS );
+    vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L )
-}
+        | ( command_bl_set & REG_BIT_CMD_BL_U_ON )? REG_BIT_BL_U
-
+        | ( command_bl_set & REG_BIT_CMD_BL_L_ON )? REG_BIT_BL_L
-
-err PM_BL_off(  )
-{
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
     return ( ERR_SUCCESS );
 }
 
@@ -353,23 +347,42 @@ err PM_LCD_off(  )
 }
 
 
-
+/* ========================================================
-err PM_BL_on(  )
+　バックライトの個別on/off
+　現状から　on/off/維持　のフラグなので面倒
+======================================================== */
+err PM_BL_set(  )
 {
-    PM_set_BL( 0x03 );
+    u8 temp;
-    wait_ms( 10 );
 
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
+    // まじめにRMW
-    return ( PM_chk_LDSW(  ) );
+    //    temp = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL );
-}
 
+    // キャッシュ(マイコン内のステータスレジスタ）を信じる
+    // 今のバックライトの状態
+    if( command_bl_set & REG_BIT_CMD_BL_U_ON )
+    {
+        vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL_U;
+    }
+    else if( command_bl_set & REG_BIT_CMD_BL_U_OFF ){
+        vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL_U;
+    }
 
+    if( command_bl_set & REG_BIT_CMD_BL_L_ON )
+    {
+        vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL_L;
+    }
+    else if( command_bl_set & REG_BIT_CMD_BL_L_OFF ){
+        vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL_L;
+    }
 
-err PM_BL_off(  )
+    iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL,
-{
+        ( vreg_ctr[VREG_C_STATUS] & ( REG_BIT_BL_U | REG_BIT_BL_L ) >> 5 ) );
-    PM_set_BL( 0x00 );
+
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
+    if( command_bl_set != 0x00 ){
-    return ( ERR_SUCCESS );
+        wait_ms( 10 );
+    }
+    return( ERR_SUCCESS );         // ここでは異常チェック不要
 }
 
 
@@ -411,24 +424,21 @@ task_status_immed tski_vcom_set(  )
 task_status_immed tski_PM_LCD_on(  )
 {
     PM_LCD_on(  );
-    return ( ERR_FINISED );
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
-}
-
-task_status_immed tski_PM_BL_on(  )
-{
-    PM_BL_on(  );
-    return ( ERR_FINISED );
-}
-
-task_status_immed tski_PM_BL_off(  )
-{
-    PM_BL_off(  );
     return ( ERR_FINISED );
 }
 
 task_status_immed tski_PM_LCD_off(  )
 {
     PM_LCD_off(  );
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
+    return ( ERR_FINISED );
+}
+
+task_status_immed tski_PM_BL_set(  )
+{
+    PM_BL_set(  );
+    set_irq( VREG_C_IRQ3, command_bl_set );
     return ( ERR_FINISED );
 }
 
@@ -447,7 +457,7 @@ task_status_immed tski_PM_LCD_off(  )
  ======================================================== */
 err PM_sys_pow_on(  )
 {
-#ifndef _PMIC_TWL_
+#ifdef _PMIC_CTR_
     u8      temp;
 
     // 電池温度測定
@@ -497,7 +507,7 @@ err PM_sys_pow_on(  )
     return ( ERR_SUCCESS );
 
 #else
-    // KE3-L で開発
+    // TWL PMIC
     u8      temp;
 
     // 電源投入
@@ -545,7 +555,7 @@ err PM_sys_pow_on(  )
 err PM_sys_pow_off(  )
 {
 #ifdef _PMIC_CTR_
-    PM_BL_off(  );
+    PM_BL_set(  );
     PM_LCD_off(  );             //     TCOM,VCS OFF も消してきます。
 
     PM_reset_ast(  );
@@ -655,12 +665,9 @@ void tsk_batt(  )
 
     if(( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_GASGAUGE_ERR ) == 0 )
     {
-        // 電池残量の取得
         {
-            u8 temp;
+            // 電池残量の取得 //
-
+            iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL, 2, &vreg_ctr[ VREG_C_BT_REMAIN ] );
-            temp = PM_get_batt_left();
-            vreg_ctr[ VREG_C_BT_REMAIN ] = temp;
             // todo 閾値を超えたら割り込み
         }
     }
@@ -679,7 +686,7 @@ void tsk_batt(  )
         iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, 0 );
     }
 
-    
+
 
 
     vreg_ctr[ VREG_C_FREE0 ] = vreg_ctr[ VREG_C_BT_REMAIN ];
@@ -742,36 +749,54 @@ task_status_immed ntr_pmic_comm(  )
 
     DI(  );
 
-    if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL ) != 0 )  // バックライトの2ビットが何らか変化して、
+    // バックライト 上 がどうかした
+    if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 )
     {
-        if( ( reg_shadow & REG_BIT_TWL_REQ_BL ) == 0x00 )          // 00になった
+        if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 )             // 消えた
         {
-            // 両方消された
+            vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_U_OFF;
-            vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_BL_OFF;
+            if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_U_OFF ) == 0 )
-            if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_BL_OFF ) == 0 )
             {
                 IRQ0_ast;
             }
         }
-        else if( ( reg_shadow & REG_BIT_TWL_REQ_BL ) == REG_BIT_TWL_REQ_BL )
+        else
         {
-            // 両方ついた
+            vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_U_ON;
-            vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_BL_ON;
+            if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_U_ON ) != 0 )
-            if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_BL_ON ) == 0 )
             {
                 IRQ0_ast;
             }
         }
     }
 
-    else
+    // バックライト 下
+    if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_L ) != 0 )
+    {
+        if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 )             // 消えた
+        {
+            vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_L_OFF;
+            if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_L_OFF ) == 0 )
+            {
+                IRQ0_ast;
+            }
+        }
+        else
+        {
+            vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_L_OFF;
+            if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_L_OFF ) != 0 )
+            {
+                IRQ0_ast;
+            }
+        }
+    }
 
     // offリクエスト
     if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 )
     {
-        set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ );
+        set_irq( VREG_C_IRQ4, REG_BIT_TWL_OFF_REQ );
-        vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_OFF_REQ;
+        vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_OFF_REQ;
-        if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_OFF_REQ ) == 0 )
+        if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_OFF_REQ ) == 0 )
         {
             IRQ0_ast;
         }
@@ -780,10 +805,14 @@ task_status_immed ntr_pmic_comm(  )
     else
 
     // リセットリクエスト
-    if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 )
+
+    // CODECバグ回避
+    // リセット単品でなかったら無視
+//    if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 )
+    if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ )
     {
-        vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_RESET_REQ;
+        vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_RESET_REQ;
-        if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_RESET_REQ ) == 0 )
+        if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_RESET_REQ ) == 0 )
         {
             IRQ0_ast;
         }

trunk/pm.h

@@ -38,24 +38,33 @@ enum PMIC_REG_ADRS
 //=========================================================
 // CODEC上のPMIC互換レジスタ
 #define CODEC_REG_PM 0x10
-#define CODEC_REG_BT 0x18
+#define CODEC_REG_BL 0x11
+#define CODEC_REG_BT 0x12
 
 // TWLがSPIでPMICに投げたコマンド
 #define REG_BIT_TWL_REQ_OFF_REQ  ( 1 << 6 )
 #define REG_BIT_TWL_REQ_RST_REQ  ( 1 << 0 )
-#define REG_BIT_TWL_REQ_BL       ( 3 << 2 )
+#define REG_BIT_TWL_REQ_BL_U     ( 1 << 3 )
-
+#define REG_BIT_TWL_REQ_BL_L     ( 1 << 2 )
 
 
 
+// 0x03 pw cnt3
 #define PM_REG_BIT_LDSW      ( 1 << 0 )
 #define PM_REG_BIT_nRST1     ( 1 << 1 )
+
+// 0x01 pw cnt1
 #define PM_REG_BIT_VDD        0x0F
 #define PM_REG_BIT_VDD50A    ( 1 << 4 )
 
+// 0x02 pw cnt2
 #define PM_REG_BIT_VDDLCD      0x07
 #define PM_REG_BIT_LCD_ANALOG ( 0x03 << 3 )
 
+// 0x04 bl cnt
+#define PM_REG_BIT_BL_U         0x02
+#define PM_REG_BIT_BL_L         0x01
+
 
 #define DELAY_PM_TW_PWUP               16
 #define DELAY_PM_TSS_50B_AND_VCOM      ( 5 + 17 )
@@ -66,6 +75,7 @@ enum PMIC_REG_ADRS
 
 //=========================================================
 extern u8 raw_adc_temperature;
+extern u8 command_bl_set;
 
 
 
@@ -79,11 +89,9 @@ void PM_init(  );
 err PM_LCD_vcom_set(  );
 task_status_immed tski_vcom_set(  );
 
-err PM_BL_on(  );
+err PM_BL_set(  );
-err PM_BL_off(  );
 
-task_status_immed tski_PM_BL_on(  );
+task_status_immed tski_PM_BL_set(  );
-task_status_immed tski_PM_BL_off(  );
 task_status_immed tski_PM_LCD_on(  );
 task_status_immed tski_PM_LCD_off(  );
 
@@ -92,7 +100,6 @@ task_status_immed tski_PM_LCD_off(  );
 //  　これを呼ぶ前に、現在温度を教えておく必要があります。
 #define PM_get_batt_left()       ( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC ) )
 
-
 #define PM_reset()               ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT, 0x00 ) )
 
 
@@ -130,6 +137,7 @@ task_status_immed tski_PM_LCD_off(  );
 #define PM_reset_neg() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW | PM_REG_BIT_nRST1 )))
 #define PM_reset_ast() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW )))
 #define PM_chk_LDSW()  ( iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT ) & PM_REG_BIT_LDSW )
+// <20>ª 0 ‚¾‚ƈÙ<CB86>í
 #endif
 
 
@@ -139,7 +147,7 @@ task_status_immed tski_PM_LCD_off(  );
 #define PM_TCOM_VCS_off() PM_VDDLCD_on()
 #define PM_VDDLCD_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, 0 ) )
 
-#define PM_set_BL( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, dat ) )
+//#define PM_set_BL( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, dat ) )
 #define PM_set_adc1( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC1, dat ) )
 #define PM_set_adc2( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC2, dat ) )
 

trunk/renge/renge.c

@@ -333,4 +333,3 @@ void wait_ms( u8 ms ){
     }
   }
 }
-

trunk/sw.c

@@ -17,7 +17,7 @@
 //=========================================================
 #define INTERVAL_TSK_SW  16
 #define CLICK_THRESHOLD  3
-#define HOLD_THREASHOLD ( 800 / INTERVAL_TSK_SW )
+#define HOLD_THREASHOLD ( 600 / INTERVAL_TSK_SW )
 
 
 

trunk/task_debug.c

@@ -9,6 +9,8 @@
 
 
 
+extern u8 command_bl_set;
+
 
 /* ========================================================
  ======================================================== */
@@ -23,8 +25,9 @@ void tsk_debug(  )
         iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 );     // ACR←0x80 揮発モードへ
 
         if( !SW_SEL_n ){
-            renge_task_immed_add( tski_PM_LCD_on );
+            command_bl_set = REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_L_ON;
-            renge_task_immed_add( tski_PM_BL_on );
+            PM_LCD_on();
+            PM_BL_set();
         }
 
 //        vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03;

trunk/task_misc.c

@@ -11,8 +11,6 @@
 
 #define INTERVAL_TSK_MISC_STAT 4
 
-
-
 /* ========================================================
  ステータスレジスタなど
  ======================================================== */
@@ -57,18 +55,33 @@ void tsk_misc_stat(  )
                 }
             }
 
-            if( diff & REG_BIT_BL )
+            if( diff & REG_BIT_BL_U )
             {
                 // バックライトに変化有り
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL )
+                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL_U )
                 {
                     // ついた
-                    set_irq( VREG_C_IRQ3, REG_BIT_BL_ON );
+                    set_irq( VREG_C_IRQ4, REG_BIT_BL_U_ON );
                 }
                 else
                 {
                     // 消えた
-                    set_irq( VREG_C_IRQ3, REG_BIT_BL_OFF );
+                    set_irq( VREG_C_IRQ4, REG_BIT_BL_U_OFF );
+                }
+            }
+
+            if( diff & REG_BIT_BL_L )
+            {
+                // バックライトに変化有り
+                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL_L )
+                {
+                    // ついた
+                    set_irq( VREG_C_IRQ4, REG_BIT_BL_L_ON );
+                }
+                else
+                {
+                    // 消えた
+                    set_irq( VREG_C_IRQ4, REG_BIT_BL_L_OFF );
                 }
             }
 
@@ -154,14 +167,18 @@ void tsk_misc_stat(  )
  ======================================================== */
 task_status_immed do_command(  )
 {
-
+    // cmd0 本体電源など
-    // 本体電源など
     if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_OFF_REQ )
     {
         system_status.pwr_state = OFF_TRIG;
     }
     else
     {
+        if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ )
+        {
+            FCRAM_RST_ast;
+            wait_ms( 5 );
+        }
         if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET1_REQ )
         {
             PM_reset_ast(  );
@@ -169,41 +186,34 @@ task_status_immed do_command(  )
             FCRAM_RST_ast;
             wait_ms( 5 );
         }
-        if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ )
+        else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ )
         {
             RESET2_ast;
             wait_ms( 5 );
         }
-        if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ )
-        {
-            FCRAM_RST_ast;
-            wait_ms( 5 );
-        }
         PM_reset_neg(  );
         RESET2_neg;
         FCRAM_RST_neg;
     }
+    vreg_ctr[VREG_C_COMMAND0] = 0;
 
-    // 液晶電源など
+    // cmd1 液晶電源など
-    if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_ON )
+    command_bl_set = ( vreg_ctr[VREG_C_COMMAND1] & ( REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_ON | REG_BIT_CMD_BL_L_OFF ));
+    if( command_bl_set != 0 )
     {
-        renge_task_immed_add( tski_PM_BL_on );
+        renge_task_immed_add( tski_PM_BL_set );
-    }
-    else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_OFF )
-    {
-        renge_task_immed_add( tski_PM_BL_off );
     }
 
-    if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_ON )
+    if( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_CMD_LCD_ON )
     {
         renge_task_immed_add( tski_PM_LCD_on );
     }
-    else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_OFF )
+    else if( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_CMD_LCD_OFF )
     {
         renge_task_immed_add( tski_PM_LCD_off );
     }
 
-    vreg_ctr[VREG_C_COMMAND0] = 0;
+    vreg_ctr[VREG_C_COMMAND1] = 0;
     return ( ERR_FINISED );
 }
 

trunk/task_sys.c

@@ -320,7 +320,7 @@ __interrupt void intp0_slp(  )
     system_status.pwr_state = SLEEP_TRIG;
   }else{
     system_status.pwr_state = ON_TRIG;
-    if( PM_BL_on() == 0 ){
+    if( PM_BL_set() != ERR_SUCCESS ){
       renge_task_interval_run_force = 1;
       iic_mcu_stop();
       system_status.pwr_state = OFF_TRIG;

trunk/vreg_ctr.c

@@ -87,6 +87,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
         break;
 
     case ( VREG_C_COMMAND0 ):
+    case ( VREG_C_COMMAND1 ):
         vreg_ctr[adrs] = data;
         if( data != 0 )
         {
@@ -94,21 +95,19 @@ void vreg_ctr_write( u8 adrs, u8 data )
         }
         break;
 
-    case ( VREG_C_COMMAND1 ):
+    case ( VREG_C_COMMAND2 ):
         vreg_ctr[adrs] = data;
         if( data != 0 )
         {
-            // renge_task_immed_add( do_command1 );
+            vreg_twl[REG_TWL_INT_ADRS_IRQ]  = ( ( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_TWL_CMD_PWSW_DET ) != 0 ) ? REG_BIT_TWL_IRQ_PWSW_DET : 0x00;   //pwsw_det
-            /// Ž<>‚Á‚Ä‚«‚Ü‚µ‚½
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_TWL_CMD_RESET ) != 0 ) ? REG_BIT_TWL_IRQ_RESET : 0x00;        //reset_req
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] = ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_PWSW_DET ) != 0 ) ? REG_BIT_TWL_IRQ_PWSW_DET : 0x00;   //pwsw_det
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_RESET ) != 0 ) ? REG_BIT_TWL_IRQ_RESET : 0x00;        //reset_req
 
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_OFF ) != 0 ) ? REG_BIT_TWL_IRQ_OFF : 0x00;    //off_req
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_TWL_CMD_OFF ) != 0 ) ? REG_BIT_TWL_IRQ_OFF : 0x00;    //off_req
 
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_BT_LOW ) != 0 ) ? REG_BIT_TWL_IRQ_BT_LOW : 0x00;      //batt_low
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_TWL_CMD_BT_LOW ) != 0 ) ? REG_BIT_TWL_IRQ_BT_LOW : 0x00;      //batt_low
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_BT_EMPTY ) != 0 ) ? REG_BIT_TWL_IRQ_BT_EMPTY : 0x00;  //batt_empty
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_TWL_CMD_BT_EMPTY ) != 0 ) ? REG_BIT_TWL_IRQ_BT_EMPTY : 0x00;  //batt_empty
 
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_VOL_CHANGE ) != 0 ) ? REG_BIT_TWL_IRQ_VOL_CHANGE : 0x00;      //vol_changed
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_TWL_CMD_VOL_CHANGE ) != 0 ) ? REG_BIT_TWL_IRQ_VOL_CHANGE : 0x00;      //vol_changed
         }
         break;
 
@@ -265,4 +264,46 @@ void vreg_ctr_after_read( u8 adrs )
         vreg_ctr[VREG_C_IRQ3] = 0;
         irq_readed = 1;
     }
+    else if( adrs == VREG_C_IRQ4 )
+    {
+        vreg_ctr[VREG_C_IRQ4] = 0;
+        irq_readed = 1;
+    }
+}
+
+
+
+
+
+
+
+
+
+/******************************************************************************
+  割り込みを入れる
+  割り込みマスクが必要と言うことでこんな事をする羽目になりました
+ *****************************************************************************/
+#if 0
+// マスクされてたら、フラグは立てるが、割り込みは入れない。
+#define set_irq( irqreg, bitpos )               \
+{                                               \
+  vreg_ctr[ irqreg ] |= bitpos;                 \
+  if( ( vreg_ctr[ irqreg+8 ] & bitpos ) == 0 ){ \
+    IRQ0_ast;                                   \
+  }                                             \
+}
+#endif
+
+// マスクされてたら、フラグも立てず、割り込みも入れない。
+void set_irq( u8 irqreg, u8 irq_flg )
+{
+    static u8 tot;   // IRQ_mcu がLに縛られてると困る(基板不良)
+
+    if( ( vreg_ctr[ irqreg + 8 ] & irq_flg ) == 0 ){
+        vreg_ctr[ irqreg ] |= irq_flg;
+        IRQ0_neg;
+        tot = 0;
+        while( !IRQ0 && ( ++tot != 0 ) ){;}
+        IRQ0_ast;
+    }
 }

trunk/vreg_ctr.h

@@ -38,39 +38,49 @@
 #define REG_BIT_SHELL_CLOSE         ( 1 << 0 )
 
 //  VREG_C_IRQ3
-#define REG_BIT_TWL_BL_ON           ( 1 << 7 )
+#define REG_BIT_LCD_ON              ( 1 << 5 )
-#define REG_BIT_TWL_BL_OFF          ( 1 << 6 )
+#define REG_BIT_LCD_OFF             ( 1 << 4 )
-#define REG_BIT_TWL_OFF_REQ         ( 1 << 5 )
+#define REG_BIT_BL_U_ON             ( 1 << 3 )
-#define REG_BIT_TWL_RESET_REQ       ( 1 << 4 )
+#define REG_BIT_BL_U_OFF            ( 1 << 2 )
-#define REG_BIT_LCD_ON              ( 1 << 3 )
+#define REG_BIT_BL_L_ON             ( 1 << 1 )
-#define REG_BIT_LCD_OFF             ( 1 << 2 )
+#define REG_BIT_BL_L_OFF            ( 1 << 0 )
-#define REG_BIT_BL_ON               ( 1 << 1 )
-#define REG_BIT_BL_OFF              ( 1 << 0 )
 
+//  VREG_C_IRQ4
+#define REG_BIT_TWL_BL_U_ON         ( 1 << 5 )
+#define REG_BIT_TWL_BL_U_OFF        ( 1 << 4 )
+#define REG_BIT_TWL_BL_L_ON         ( 1 << 3 )
+#define REG_BIT_TWL_BL_L_OFF        ( 1 << 2 )
+#define REG_BIT_TWL_OFF_REQ         ( 1 << 1 )
+#define REG_BIT_TWL_RESET_REQ       ( 1 << 0 )
 
 //  VREG_C_STATUS,
 #define REG_BIT_LCD_POW             ( 1 << 7 )
-#define REG_BIT_BL                  ( 1 << 6 )
+#define REG_BIT_BL_U                ( 1 << 6 )
-#define REG_BIT_BATT_CHARGE_ERR     ( 1 << 5 )
+#define REG_BIT_BL_L                ( 1 << 5 )
 #define REG_BIT_BATT_CHARGE         ( 1 << 4 )
 #define REG_BIT_POW_SUPPLY          ( 1 << 3 )
 #define REG_BIT_ST_SHELL_OPEN       ( 1 << 1 )
 
 //  VREG_C_STATUS_1
 #define REG_BIT_GASGAUGE_ERR        ( 1 << 0 )
+#define REG_BIT_ACCERO_ERR          ( 1 << 1 )
 
 
 // VREG_C_COMMAND0
-#define REG_BIT_CMD_LCD_ON              ( 1 << 7 )
-#define REG_BIT_CMD_LCD_OFF             ( 1 << 6 )
-#define REG_BIT_CMD_BL_ON               ( 1 << 5 )
-#define REG_BIT_CMD_BL_OFF              ( 1 << 4 )
 #define REG_BIT_FCRAM_RESET_REQ     ( 1 << 3 )
 #define REG_BIT_RESET2_REQ          ( 1 << 2 )
 #define REG_BIT_RESET1_REQ          ( 1 << 1 )
 #define REG_BIT_OFF_REQ             ( 1 << 0 )
 
 // VREG_C_COMMAND1
+#define REG_BIT_CMD_LCD_ON          ( 1 << 5 )
+#define REG_BIT_CMD_LCD_OFF         ( 1 << 4 )
+#define REG_BIT_CMD_BL_U_ON         ( 1 << 3 )
+#define REG_BIT_CMD_BL_U_OFF        ( 1 << 2 )
+#define REG_BIT_CMD_BL_L_ON         ( 1 << 1 )
+#define REG_BIT_CMD_BL_L_OFF        ( 1 << 0 )
+
+// VREG_C_COMMAND2
 #define REG_BIT_SEND_TWL_BATT_EMPTY ( 1 << 4 )
 #define REG_BIT_SEND_TWL_BATT_LOW   ( 1 << 3 )
 #define REG_BIT_SEND_TWL_OFF_REQ    ( 1 << 2 )
@@ -152,8 +162,9 @@ enum VREG_C
 
   VREG_C_TUNE = 0x08,
   VREG_C_SND_VOL,
-  VREG_C_BT_REMAIN,
   VREG_C_BT_TEMP,
+  VREG_C_BT_REMAIN,
+  VREG_C_BT_REMAIN_FINE,
 
   VREG_C_STATUS_1 = 0x0E,
   VREG_C_STATUS = 0x0F,
@@ -162,16 +173,18 @@ enum VREG_C
   VREG_C_IRQ1,
   VREG_C_IRQ2,
   VREG_C_IRQ3,
+  VREG_C_IRQ4,
 
   VREG_C_IRQ_MASK0 = 0x18,
   VREG_C_IRQ_MASK1,
   VREG_C_IRQ_MASK2,
   VREG_C_IRQ_MASK3,
+  VREG_C_IRQ_MASK4,
 
   VREG_C_COMMAND0 = 0x20,
   VREG_C_COMMAND1,
   VREG_C_COMMAND2,
-  VREG_C_COMMAND3,
+  VREG_C_COMMAND3,  // 'r' ‚Ń}ƒCƒRƒ“ƒŠƒZƒbƒg
 
   VREG_C_FREE0 = 0x24,
   VREG_C_FREE1,
@@ -234,7 +247,7 @@ void vreg_ctr_init(  );
 void vreg_ctr_write( u8 adrs, u8 data );
 u8 vreg_ctr_read( u8 phy_adrs );
 void vreg_ctr_after_read( u8 adrs );
-
+void set_irq( u8 irqreg, u8 irq_flg );
 
 
 #endif

trunk/vreg_twl.c

@@ -38,7 +38,7 @@ void vreg_twl_write( u8 adrs, u8 data )
     {
       case ( REG_TWL_INT_ADRS_VOL ):
         {
-            set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE );
+            set_irq(&vreg_ctr[ VREG_C_IRQ0 ], REG_BIT_VR_SNDVOL_CHANGE );
             break;
         }
 
@@ -53,7 +53,12 @@ void vreg_twl_write( u8 adrs, u8 data )
         break;
 
       case ( REG_TWL_INT_ADRS_COMMAND ):
-        if( ( data & 0x01 ) != 0 )
+        if( ( data & REG_BIT_TWL_OFF_REQ ) != 0 )
+        {
+            set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ );      // OFFも実装していたらしい。
+            break;
+        }
+        else if( ( data & REG_BIT_TWL_RESET_REQ ) != 0 )
         {
             set_irq( VREG_C_IRQ3, REG_BIT_TWL_RESET_REQ );      //リセットしかない。他のは、SPIから来ます。
             break;

trunk/yav_mcu_bsr.plg

@@ -11,8 +11,9 @@ Assembly complete,     0 error(s) and     0 warning(s) found.
 pm.c(189) : CC78K0R warning W0401: Conversion may lose significant digits
 pm.c(201) : CC78K0R warning W0401: Conversion may lose significant digits
 pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(611) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(380) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    4 warning(s) found.
+pm.c(621) : 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\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
@@ -57,18 +58,19 @@ Compilation complete,    0 error(s) and    0 warning(s) found.
 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(102) : 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(105) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(106) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(107) : 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(110) : 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(41) : CC78K0R warning W0511: Different argument types in function 'set_irq'
 vreg_twl.c(47) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    1 warning(s) found.
+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 -qvjl1wt -sainter_asm -zp -no adc.c
@@ -82,6 +84,10 @@ 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 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 -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
@@ -108,9 +114,10 @@ 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(38) : CC78K0R warning W0401: Conversion may lose significant digits
-task_misc.c(32) : CC78K0R warning W0401: Conversion may lose significant digits
+task_misc.c(201) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    2 warning(s) found.
+task_misc.c(30) : 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\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
@@ -124,4 +131,4 @@ 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) : 36 

trunk/yav_mcu_bsr.prk

@@ -10,23 +10,26 @@ OpenFile3=user_define.h,0,176,176,1420,933,0,33,20,0
 OpenFile4=rtc.c,0,308,308,1491,934,0,31,17,0
 OpenFile5=magic.c,0,242,242,1486,999,3,8,0,0
 OpenFile6=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0
-OpenFile7=loader.c,0,255,224,1438,850,14,85,0,0
+OpenFile7=main.c,0,124,87,1368,844,0,45,0,0
-OpenFile8=main.c,0,124,87,1368,844,0,45,0,0
+OpenFile8=led.c,0,286,286,1469,912,45,278,46,0
-OpenFile9=reboot.c,0,110,110,1354,867,5,14,14,0
+OpenFile9=task_debug.c,0,22,22,1266,779,0,21,0,0
-OpenFile10=vreg_twl.c,0,314,110,1558,867,74,90,75,0
+OpenFile10=task_sys.c,0,88,88,1332,845,44,294,44,0
-OpenFile11=renge\renge.c,0,154,154,1398,911,0,264,0,0
+OpenFile11=i2c_twl.c,0,110,110,1354,867,0,156,0,0
-OpenFile12=adc.c,0,275,163,1065,610,0,145,0,0
+OpenFile12=ProjectWindow
-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
+OpenFile13=config.h,0,225,465,1115,1086,18,39,18,0
-OpenFile16=task_debug.c,0,22,22,1266,779,0,21,0,0
+OpenFile14=vreg_ctr.h,0,154,154,1398,911,30,232,30,0
-OpenFile17=task_sys.c,0,88,88,1332,845,44,294,44,0
+OpenFile15=vreg_ctr.c,0,66,66,1310,823,0,157,17,0
-OpenFile18=vreg_ctr.c,0,66,66,1310,823,0,133,72,0
+OpenFile16=loader.c,0,186,351,1369,977,0,145,0,0
-OpenFile19=task_misc.c,0,44,44,1288,801,28,155,28,0
+OpenFile17=pm.c,0,132,132,1376,889,0,189,0,0
-OpenFile20=i2c_twl.c,0,110,110,1354,867,0,156,0,0
+OpenFile18=vreg_twl.c,0,314,110,1264,895,12,63,19,0
-OpenFile21=OutputWindow
+OpenFile19=adc.c,0,275,163,1065,610,0,96,43,0
-OutputPos=0,629,1096,785,1585
+OpenFile20=accero.c,0,176,176,1420,933,12,173,19,0
+OpenFile21=reboot.c,0,110,110,1354,867,5,14,14,0
+OpenFile22=sw.c,0,198,198,1442,955,12,137,19,0
+OpenFile23=task_misc.c,0,130,277,1374,1034,0,49,0,0
+OpenFile24=OutputWindow
+OutputPos=0,153,1097,771,1571
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0

trunk/yav_mcu_bsr.sdb

@@ -11,7 +11,7 @@ T=4afa979d
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4afa979b
+T=4afbbfd8
 1=incs.h
 2=adc.h
 3=led.h
@@ -20,7 +20,7 @@ T=4afa979b
 T=4afa8711
 1=incs.h
 [main.c]
-T=4af281ee
+T=4afbb86a
 1=incs.h
 2=WDT.h
 3=rtc.h
@@ -38,7 +38,7 @@ T=4af931e2
 1=incs.h
 2=i2c_mcu.h
 [i2c_twl.c]
-T=4afaab09
+T=4afb74bf
 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=4afa872b
+T=4afbbee0
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -60,26 +60,26 @@ T=4afa872b
 5=accero.h
 6=pm.h
 [vreg_twl.c]
-T=4afa8711
+T=4afbbfd8
 1=incs.h
 2=jhl_defs.h
 3=vreg_twl.h
 4=vreg_ctr.h
 [adc.c]
-T=4afa580e
+T=4afbbfd8
 1=incs.h
 2=adc.h
 3=pm.h
 4=led.h
 [renge\renge.c]
-T=4af291b9
+T=4afbb784
 1=renge\renge_defs.h
 2=renge\renge_task_intval.h
 3=renge\renge_task_immediate.h
 4=WDT.h
 5=bsr_system.h
 [accero.c]
-T=4af931eb
+T=4afbbfd8
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
@@ -92,7 +92,7 @@ T=4af2385f
 T=4ae01bca
 1=incs_loader.h
 [sw.c]
-T=4afa8711
+T=4afbbfd8
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -101,18 +101,18 @@ T=4afa8711
 6=pm.h
 7=rtc.h
 [task_debug.c]
-T=4afa8711
+T=4afbb1ae
 1=incs.h
 2=renge\renge.h
 3=pm.h
 [task_misc.c]
-T=4afa8739
+T=4afbbfd8
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [task_sys.c]
-T=4afa8724
+T=4afb75c7
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -132,9 +132,10 @@ T=4aca8c17
 7=i2c_mcu.h
 8=WDT.h
 [jhl_defs.h]
-T=4af224f5
+T=4afbb6e1
+1=config.h
 [user_define.h]
-T=4afa979d
+T=4afb7698
 1=config.h
 [config.h]
 T=4afa41be
@@ -150,7 +151,7 @@ T=4ac96e5c
 T=4afa8168
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4afa8712
+T=4afbbf1a
 1=config.h
 [loader.h]
 T=4aca8c17
@@ -166,7 +167,7 @@ T=4aca8c17
 [i2c_ctr.h]
 T=4aca8c17
 [pm.h]
-T=4afa901e
+T=4afbb7e1
 [rtc.h]
 T=4af40cbb
 [adc.h]