ジャイロ仮対応

自己書き換え修正（割り込み内での書き換えはメーカー非推奨のため）


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

trunk/adc.c

@@ -95,7 +95,7 @@ void tsk_adc(  )
                     iic_mcu_write_a_byte( IIC_SLA_DCP, 0,
                         sndvol_codec / 2 + sndvol_codec / 4 );  // 簡易スケーリング todo
                     // codecに伝える
-                    iic_mcu_write_a_byte( IIC_SLA_CODEC, REG_ADRS_CODEC_VOL,
+                    iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL,
                         127 - ( sndvol_codec / 2 + sndvol_codec / 4 )/2 );
                 }
                 tokidoki += 1;
@@ -129,8 +129,8 @@ void tsk_adc(  )
         ADCEN = 1;
         ADM =  0b00011011;      // セレクトモード、章圧、fCLK/6 ///ここから ↓
 
-        ADPC = 0x06;            // ADCポートのセレクト
+        ADPC = 0x02;            // ADCポートのセレクト
-        ADS = ADC_SEL_TUNE;
+        ADS = ADC_SEL_AMB_BRIT;
 //    NOP();
         ADCS = 1;               // AD開始。                     /// ここまで　↑　までに1us以上開ける
 
@@ -187,12 +187,28 @@ __interrupt void int_adc(  )
     EI(  );
     switch ( ADS )
     {
+    case ( ADC_SEL_AMB_BRIT ):
+        vreg_ctr[ VREG_C_AMBIENT_BRIGHTNESS ] = ADCRH;
+        break;
+
+    case ( ADC_SEL_GYRO_YAW ):
+        vreg_ctr[ VREG_C_GYRO_YAW ] = ADCRH;
+        break;
+
+    case ( ADC_SEL_GYRO_PITCH ):
+        vreg_ctr[ VREG_C_GYRO_PITCH ] = ADCRH;
+        break;
+
+    case ( ADC_SEL_GYRO_ROLL ):
+        vreg_ctr[ VREG_C_GYRO_ROLL ] = ADCRH;
+        break;
+
     case ( ADC_SEL_TUNE ):
         hist_tune[index] = ADCRH;
 #ifdef _MODEL_WM0_
-        vreg_ctr[VREG_C_TUNE] = 255 - getmean3( hist_tune );
+        vreg_ctr[ VREG_C_TUNE ] = 255 - getmean3( hist_tune );
 #else
-        vreg_ctr[VREG_C_TUNE] = getmean3( hist_tune );
+        vreg_ctr[ VREG_C_TUNE ] = getmean3( hist_tune );
 #endif
         break;
 
@@ -209,6 +225,7 @@ __interrupt void int_adc(  )
 
     case ( ADC_SEL_BATT_DET ):
 //    vreg_ctr[ VREG_C_DBG_BATT_DET ] = ADCRH;
+        // todo
         break;
     }
 
@@ -246,7 +263,7 @@ u8 get_adc( u8 ch )
     ADCS = 0;
     ADM = 0b00100011;          // セレクトモード、昇圧、fCLK/6  ///ここから↓
 
-    ADPC = 0x06;                // ADCポートのセレクト
+    ADPC = 0x02;                // ADCポートのセレクト
     ADS = ch;
     ADCS = 1;                   // AD開始。                     /// ここまで↑　に、1us以上開ける
 

trunk/adc.h

@@ -4,15 +4,30 @@
 #include "jhl_defs.h"
 
 ///////////////////////////////////////
+// ANI2 P22
+#define ADC_SEL_AMB_BRIT  0x02
+
+// ANI3 P23
+#define ADC_SEL_GYRO_YAW  0x03
+// ANI4 P24
+#define ADC_SEL_GYRO_PITCH 0x04
+// ANI5 P25
+#define ADC_SEL_GYRO_ROLL 0x05
+
+// ANI6 P26
 #define ADC_SEL_TUNE      0x06
+// ANI7 P27
 #define ADC_SEL_VOL       0x07
+
+// ANI8 P150
 #define ADC_SEL_BATT_TEMP 0x08
+// ANI9 P151
 #define ADC_SEL_BATT_DET  0x09
 
 
 
 ///////////////////////////////////////
-#define REG_ADRS_CODEC_VOL 19
+#define CODEC_REG_VOL 0x13
 
 
 

