電源シーケンス 液晶電源周りのウェイト変更

tuneボタン廃止
検出スイッチ廃止でコードも削除

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

trunk/adc.c

@@ -49,10 +49,6 @@ void tsk_adc(  )
                 task_interval = ( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK );
             }
 
-
-
-
-
 #if 0
             tune ・ﾌ変化では割り込みを入れない
                 // tune
@@ -91,15 +87,14 @@ void tsk_adc(  )
 
             }
 
-            // codec‚É“`‚¦‚é
+            if( sndvol_codec != vreg_ctr[VREG_C_SND_VOL] )
-            if( vreg_ctr[VREG_C_SND_VOL] != sndvol_codec )
             {
-                sndvol_codec = ( vreg_ctr[VREG_C_SND_VOL] / 2 + vreg_ctr[VREG_C_SND_VOL] / 4 ) / 2;
+                sndvol_codec = vreg_ctr[VREG_C_SND_VOL];
-#ifndef _CODEC_CTR_
+                // codec‚É“`‚¦‚é
-                iic_mcu_write_a_byte( IIC_SLA_DCP, 0, sndvol_codec );
+                iic_mcu_write_a_byte( IIC_SLA_DCP, 0,
-#else
+                    ( sndvol_codec / 2 + vreg_ctr[VREG_C_SND_VOL] / 4 ));
-                iic_mcu_write_a_byte( IIC_SLA_CODEC, REG_ADRS_CODEC_VOL, sndvol_codec );
+                iic_mcu_write_a_byte( IIC_SLA_CODEC, REG_ADRS_CODEC_VOL,
-#endif
+                    127 - ( sndvol_codec / 2 + vreg_ctr[VREG_C_SND_VOL] / 4 )/2 );
             }
             adc_updated = 0;
         }

trunk/config.h

@@ -15,7 +15,8 @@
 #define _MODEL_TS0_
 //#define _MODEL_CTR_
 
-//#define _CODEC_CTR_
+//#define _SW_HOME_ENABLE_
+#define _CODEC_CTR_
 
 
 #ifdef _MODEL_TEG2_
@@ -41,6 +42,7 @@
 #define _PMIC_CTR_
 #define _MCU_BSR_
 #define _CODEC_CTR_
+#define _SW_HOME_ENABLE_
 #endif
 */
 

trunk/i2c_ctr.c

@@ -7,17 +7,6 @@
 
 // u16   tot;
 
-#if 0 
-
-#ifndef _PMIC_CTR_
-#define IRQ0_neg          { PM3.0 = 1; }
-#else
-
-#define IRQ0_neg          { PM7.6 = 1; }
-#endif
-
-#endif
-
 
 #ifdef _MCU_BSR_
 // #ifdef _MODEL_TS0_ || _MODEL_WM0_

trunk/loader.c

@@ -247,7 +247,7 @@ void hdwinit2(  )
     PU4 = 0b00000000;          // 外部でプルアップしてほしいtool0,1)
     PU5 = 0b00000011;
     PU7 = 0b00011001;
-    PU12 = 0b00000000;
+    PU12 = 0b00000100;
     PU14 = 0b00000000;
 
 #ifdef _MCU_BSR_

trunk/pm.c