trunk/config.h

@@ -6,7 +6,7 @@
 
 
 #define MCU_VER_MAJOR    0x00;
-#define MCU_VER_MINOR    0x0C;
+#define MCU_VER_MINOR    0x0A;
 
 #define _OVERCLOCK_
 

trunk/loader.c

@@ -72,41 +72,9 @@ void main(  )
     {
 
         WDT_Restart(  );
-
         if( RTCEN )
         {
-         // 旧版対応　強制リセット
+           system_status.reboot = 1;
-            WDTE = 0x00;
-/*
-            {
-            u8 temp;
-
-#asm
-        	mov		A,PSW
-        	and		A,#06h
-        	mov		!_temp,A
-        #endasm
-
-            if( temp != 6 ){
-                // 新ファームにしてジャンプしてきた場合
-                while( SW_TUNE_n ){
-                    WDT_Restart(  );
-                    DBG_LED_WIFI_on;
-                    DBG_LED_WIFI_off;
-                }
-                my_reboot();
-
-            }else{
-            	// ↑で強制的にリセットベクタに"リターンした"場合
-	            system_status.reboot = 1;
-    	        while( SW_WIFI_n ){
-        	        WDT_Restart(  );
-            	    DBG_LED_WIFI_2_on;
-                	DBG_LED_WIFI_2_off;
-            	}
-            }
-            }
-*/
         }
         else
         {
@@ -249,7 +217,7 @@ void hdwinit2(  )
 #endif
 
 #ifdef _MCU_BSR_
-    PM0 = 0b00000001;          // BSRマイコンでは、reset1は監視のみになる。
+    PM0 = 0b11111101;          // BSRマイコンでは、reset1は監視のみになる。
 #else
     PM0 = 0b00000000;          // 0‚Å<E2809A>o—Í
 #endif
@@ -258,28 +226,28 @@ void hdwinit2(  )
 #ifdef _MODEL_CTR_
     PM2 = 0b11101000;
 #else
-    PM2 = 0b11101001;
+    PM2 = 0b11111111;
 #endif
-    PM3 = 0b00000000;          // P31,32は簡易I2C
+    PM3 = 0b11110000;          // P31,32は簡易I2C
 
 #ifdef _PMIC_CTR_
-    PM4 = 0b00000111;
+    PM4 = 0b11110111;
 #else
-    PM4 = 0b00001011;
+    PM4 = 0b11111011;
 #endif
 
-    PM5 = 0b00000011;
+    PM5 = 0b11110011;
-    PM6 = 0b00000000;          // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない
+    PM6 = 0b11111100;          // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない
     PM7 = 0b00011111;
-    PM12 = 0b00011111;         // 32kHzクロックのピン設定はどっちでもよい
+    PM12 = 0b11111111;         // 32kHzクロックのピン設定はどっちでもよい
-    PM14 = 0b00000001;         // debugger[1] とりあえず出力
+    PM14 = 0b11111100;         // debugger[1] とりあえず出力
-    PM15 = 0b00000111;
+    PM15 = 0b11111111;
 
 #ifdef _MCU_BSR_
 #ifdef _MODEL_CTR_
-    PM20 = 0b00111101;
+    PM20 = 0b11111101;
 #else
-    PM20 = 0b00111100;
+    PM20 = 0b11111100;
 #endif
 #else
     PM8 = 0b11111111;

trunk/main.c

@@ -22,6 +22,7 @@ static void read_dipsw(  );
 
 // ========================================================
 system_status_ system_status;
+bit update;
 
 
 u8 pool[512];                   // アップデート時のワークエリア 兼 歩数計データ
@@ -36,7 +37,24 @@ void main_loop( void )
 
     if( system_status.reboot == 0 )
     {
-        system_status.pwr_state = OFF_TRIG;
+        // システムの電源が入りっぱなしだったら、
+        // マイコンだけが再起動したのだ
+        // todo
+        iic_mcu_start(  );
+#ifdef _MCU_BSR_
+        if( RESET1_n )
+#else
+        if( PM_chk_LDSW() != 0 )
+#endif
+        {
+            PM_init(  );            // 電池残量ICの設定
+            vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO;
+            system_status.pwr_state = ON_TRIG;
+        }
+        else
+        {
+            system_status.pwr_state = OFF_TRIG;
+        }
     }
     else
     {
@@ -44,6 +62,7 @@ void main_loop( void )
         system_status.pwr_state = ON_TRIG;
         iic_mcu_start(  );
 
+/*
         // リセットだけ、かけてみる
         PM_reset_ast(  );
         RESET2_ast;
@@ -54,7 +73,7 @@ void main_loop( void )
         FCRAM_RST_neg;
         RESET2_neg;
         PM_reset_neg(  );
-
+*/
     }
 #ifdef _PARRADIUM_
         system_status.pwr_state = OFF;

trunk/pm.h

@@ -40,6 +40,7 @@ enum BT_GAUGE_REG_ADRS
 #define CODEC_REG_PM 0x10
 #define CODEC_REG_BL 0x11
 #define CODEC_REG_BT 0x12
+//#define CODEC_REG_VOL 0x13   // ...都合により、adc.hで定義
 
 // TWLがSPIでPMICに投げたコマンド
 #define REG_BIT_TWL_REQ_OFF_REQ  ( 1 << 6 )

trunk/self_flash.c

@@ -117,8 +117,6 @@ err firm_update(  )
        ●終わったら、リセットする。WDTリセットなので自分でわかる。
      */
 
-    WREL = 1;
-
     // ブロックの数だけ繰り返し
     for( target_block = INACTIVE_BOOTSECT_TOP;
          target_block <= UPDATE_BLOCK_LAST;

trunk/sw.c

@@ -75,6 +75,16 @@ void tsk_sw(  )
         cnt_force_off = 0;
         break;
 
+    case ( ON_TRIG ):
+        // “dŒ¹“Š“ü
+        SW_pow_mask = 1;
+        SW_home_mask = 1;
+        SW_wifi_mask = 1;
+        SW_pow_count = 0;
+        SW_wifi_count = 0;
+        SW_home_count = 0;
+        break;
+
     case ( ON ):
     case ( SLEEP ):
     case ( BT_CHARGE ):

trunk/task_sys.c

@@ -73,11 +73,6 @@ void tsk_sys(  )
 
         timeout = 0;
 
-        // 電源投入
-        SW_pow_mask = 1;
-        SW_home_mask = 1;
-        SW_wifi_mask = 1;
-
         // 電源投入 //
         iic_mcu_start(  );
 
@@ -112,9 +107,13 @@ void tsk_sys(  )
             vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_OFF;
             // todo?
         }
-
+        system_status.pwr_state = ON_TRIG;
         // ここまで来ると、電源投入確定
 
+        // no break //
+
+    case ON_TRIG:              //-------------------------------------------------------
+
         LED_init(  );
 
         PU7 = 0b00011101;  // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n
@@ -126,12 +125,9 @@ void tsk_sys(  )
         KRM  = 0b00000000;
 
         system_status.poweron_reason = NONE;
-        system_status.pwr_state = ON_TRIG;
         renge_task_interval_run_force = 1;
-        break;
 
-    case ON_TRIG:              //-------------------------------------------------------
+        MK0 = INT_MSK0_RSV;
-        MK0 = INT_MSK0_RSV;  // 何とかする。ON_TRIGがいらない子の気がして
         MK1 = INT_MSK1_RSV;
 #ifdef _MCU_BSR_
 //        MK2 = ~( INT_MSK2_IIC_TWL | INT_MSK2_WIFI_TX_BSR | INT_MSK2_CODEC_PMIRQ );
@@ -240,7 +236,7 @@ void tsk_sys(  )
             if( ( SW_pow_count > 3 ) || ( SW_wifi_count > 3 )
                 || ( system_status.poweron_reason == RTC_ALARM ) )
             {
-                system_status.pwr_state = OFF;  // 若干抵抗有るがこれでよい
+                system_status.pwr_state = OFF;  // 若干抵抗有るが...
                 renge_task_interval_run_force = 1;
                 KRMK = 1;
                 return;
@@ -267,7 +263,7 @@ void tsk_sys(  )
             // ・KeyReturn割り込み（電源ボたん）
             // ・RTCアラーム
             // ・アダプタ挿抜
-            system_status.pwr_state = OFF;  // 若干抵抗有るがこれでよい
+            system_status.pwr_state = OFF;  // 
             renge_task_interval_run_force = 1;
             KRMK = 1;
             return;
@@ -334,3 +330,12 @@ __interrupt void intp0_slp(  )
   renge_task_interval_run_force = 1;
 }
   */
+
+
+
+/*******************************************************//**
+  全く意味ないですが、気分的な物で...
+ **********************************************************/
+task_status_immed tski_firm_update(){
+    firm_update();
+}

trunk/vreg_ctr.c

@@ -15,6 +15,18 @@ CTR MCU I2C
 u8      vreg_ctr[VREG_C_ENDMARK_];
 
 bit     irq_readed;  // AAA型のため。
+extern bit update;
+
+
+// ********************************************************
+extern task_status_immed tski_firm_update();
+
+
+// ********************************************************
+#ifdef _MCU_BSR_
+#define IICAMK     IICAMK1
+#endif
+
 
 // ********************************************************
 // 非ゼロの初期値の指定が必要なアドレス
@@ -72,7 +84,8 @@ void vreg_ctr_write( u8 adrs, u8 data )
             && ( vreg_ctr[VREG_C_DBG2] == 'h' )
             && ( data == 'l' ) )
         {
-            firm_update(  );    // 戻ってこない
+            renge_task_immed_add( tski_firm_update );
+            IICAMK = 1;
         }
         break;
 

trunk/vreg_ctr.h

@@ -245,7 +245,16 @@ enum VREG_C
   VREG_C_ACC_HOSU_L = 0x4B,
   VREG_C_ACC_HOSU_M,
   VREG_C_ACC_HOSU_H,
-  VREG_C_ACC_HOSU_HIST = 0x4E,
+  VREG_C_ACC_HOSU_LENGTH = 0x4E,
+  VREG_C_ACC_HOSU_HIST,
+
+  VREG_C_GYRO_CONFIG0 = 0x50,
+  VREG_C_GYRO_CONFIG1,
+  VREG_C_GYRO_YAW,
+  VREG_C_GYRO_PITCH,
+  VREG_C_GYRO_ROLL,
+
+  VREG_C_AMBIENT_BRIGHTNESS = 0x60,
 
   VREG_C_ENDMARK_
 };

trunk/vreg_twl.c

@@ -133,15 +133,15 @@ u8 vreg_twl_read( u8 phy_adrs )
 u8 adrs_table_twl_ext2int( u8 img )
 {
     switch( img ){
-      case( REG_TWL_ADRS_VER_INFO ):   return( REG_TWL_INT_ADRS_VER_INFO );
       case( REG_TWL_ADRS_IRQ ):        return( REG_TWL_INT_ADRS_IRQ );
       case( REG_TWL_ADRS_COMMAND ):    return( REG_TWL_INT_ADRS_COMMAND );
-      case( REG_TWL_ADRS_MODE ):       return( REG_TWL_INT_ADRS_MODE );
       case( REG_TWL_ADRS_POWER_INFO ): return( REG_TWL_INT_ADRS_POWER_INFO );
       case( REG_TWL_ADRS_WIFI ):       return( REG_TWL_INT_ADRS_WIFI );
       case( REG_TWL_ADRS_CAM ):        return( REG_TWL_INT_ADRS_CAM );
       case( REG_TWL_ADRS_VOL ):        return( REG_TWL_INT_ADRS_VOL );
       case( REG_TWL_ADRS_TEMP0 ):      return( REG_TWL_INT_ADRS_TEMP0 );
+      case( REG_TWL_ADRS_VER_INFO ):   return( REG_TWL_INT_ADRS_VER_INFO );
+      case( REG_TWL_ADRS_MODE ):       return( REG_TWL_INT_ADRS_MODE );
       default:                         return( 0xFF );
     }
 }