@@ -260,8 +260,8 @@ task_status_immed PM_bt_temp_update(  )
 err PM_LCD_on(  )
 {
 //  PM_TEG_LCD_dis( 0 );  // 何もしない
-    wait_ms( DELAY_PM_TSS_50B );
+    wait_ms( DELAY_PM_TSS_50B_AND_VCOM );
-    wait_ms( DELAY_PM_TSS_50B );
+    wait_ms( DELAY_PM_VCOM_TO_BL );
     vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
 
     return ( PM_chk_LDSW(  ) );
@@ -326,13 +326,13 @@ task_status_immed tski_vcom_set(  )
 err PM_LCD_on(  )
 {
     PM_VDDLCD_on(  );
-    wait_ms( DELAY_PM_TSS_50B );
 
-    wait_ms( DELAY_PM_5V_TO_VCOM );
+    wait_ms( DELAY_PM_TSS_50B_AND_VCOM );
 
     PM_TCOM_VCS_on(  );
 
-    wait_ms( DELAY_PM_TSS_50B );
+    wait_ms( DELAY_PM_VCOM_TO_BL );
+
     iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0x4A );   // バグ持ちPMIC対策
     vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
 
@@ -344,9 +344,9 @@ err PM_LCD_on(  )
 err PM_LCD_off(  )
 {
     PM_TCOM_VCS_off(  );
-    wait_ms( 1 + 50 );
+    wait_ms( DELAY_PM_LCD_OFF );
 
-//  PM_VDDLCD_off(); // 残ってたの全部止めます。
+    PM_VDDLCD_off(  ); // 残ってたの全部止めます。
     vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
 
     SND_DEPOP = 1;
@@ -468,7 +468,7 @@ err PM_sys_pow_on(  )
     PM_VDD_on(  );
     wait_ms( DELAY_PM_TW_PWUP );
 
-    PM_VDD50A_on(  );
+    PM_VDD50A_on(  );  // 液晶電源ではなく、ledとかに使うものです
 
     wait_ms( DELAY_PM_TW_PWUP );
     iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, 0x03 );   // バグ持ちPMIC対策 強制PWM

trunk/pm.h

@@ -48,9 +48,10 @@ enum PMIC_REG_ADRS
 
 
 #define DELAY_PM_TW_PWUP               16
-#define DELAY_PM_TSS_50B               5
+#define DELAY_PM_TSS_50B_AND_VCOM      ( 5 + 17 )
 #define DELAY_PM_5V_TO_VCOM            17
-
+#define DELAY_PM_VCOM_TO_BL            ( 17 + 5 )
+#define DELAY_PM_LCD_OFF               ( 50 + 1 )
 
 
 //=========================================================

trunk/tasks.c

@@ -34,10 +34,7 @@ void tsk_misc_stat(  )
         interval_task_misc_stat = ( INTERVAL_TSK_MISC_STAT / SYS_INTERVAL_TICK );
     }
 
-    SHELL_CLOSE_P = 1;
-    set_bit( EXT_OPT_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_EXT_OPT_OPEN );
     set_bit( SHELL_CLOSE, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_CLOSED );
-    SHELL_CLOSE_P = 0;
 
 
     // ステータスレジスタ関係 → 割り込み //
@@ -104,19 +101,6 @@ void tsk_misc_stat(  )
                 }
             }
 
-            if( diff & REG_BIT_ST_EXT_OPT_OPEN )
-            {
-                // ƒIƒvƒVƒ‡ƒ“ŠWƒ<57>ƒbƒN
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_ST_EXT_OPT_OPEN )
-                {
-                    set_irq( VREG_C_IRQ2, REG_BIT_EXTOPT_LOCK );
-                }
-                else
-                {
-                    set_irq( VREG_C_IRQ2, REG_BIT_EXTOPT_OPEN );
-                }
-            }
-
             if( diff & REG_BIT_ST_SHELL_CLOSED )
             {
                 // 蓋の開け閉め
@@ -270,7 +254,6 @@ task_status_immed do_command0(  )
     if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_OFF_REQ )
     {
         system_status.pwr_state = OFF_TRIG;
-
     }
     else
     {
@@ -283,16 +266,18 @@ task_status_immed do_command0(  )
             RESET2_ast;
 #endif
             FCRAM_RST_ast;
+            wait_ms( 5 );
         }
         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 );
         }
-        wait_ms( 5 );
 #ifdef _PMIC_TWL_
         RESETs_neg;
 #else
@@ -311,6 +296,7 @@ task_status_immed do_command0(  )
     {
         renge_task_immed_add( tski_PM_BL_off );
     }
+
     if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_ON )
     {
         renge_task_immed_add( tski_PM_LCD_on );

trunk/tasks_sys.c

@@ -146,15 +146,8 @@ void tsk_sys(  )
 
         system_status.pwr_state = ON;
 
-#ifndef _CODEC_CTR_
+        iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 );     // ACR←0x80 揮発モードへ
-        {
+        // todo
-            u8      temp;
-//      do{
-            temp = iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 );     // ACR←0x80 揮発モードへ
-            NOP(  );
-//      }while( temp != ERR_SUCCESS );
-        }
-#endif
 
         system_status.poweron_reason = PWSW;
         break;