trunk/yav_mcu_bsr.plg

@@ -1,131 +1,8 @@
-C:\WINDOWS\system32\cmd.exe /c echo touch magic.c
+C:\WINDOWS\system32\cmd.exe /c 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 -quvjl2wt -sainter_asm -zp -no loader.c
-loader.c(137) : CC78K0R warning W0401: Conversion may lose significant digits
-loader.c(141) : CC78K0R warning W0401: Conversion may lose significant digits
-loader.c(144) : 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 -quvjl2wt -sainter_asm -zp -no pm.c
-pm.c(193) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(209) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(283) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(871) : 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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -sainter_asm -zp -no i2c_mcu.c
-i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits
-i2c_mcu.c(196) : 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 -qx1 -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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -sainter_asm -zp -no vreg_ctr.c
-vreg_ctr.c(56) : 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(105) : 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(110) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_ctr.c(129) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    8 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 -quvjl2wt -sainter_asm -zp -no vreg_twl.c
-vreg_twl.c(46) : CC78K0R warning W0401: Conversion may lose significant digits
-vreg_twl.c(50) : 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 -quvjl2wt -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(193) : CC78K0R warning W0401: Conversion may lose significant digits
-adc.c(229) : 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 -quvjl2wt -sainter_asm -zp -no renge\renge.c
-renge\renge.c(147) : 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\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 -quvjl2wt -sainter_asm -zp -no accero.c
-accero.c(101) : CC78K0R warning W0745: Expected function prototype
-accero.c(110) : 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 -quvjl2wt -sainter_asm -zp -no self_flash.c
-self_flash.c(190) : 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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -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 -quvjl2wt -sainter_asm -zp -no task_misc.c
-task_misc.c(48) : CC78K0R warning W0401: Conversion may lose significant digits
-task_misc.c(166) : CC78K0R warning W0401: Conversion may lose significant digits
-task_misc.c(34) : 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 -quvjl2wt -sainter_asm -zp -no task_sys.c
-task_sys.c(305) : 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\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 -gb6EFBFFh -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
@@ -133,4 +10,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) : 38 
+Build Total error(s) : 0  Total warning(s) : 0 