@@ -162,8 +155,7 @@ void tsk_sys(  )
     case ON:                   //---------------------------------------------
         {
             // PMICによる強制電源断チェック
-            static u8 count;
+            static u16 count;
-
             if( !RESET1_n )
             {
                 count += 1;
@@ -173,7 +165,7 @@ void tsk_sys(  )
                 count = 0;
             }
 
-            if( count > 50 ){
+            if( count > 65530 ){
                 /// コマンドで、正規にリセットをかけたときには、
                 /// このチェックに引っかからないので大丈夫
                 system_status.pwr_state = OFF_TRIG;
@@ -197,12 +189,23 @@ void tsk_sys(  )
         break;
 
     case SLEEP:                //------------------------------------------
+    {
+            static u16 count;
+
         if( !RESET1_n )
         {
+            count += 1;
+        }
+        else
+        {
+            count = 0;
+        }
+
+        if( count > 65530 ){
             system_status.pwr_state = OFF_TRIG;
             renge_task_interval_run_force = 1;
         }
-
+}
         // スリープから復帰
       if( !SLP_REQ ){
 #ifdef _MODEL_CTR_
@@ -411,10 +414,14 @@ void tsk_sw(  )
 
         break;
     }
+
+    // ボタン押し時間のカウント
     if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == OFF ) )
     {
         count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask );
+#ifdef _SW_HOME_ENABLE_
         count_sw_n( SW_HOME_n, SW_home_count, SW_home_mask );
+#endif
         count_sw_n( SW_WIFI_n, SW_wifi_count, SW_wifi_mask );
     }
 

trunk/user_define.h

@@ -65,8 +65,8 @@ extern unsigned char temp_teg;
 
 // SoC
 #ifndef _MODEL_TS0_
-#define IRQ0_ast            { P3.0 = 0; PM3.0 = 0; }
+#define IRQ0_ast          { P3.0 = 0; PM3.0 = 0; }
-//#define IRQ0_neg          { PM3.0 = 1; }
+#define IRQ0_neg          { PM3.0 = 1; }
 #define IRQ0              ( P3.0 )
 #else
 
@@ -177,15 +177,12 @@ extern unsigned char temp_teg;
 #define DIPSW_1              P4.1       // mini cube ソフトウェアディップスイッチ
 
 #define SHELL_CLOSE          P7.1       // INTP5 ふた開閉 (閉じると?)
-#define SHELL_CLOSE_P        P3.3
 
 //#define DBG_VR               P2.6
 // ANI6
 
 #define DBG                  P14.1
 
-#define EXT_OPT_OPEN         P12.2
-
 #ifdef _MODEL_TEG2_
 #define ACC_VALID            P15.2
 #define ACCEL_INT1           P2.5

trunk/vreg_ctr.h

@@ -51,10 +51,9 @@
 //  VREG_C_STATUS,
 #define REG_BIT_LCD_POW             ( 1 << 7 )
 #define REG_BIT_BL                  ( 1 << 6 )
-// #define REG_BIT_BATT_CHARGE_ERR     ( 1 << 5 )
+#define REG_BIT_BATT_CHARGE_ERR     ( 1 << 5 )
 #define REG_BIT_BATT_CHARGE         ( 1 << 4 )
 #define REG_BIT_POW_SUPPLY          ( 1 << 3 )
-#define REG_BIT_ST_EXT_OPT_OPEN     ( 1 << 2 )
 #define REG_BIT_ST_SHELL_CLOSED     ( 1 << 1 )
 
 

trunk/yav_mcu_bsr.plg

@@ -1,90 +1,10 @@
 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 -qcvjl1wt -sainter_asm -zp -no loader.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\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 -qcvjl1wt -sainter_asm -zp -no pm.c
-pm.c(222) : CC78K0R warning W0745: Expected function prototype
-pm.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(243) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_write'
-pm.c(606) : 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 -qcvjl1wt -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 -qcvjl1wt -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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -no i2c_mcu.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_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 -qcvjl1wt -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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -no led.c
-led.c(414) : 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\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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -no vreg_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\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 -qcvjl1wt -sainter_asm -zp -no vreg_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\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 -qcvjl1wt -sainter_asm -zp -no tasks.c
-tasks.c(34) : 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\tasks.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 -qcvjl1wt -sainter_asm -zp -no adc.c
-adc.c(78) : CC78K0R warning W0745: Expected function prototype
-adc.c(49) : 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\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 -qcvjl1wt -sainter_asm -zp -no tasks_sys.c
-tasks_sys.c(340) : CC78K0R warning W0401: Conversion may lose significant digits
+tasks_sys.c(343) : 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\tasks_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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -no self_flash.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\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 -qcvjl1wt -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\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 tasks.rel adc.rel renge.rel tasks_sys.rel accero.rel self_flash.rel reboot.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
@@ -92,4 +12,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) : 13 
+Build Total error(s) : 0  Total warning(s) : 1 