trunk/yav_mcu_bsr.pri

@@ -36,7 +36,7 @@ Tracer=OFF
 Dir=.
 SaveFilter=0
 Start=0
-End=0
+End=1000
 LoadFilter=5
 Offset=0
 Object=ON
@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=0, 0, 600, 875
+Geometry=84, 31, 600, 1014
 Window=Normal
-DispStart=69
+DispStart=383
-CaretPos=70,0
+CaretPos=384,0
 Mode=Normal
 DispFile=
 Address1=
@@ -139,19 +139,11 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
-[Source1]
-Geometry=75, 75, 751, 875
-Window=Normal
-DispStart=163
-CaretPos=197,23
-Mode=Normal
-DispFile=accero.c
-Accumulative=ON
 [Assemble]
 Geometry=605, 2, 600, 400
 Window=Normal
-DispStart=1127
+DispStart=16527
-CaretPos=1127,27
+CaretPos=16527,27
 Address1=
 Address2=
 Address3=
@@ -193,18 +185,18 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 [Memory]
-Geometry=0, 0, 0, 0
+Geometry=442, 97, 550, 1012
-Window=Hide
+Window=Normal
-Boundary=0
+Boundary=163
 Format=Hex
 Mode=Byte
-Endian=
+Endian=Little
 Ascii=OFF
 Idtag=OFF
 Address=
-DispStart=FFFFFFFF
+DispStart=00000F60
-CaretPosData=0, 0
+CaretPosData=26, 269
-CaretPosAscii=0, 0
+CaretPosAscii=50176, 0
 Address1=
 Address2=
 Address3=
@@ -866,14 +858,16 @@ Count=0
 Geometry=1145, 8, 440, 1086
 Window=Normal
 Boundary=13762700
-0=+hyst_pedometer,.,N,A,-,1
+0=.RTCEN,P,S,A,+,1
-1=+pool,P,N,A,-,1
+1=.hyst_pedometer,.,N,A,+,1
-2=.last_year,P,N,A,+,1
+2=.pool,P,N,A,+,1
-3=.last_month,P,N,A,+,1
+3=.last_year,P,N,A,+,1
-4=.last_day,P,N,A,+,1
+4=.last_month,P,N,A,+,1
-5=.last_hour,P,N,A,+,1
+5=.last_day,P,N,A,+,1
-6=.p_record,P,N,A,+,1
+6=.last_hour,P,N,A,+,1
-Line=7
+7=.p_record,P,N,A,+,1
+8=.vreg_ctr[0x60],P,N,A,+,1
+Line=9
 [Quick Watch]
 0=last_hour,P,A,1
 1=last_day,P,A,1
@@ -882,9 +876,9 @@ Line=7
 4=pool,P,A,1
 5=p_record,P,A,1
 6=hyst_pedometer,P,A,1