trunk/yav_mcu_bsr.pri

@@ -996,11 +996,11 @@ Address0=self_flash.c#_firm_update+0x209
 Window0=ASM
 Status0=ON
 Name1=Swb00002
-Address1=adc.c#_tsk_adc+0x86
+Address1=adc.c#_tsk_adc+0x7a
 Window1=ASM
 Status1=ON
 Name2=Swb00003
-Address2=tasks_sys.c#_tsk_sys+0x4
+Address2=tasks_sys.c#_tsk_sys+0x3
 Window2=ASM
 Status2=ON
 Count=3

trunk/yav_mcu_bsr.prk

@@ -1,9 +1,9 @@
 [ProjectManager]
-FrameMax=0
+FrameMax=1
-FrameX=111
+FrameX=2
-FrameY=10
+FrameY=2
-FrameCX=1376
+FrameCX=1022
-FrameCY=1066
+FrameCY=766
 OpenFile1=i2c_mcu.c,0,330,330,1204,1087,48,321,48,0
 OpenFile2=renge\\renge_defs.h,0,330,330,1574,1087,0,47,0,0
 OpenFile3=user_define.h,0,176,176,1420,933,0,33,20,0
@@ -17,15 +17,15 @@ OpenFile10=main.c,0,124,87,1368,844,0,45,0,0
 OpenFile11=vreg_ctr.c,0,345,273,1060,932,14,23,0,0
 OpenFile12=i2c_ctr.c,0,242,242,1425,868,14,108,0,0
 OpenFile13=reboot.c,0,110,110,1354,867,5,14,14,0
-OpenFile14=adc.c,0,166,66,1349,692,0,49,0,0
+OpenFile14=led.c,0,286,286,1469,912,0,420,6,0
-OpenFile15=led.c,0,286,286,1469,912,0,420,6,0
+OpenFile15=ProjectWindow
-OpenFile16=pm.c,0,88,88,1332,845,13,352,9,0
-OpenFile17=config.h,0,259,332,1503,1089,0,1,0,0
-OpenFile18=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile19=tasks.c,0,44,41,1288,801,14,34,0,0
+OpenFile16=adc.c,0,0,0,790,447,0,97,0,0
+OpenFile17=config.h,0,259,332,1503,1089,2,18,21,0
+OpenFile18=pm.c,0,100,80,890,527,63,336,63,0
+OpenFile19=tasks_sys.c,0,242,242,1486,999,1,208,23,0
 OpenFile20=OutputWindow
-OutputPos=0,134,1090,377,1505
+OutputPos=0,360,1128,478,1503
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0

trunk/yav_mcu_bsr.sdb

@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4ae69c33
+T=4ae7c536
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -11,13 +11,13 @@ T=4ae69c33
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4ae66ba6
+T=4ae80b7d
 1=incs.h
 2=adc.h
 3=led.h
 4=pm.h
 [i2c_ctr.c]
-T=4ae66d1d
+T=4ae78e76
 1=incs.h
 [main.c]
 T=4adee91e
@@ -65,13 +65,13 @@ T=4ade5fd9
 2=jhl_defs.h
 3=vreg_twl.h
 [tasks.c]
-T=4ae6b094
+T=4ae80ac4
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [adc.c]
-T=4ae6462f
+T=4ae7e02a
 1=incs.h
 2=adc.h
 3=pm.h
@@ -84,7 +84,7 @@ T=4ac96eb4
 4=WDT.h
 5=bsr_system.h
 [tasks_sys.c]
-T=4ae6b094
+T=4ae82f9a
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -118,10 +118,10 @@ T=4aca8c17
 [jhl_defs.h]
 T=4ae647cd
 [user_define.h]
-T=4ae6b094
+T=4ae7c500
 1=config.h
 [config.h]
-T=4ae69c33
+T=4ae82e78
 [bsr_system.h]
 T=4aca8c17
 [renge\renge.h]
@@ -134,7 +134,7 @@ T=4ac96e5c
 T=4ad68780
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4ae69c33
+T=4ae7c500
 1=config.h
 [loader.h]
 T=4aca8c17
@@ -150,7 +150,7 @@ T=4aca8c17
 [i2c_ctr.h]
 T=4aca8c17
 [pm.h]
-T=4ae6a7ef
+T=4ae80b79
 [rtc.h]
 T=4aca8c17
 [adc.h]