-7=
+7=vreg_ctr,P,A,1
-8=
+8=vreg_ctr[0x60],P,A,1
-9=
+9=RTCEN,P,A,1
 10=
 11=
 12=
@@ -899,7 +893,23 @@ Name0=Swb00001
 Address0=accero.c#_pedo_increment+0x78
 Window0=ASM
 Status0=ON
-Count=1
+Name1=Swb00002
+Address1=loader.c#_main+0x86
+Window1=ASM
+Status1=ON
+Name2=Swb00003
+Address2=self_flash.c#_firm_update+0x0
+Window2=ASM
+Status2=ON
+Name3=Swb00005
+Address3=self_flash.c#_firm_update+0xfe
+Window3=ASM
+Status3=ON
+Name4=Swb00004
+Address4=self_flash.c#_firm_update+0x101
+Window4=ASM
+Status4=ON
+Count=5
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prj

@@ -37,7 +37,7 @@ TargetFile=0
 BuildModeName=BSR_WM0
 TargetFile=0
 [BuildBefore-AfterCmd]
-Before1=echo touch magic.c
+Before1=touch magic.c
 After1=ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex
 [Options.RA78K0R 0]
 Version=100

trunk/yav_mcu_bsr.prk

@@ -7,8 +7,9 @@ FrameCY=1043
 OpenFile1=accero.c,0,272,165,1516,922,26,119,26,0
 OpenFile2=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile3=config.h,0,286,286,1530,1043,0,18,0,0
+OpenFile3=config.h,0,286,286,1530,1043,21,18,21,0
-OpenFile4=OutputWindow
+OpenFile4=sw.c,0,132,132,1376,889,0,86,0,0
+OpenFile5=OutputWindow
 OutputPos=0,48,992,426,1226
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]

trunk/yav_mcu_bsr.sdb

@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4b0e133a
+T=4b1c9f97
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -20,7 +20,7 @@ T=4b18b78d
 T=4b024862
 1=incs.h
 [main.c]
-T=4b18b6b6
+T=4b1ca2a5
 1=incs.h
 2=WDT.h
 3=rtc.h
@@ -28,7 +28,7 @@ T=4b18b6b6
 5=accero.h
 6=led.h
 [magic.c]
-T=4b0e3e21
+T=4b1ca968
 1=config.h
 [WDT.c]
 T=4afd21ca
@@ -52,7 +52,7 @@ T=4b0499ab
 T=4b03bbe1
 1=incs.h
 [vreg_ctr.c]
-T=4b0d172a
+T=4b1c9c58
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -60,14 +60,14 @@ T=4b0d172a
 5=accero.h
 6=pm.h
 [vreg_twl.c]
-T=4b0f96c3
+T=4b1c8d36
 1=incs.h
 2=jhl_defs.h
 3=vreg_twl.h
 4=vreg_ctr.h
 5=renge\renge_task_intval.h
 [adc.c]
-T=4b04e9f8
+T=4b1c8cd2
 1=incs.h
 2=adc.h
 3=pm.h
@@ -85,7 +85,7 @@ T=4b18cd05
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
-T=4b03c375
+T=4b1ca2a5
 1=incs_loader.h
 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 3=fsl_user.h
@@ -94,7 +94,7 @@ T=4b03c375
 T=4afd21cb
 1=incs_loader.h
 [sw.c]
-T=4b187240
+T=4b1cabb6
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -115,7 +115,7 @@ T=4b0b8f86
 3=pm.h
 4=accero.h
 [task_sys.c]
-T=4b18a8fd
+T=4b1c9f49
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -141,7 +141,7 @@ T=4b023fdb
 T=4b0d0086
 1=config.h
 [config.h]
-T=4b18d0aa
+T=4b1c8d89
 [bsr_system.h]
 T=4afd21ca
 [renge\renge.h]
@@ -154,7 +154,7 @@ T=4b024862
 T=4afa8168
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4b0bab04
+T=4b1c8cd1
 1=config.h
 [loader.h]
 T=4afd21ca
@@ -170,11 +170,11 @@ T=4afd21cb
 [i2c_ctr.h]
 T=4afd21cb
 [pm.h]
-T=4b1637ee
+T=4b1c45a0
 [rtc.h]
 T=4b161be1
 [adc.h]
-T=4afd21cb
+T=4b1c8cd1
 1=jhl_defs.h
 [led.h]
 T=4b038a57