diff --git a/trunk/accero.c b/trunk/accero.c index f5be0b4..bd3b44f 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -76,6 +76,13 @@ task_status_immed tsk_cbk_accero( ) { set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY ); } + + // ゴミデータのカラ読み + if( ACC_VALID == 1 ) + { + u8 temp[6]; + iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp ); + } } // 歩数計 ///////////////////////////////////////////// @@ -241,10 +248,10 @@ task_status_immed acc_hosu_set( ) { if( system_status.pwr_state == ON ) { - renge_task_immed_add( tsk_cbk_accero ); + u8 temp[6]; + iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp ); } } - return ( ERR_SUCCESS ); } diff --git a/trunk/config.h b/trunk/config.h index a748c5b..11c921a 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -5,10 +5,10 @@ // #define _debug_led_ -#define MCU_VER_MAJOR 0; -#define MCU_VER_MINOR 9; +#define MCU_VER_MAJOR 0x00; +#define MCU_VER_MINOR 0x0B; -#define _OVERCLOCK_ +//#define _OVERCLOCK_ //#define _PARRADIUM_ //#define _MODEL_TEG2_ @@ -17,22 +17,18 @@ //#define _MODEL_CTR_ //#define _SW_HOME_ENABLE_ -#define _CODEC_CTR_ - // ---------------------------------- // #ifdef _MODEL_TEG2_ #define _PMIC_TWL_ #define _MCU_KE3_ -#undef _CODEC_CTR_ #endif #ifdef _MODEL_WM0_ #define _PMIC_TWL_ #define _MCU_BSR_ -#undef _CODEC_CTR_ #define _SW_HOME_ENABLE_ #endif @@ -47,7 +43,6 @@ #ifdef _MODEL_CTR_ #define _PMIC_CTR_ #define _MCU_BSR_ -#define _CODEC_CTR_ #define _SW_HOME_ENABLE_ #endif */ diff --git a/trunk/loader.c b/trunk/loader.c index 5881889..8e5e1bb 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -123,7 +123,6 @@ void main( ) while( pwup_delay1 != 0 ); // u16にするとコンパイラが怒るんだが…。 } while( pwup_delay0 != 0 ); - } hdwinit2( ); @@ -133,8 +132,8 @@ void main( ) u8 comp = 0; // ローダーと本体は同じバージョンか? - for( i = 0; i < sizeof( __TIME__ ); i++ ) - { // sizeof( __TIME__ ) = 8 らし + for( i = 0; i < sizeof( __TIME__ ); i++ ) // sizeof( __TIME__ ) = 8 らし + { comp += ( *( u8 * ) ( MGC_HEAD + i ) == *( __far u8 * ) ( MGC_LOAD + i ) ) ? 0 : 1; } @@ -261,7 +260,7 @@ void hdwinit2( ) #else PM2 = 0b11101001; #endif - PM3 = 0b00000001; // P31,32は簡易I2C + PM3 = 0b00000000; // P31,32は簡易I2C #ifdef _PMIC_CTR_ PM4 = 0b00000111; diff --git a/trunk/magic.c b/trunk/magic.c index 83596c9..e5e8e5c 100644 --- a/trunk/magic.c +++ b/trunk/magic.c @@ -5,38 +5,42 @@ ****************************************************************************/ #include "config.h" -// V0.5 (ニセ0.1改) +#define SIG { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 } +// V0.5 (ニセ0.1改) #pragma section @@CNSTL MGC_LOAD AT 0x0FF6 -__far static const unsigned char MGC_LOAD[] = - { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 }; +__far static const unsigned char MGC_LOAD[] = SIG; #pragma section @@CNST MGC_MIMI AT 0x2100 -static const unsigned char MGC_HEAD[] = - { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 }; +static const unsigned char MGC_HEAD[] = SIG; #pragma section @@CNST MGC_TAIL AT 0x47F6 -static const unsigned char MGC_TAIL[] = - { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 }; +static const unsigned char MGC_TAIL[] = SIG; +// あーあ。 +/* +// V0.5 (ニセ0.1改) +#define SIG { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 } +*/ + /* メモ (未使用) V0.2の署名 31 34 3A 33 35 3A 33 35 00 00 -{ 0x31, 0x34, 0x3A, 0x33, 0x35, 0x3A, 0x33, 0x35, 0x00, 0x00 }; +#define SIG { 0x31, 0x34, 0x3A, 0x33, 0x35, 0x3A, 0x33, 0x35, 0x00, 0x00 }; ctr_wm0 31373A30353A32310000 -{ 0x31, 0x37, 0x3A, 0x30, 0x35, 0x3A, 0x32, 0x31, 0x00, 0x00 }; +#define SIG { 0x31, 0x37, 0x3A, 0x30, 0x35, 0x3A, 0x32, 0x31, 0x00, 0x00 }; ctr_wm0_2 31303A34393A35390000 -{ 0x31, 0x30, 0x3A, 0x34, 0x39, 0x3A, 0x35, 0x39, 0x00, 0x00 }; +#define SIG { 0x31, 0x30, 0x3A, 0x34, 0x39, 0x3A, 0x35, 0x39, 0x00, 0x00 }; bsr_V0.2_090828_WM2 31323A35393A32350000 -{ 0x31, 0x32, 0x3A, 0x35, 0x39, 0x3A, 0x32, 0x35, 0x00, 0x00 }; +#define SIG { 0x31, 0x32, 0x3A, 0x35, 0x39, 0x3A, 0x32, 0x35, 0x00, 0x00 }; */ @@ -44,15 +48,7 @@ bsr_V0.2_090828_WM2 // V0.1の署名(日付) 30 38 3A 34 35 3A 33 39 00 00 #pragma section @@CNSTL MGC_LOAD AT 0x0FF6 __far static const unsigned char MGC_LOAD[] = -{ 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 }; - -#pragma section @@CNST MGC_MIMI AT 0x2100 -static const unsigned char MGC_HEAD[] = -{ 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 }; - -#pragma section @@CNST MGC_TAIL AT 0x47F6 -static const unsigned char MGC_TAIL[] = -{ 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 }; +#define SIG { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 } // V0.4以降 @@ -64,6 +60,4 @@ static const unsigned char MGC_HEAD[] = __TIME__; #pragma section @@CNST MGC_TAIL AT 0x47F6 static const unsigned char MGC_TAIL[] = __TIME__; - - - */ +*/ diff --git a/trunk/pm.c b/trunk/pm.c index 425bdc3..1548fe0 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -770,15 +770,15 @@ extern u8 temp_debug_3; ======================================================== */ task_status_immed ntr_pmic_comm( ) { -#ifdef _CODEC_CTR_ static u8 reg_shadow; - u8 reg1_old; + u8 reg1_old; reg1_old = reg_shadow; if( iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 1, ®_shadow ) != ERR_SUCCESS ) { return ( ERR_FINISED ); } + DI( ); if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 ) @@ -806,17 +806,12 @@ task_status_immed ntr_pmic_comm( ) } } - else - - // offリクエスト if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ) { set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ ); } - else - // リセットリクエスト if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) { @@ -828,11 +823,10 @@ task_status_immed ntr_pmic_comm( ) } } - // バックライトが... + // バックライトをマスクして書き戻す EI( ); reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ ); iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PM, reg_shadow ); -#endif return ( ERR_FINISED ); } diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index b4c1368..0ba2fbb 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,6 +1,135 @@ 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 -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(195) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(207) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(211) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(285) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(865) : 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(100) : CC78K0R warning W0745: Expected function prototype +accero.c(109) : 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 +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -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 +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) : 0 +Build Total error(s) : 0 Total warning(s) : 37 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index bddfb97..a6f2bef 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -2,28 +2,28 @@ Ver=200 Target=IDK0R32G [Configuration] -Chip=uPD79F0104 -Internal Rom=32KB -Internal Ram=1536B +Chip=uPD78F1009_64 +Internal Rom=64KB +Internal Ram=3072B Clock=Target Sub Clock=Target -Peripheral Break=0x3 -Firm Clock=User +Peripheral Break=0x2 +Firm Clock=System Flash Programming=Permit Low-voltage Flash Rewriting=On Fail Safe Break=0x2000 Port=1 NMI=OFF -TRESET=ON +TRESET=OFF IRESET=OFF WAIT=OFF -SysClock=8.00 -SubClock=32.768 +SysClock=None +SubClock=None [Mapping] Count=0 [Main] -Geometry=22, 22, 1200, 882 -Window=Max +Geometry=66, 66, 1467, 1110 +Window=Normal MDI_MAX=OFF Button=ON Mode=Auto @@ -50,7 +50,7 @@ LoadFilter1=5 Offset1=0 Object1=ON Symbol1=ON -Erase1=ON +Erase1=OFF HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON @@ -58,7 +58,7 @@ Symbol Reset1=ON Dir=. Filter=Source [Debugger Option] -Source Path="renge" +Source Path="" Symbol Size=Byte Symbol Format=Hex Register Name=Func @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=335, 68, 762, 1008 +Geometry=0, 0, 600, 400 Window=Normal -DispStart=32 -CaretPos=88,0 +DispStart=178 +CaretPos=179,0 Mode=Normal DispFile= Address1= @@ -139,19 +139,11 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=148, -1, 762, 1008 -Window=Normal -DispStart=1 -CaretPos=1,0 -Mode=Normal -DispFile=task_sys.c -Accumulative=ON [Assemble] -Geometry=177, 18, 600, 400 +Geometry=585, 0, 600, 400 Window=Normal -DispStart=10295 -CaretPos=10295,27 +DispStart=15837 +CaretPos=15645,27 Address1= Address2= Address3= @@ -187,8 +179,8 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart=0 -FindEnd=0 +FindStart= +FindEnd= SaveRange=Screen SaveStart= SaveEnd= @@ -200,7 +192,6 @@ Format=Hex Mode=Byte Endian= Ascii=OFF -Idtag=OFF Address= DispStart=FFFFFFFF CaretPosData=0, 0 @@ -259,7 +250,7 @@ Destination=0 [I/O Port] Line=0 [Stack] -Geometry=23, 779, 400, 300 +Geometry=780, 470, 400, 300 Window=Normal Boundary=13762687 Mode=Proper @@ -285,11 +276,11 @@ Address16= Boundary=0, 0 Mode=Hex Attribute=Show -Sort=Unsort +Sort=Address Pickup=OFF SelectSort=Address Last Name= -Line=429 +Line=506 L1=P0 L2=P1 L3=P2 @@ -298,431 +289,508 @@ L5=P4 L6=P5 L7=P6 L8=P7 -L9=P12 -L10=P14 -L11=P15 -L12=SDR00 -L13=SIO00 -L14=TXD0 -L15=SDR01 -L16=RXD0 -L17=SIO01 -L18=TDR00 -L19=TDR01 -L20=ADCRH -L21=PM0 -L22=PM1 -L23=PM2 -L24=PM3 -L25=PM4 -L26=PM5 -L27=PM6 -L28=PM7 -L29=PM12 -L30=PM14 -L31=PM15 -L32=ADM -L33=ADCE -L34=ADCS -L35=ADS -L36=KRM -L37=EGP0 -L38=EGN0 -L39=ISC -L40=TIS0 -L41=SDR02 -L42=SIO10 -L43=TXD1 -L44=SDR03 -L45=RXD1 -L46=TDR02 -L47=TDR03 -L48=TDR04 -L49=TDR05 -L50=TDR06 -L51=TDR07 -L52=RSUBC -L53=SEC -L54=MIN -L55=HOUR -L56=WEEK -L57=DAY -L58=MONTH -L59=YEAR -L60=SUBCUD -L61=ALARMWM -L62=ALARMWH -L63=ALARMWW -L64=RTCC0 -L65=RCLOE0 -L66=RCLOE1 -L67=RTCE -L68=RTCC1 -L69=RWAIT -L70=RWST -L71=RIFG -L72=WAFG -L73=WALIE -L74=WALE -L75=RTCC2 -L76=RCKDIV -L77=RCLOE2 -L78=RINTE -L79=CMC -L80=CSC -L81=HIOSTOP -L82=XTSTOP -L83=MSTOP -L84=OSTC -L85=OSTS -L86=CKC -L87=MCM0 -L88=MCS -L89=CSS -L90=CLS -L91=CKS0 -L92=PCLOE0 -L93=CKS1 -L94=PCLOE1 -L95=RESF -L96=LVIM -L97=LVIF -L98=LVIMD -L99=LVISEL -L100=LVION -L101=LVIS -L102=WDTE -L103=DSA0 -L104=DSA1 -L105=DRA0 -L106=DRA0L -L107=DRA0H -L108=DRA1 -L109=DRA1L -L110=DRA1H -L111=DBC0 -L112=DBC0L -L113=DBC0H -L114=DBC1 -L115=DBC1L -L116=DBC1H -L117=DMC0 -L118=DWAIT0 -L119=DS0 -L120=DRS0 -L121=STG0 -L122=DMC1 -L123=DWAIT1 -L124=DS1 -L125=DRS1 -L126=STG1 -L127=DRC0 -L128=DST0 -L129=DEN0 -L130=DRC1 -L131=DST1 -L132=DEN1 -L133=BECTL -L134=FLMDPUP -L135=PFCMD -L136=PFS -L137=FPRERR -L138=FLPMC -L139=BFAEN -L140=FWEPR -L141=BRAMEN -L142=IF2 -L143=IF2L -L144=TMIF05 -L145=TMIF06 -L146=TMIF07 -L147=PIF6 -L148=MK2 -L149=MK2L -L150=TMMK05 -L151=TMMK06 -L152=TMMK07 -L153=PMK6 -L154=PR02 -L155=PR02L -L156=TMPR005 -L157=TMPR006 -L158=TMPR007 -L159=PPR06 -L160=PR12 -L161=PR12L -L162=TMPR105 -L163=TMPR106 -L164=TMPR107 -L165=PPR16 -L166=IF0 -L167=IF0L -L168=WDTIIF -L169=LVIIF -L170=PIF0 -L171=PIF1 -L172=PIF2 -L173=PIF4 -L174=PIF5 -L175=IF0H -L176=DMAIF0 -L177=DMAIF1 -L178=CSIIF00 -L179=STIF0 -L180=CSIIF01 -L181=SRIF0 -L182=SREIF0 -L183=IF1 -L184=IF1L -L185=CSIIF10 -L186=IICIF10 -L187=STIF1 -L188=SRIF1 -L189=SREIF1 -L190=TMIF00 -L191=TMIF01 -L192=TMIF02 -L193=TMIF03 -L194=IF1H -L195=ADIF -L196=RTCIF -L197=RTCIIF -L198=KRIF -L199=MDIF -L200=TMIF04 -L201=MK0 -L202=MK0L -L203=WDTIMK -L204=LVIMK -L205=PMK0 -L206=PMK1 -L207=PMK2 -L208=PMK4 -L209=PMK5 -L210=MK0H -L211=DMAMK0 -L212=DMAMK1 -L213=CSIMK00 -L214=STMK0 -L215=CSIMK01 -L216=SRMK0 -L217=SREMK0 -L218=MK1 -L219=MK1L -L220=CSIMK10 -L221=IICMK10 -L222=STMK1 -L223=SRMK1 -L224=SREMK1 -L225=TMMK00 -L226=TMMK01 -L227=TMMK02 -L228=TMMK03 -L229=MK1H -L230=ADMK -L231=RTCMK -L232=RTCIMK -L233=KRMK -L234=MDMK -L235=TMMK04 -L236=PR00 -L237=PR00L -L238=WDTIPR0 -L239=LVIPR0 -L240=PPR00 -L241=PPR01 -L242=PPR02 -L243=PPR04 -L244=PPR05 -L245=PR00H -L246=DMAPR00 -L247=DMAPR01 -L248=CSIPR000 -L249=STPR00 -L250=CSIPR001 -L251=SRPR00 -L252=SREPR00 -L253=PR01 -L254=PR01L -L255=CSIPR010 -L256=IICPR010 -L257=STPR01 -L258=SRPR01 -L259=SREPR01 -L260=TMPR000 -L261=TMPR001 -L262=TMPR002 -L263=TMPR003 -L264=PR01H -L265=ADPR0 -L266=RTCPR0 -L267=RTCIPR0 -L268=KRPR0 -L269=MDPR0 -L270=TMPR004 -L271=PR10 -L272=PR10L -L273=WDTIPR1 -L274=LVIPR1 -L275=PPR10 -L276=PPR11 -L277=PPR12 -L278=PPR14 -L279=PPR15 -L280=PR10H -L281=DMAPR10 -L282=DMAPR11 -L283=CSIPR100 -L284=STPR10 -L285=CSIPR101 -L286=SRPR10 -L287=SREPR10 -L288=PR11 -L289=PR11L -L290=CSIPR110 -L291=IICPR110 -L292=STPR11 -L293=SRPR11 -L294=SREPR11 -L295=TMPR100 -L296=TMPR101 -L297=TMPR102 -L298=TMPR103 -L299=PR11H -L300=ADPR1 -L301=RTCPR1 -L302=RTCIPR1 -L303=KRPR1 -L304=MDPR1 -L305=TMPR104 -L306=MDAL -L307=MULA -L308=MDAH -L309=MULB -L310=MDBH -L311=MULOH -L312=MDBL -L313=MULOL -L314=PMC -L315=MAA -L316=ADPC -L317=PU0 -L318=PU1 -L319=PU3 -L320=PU4 -L321=PU5 -L322=PU7 -L323=PU12 -L324=PU14 -L325=PIM3 -L326=PIM7 -L327=POM3 -L328=POM7 -L329=NFEN0 -L330=NFEN1 -L331=NFEN2 -L332=MDCL -L333=MDCH -L334=MDUC -L335=DIVST -L336=DIVMODE -L337=PER0 -L338=SAU0EN -L339=ADCEN -L340=RTCEN -L341=PER2 -L342=TAU0EN -L343=OSMC -L344=BCDADJ -L345=SSR00 -L346=SSR00L -L347=SSR01 -L348=SSR01L -L349=SSR02 -L350=SSR02L -L351=SSR03 -L352=SSR03L -L353=SIR00 -L354=SIR00L -L355=SIR01 -L356=SIR01L -L357=SIR02 -L358=SIR02L -L359=SIR03 -L360=SIR03L -L361=SMR00 -L362=SMR01 -L363=SMR02 -L364=SMR03 -L365=SCR00 -L366=SCR01 -L367=SCR02 -L368=SCR03 -L369=SE0 -L370=SE0L -L371=SS0 -L372=SS0L -L373=ST0 -L374=ST0L -L375=SPS0 -L376=SPS0L -L377=SO0 -L378=SOE0 -L379=SOE0L -L380=SOL0 -L381=SOL0L -L382=TCR00 -L383=TCR01 -L384=TCR02 -L385=TCR03 -L386=TCR04 -L387=TCR05 -L388=TCR06 -L389=TCR07 -L390=TMR00 -L391=TMR01 -L392=TMR02 -L393=TMR03 -L394=TMR04 -L395=TMR05 -L396=TMR06 -L397=TMR07 -L398=TSR00 -L399=TSR00L -L400=TSR01 -L401=TSR01L -L402=TSR02 -L403=TSR02L -L404=TSR03 -L405=TSR03L -L406=TSR04 -L407=TSR04L -L408=TSR05 -L409=TSR05L -L410=TSR06 -L411=TSR06L -L412=TSR07 -L413=TSR07L -L414=TE0 -L415=TE0L -L416=TS0 -L417=TS0L -L418=TT0 -L419=TT0L -L420=TPS0 -L421=TPS0L -L422=TO0 -L423=TO0L -L424=TOE0 -L425=TOE0L -L426=TOL0 -L427=TOL0L -L428=TOM0 -L429=TOM0L +L9=P8 +L10=P12 +L11=P14 +L12=P15 +L13=SDR00 +L14=SIO00 +L15=TXD0 +L16=SDR01 +L17=RXD0 +L18=SIO01 +L19=TDR00 +L20=TDR01 +L21=ADCR +L22=ADCRH +L23=PM0 +L24=PM1 +L25=PM2 +L26=PM3 +L27=PM4 +L28=PM5 +L29=PM6 +L30=PM7 +L31=PM8 +L32=PM12 +L33=PM14 +L34=PM15 +L35=ADM +L36=ADCE +L37=ADCS +L38=ADS +L39=KRM +L40=EGP0 +L41=EGN0 +L42=ISC +L43=TIS0 +L44=SDR02 +L45=SIO10 +L46=TXD1 +L47=SDR03 +L48=RXD1 +L49=IICA +L50=IICS +L51=SPD +L52=STD +L53=ACKD +L54=TRC +L55=COI +L56=EXC +L57=ALD +L58=MSTS +L59=IICF +L60=IICRSV +L61=STCEN +L62=IICBSY +L63=STCF +L64=TDR02 +L65=TDR03 +L66=TDR04 +L67=TDR05 +L68=TDR06 +L69=TDR07 +L70=RSUBC +L71=SEC +L72=MIN +L73=HOUR +L74=WEEK +L75=DAY +L76=MONTH +L77=YEAR +L78=SUBCUD +L79=ALARMWM +L80=ALARMWH +L81=ALARMWW +L82=RTCC0 +L83=RCLOE0 +L84=RCLOE1 +L85=RTCE +L86=RTCC1 +L87=RWAIT +L88=RWST +L89=RIFG +L90=WAFG +L91=WALIE +L92=WALE +L93=RTCC2 +L94=RCKDIV +L95=RCLOE2 +L96=RINTE +L97=CMC +L98=CSC +L99=HIOSTOP +L100=XTSTOP +L101=MSTOP +L102=OSTC +L103=OSTS +L104=CKC +L105=MCM0 +L106=MCS +L107=CSS +L108=CLS +L109=CKS0 +L110=PCLOE0 +L111=CKS1 +L112=PCLOE1 +L113=RESF +L114=LVIM +L115=LVIF +L116=LVIMD +L117=LVISEL +L118=LVION +L119=LVIS +L120=WDTE +L121=DSA0 +L122=DSA1 +L123=DRA0 +L124=DRA0L +L125=DRA0H +L126=DRA1 +L127=DRA1L +L128=DRA1H +L129=DBC0 +L130=DBC0L +L131=DBC0H +L132=DBC1 +L133=DBC1L +L134=DBC1H +L135=DMC0 +L136=DWAIT0 +L137=DS0 +L138=DRS0 +L139=STG0 +L140=DMC1 +L141=DWAIT1 +L142=DS1 +L143=DRS1 +L144=STG1 +L145=DRC0 +L146=DST0 +L147=DEN0 +L148=DRC1 +L149=DST1 +L150=DEN1 +L151=BECTL +L152=FLMDPUP +L153=PFCMD +L154=PFS +L155=FPRERR +L156=FLPMC +L157=BFAEN +L158=FWEPR +L159=BRAMEN +L160=IF2 +L161=IF2L +L162=TMIF05 +L163=TMIF06 +L164=TMIF07 +L165=PIF6 +L166=PIF7 +L167=MK2 +L168=MK2L +L169=TMMK05 +L170=TMMK06 +L171=TMMK07 +L172=PMK6 +L173=PMK7 +L174=PR02 +L175=PR02L +L176=TMPR005 +L177=TMPR006 +L178=TMPR007 +L179=PPR06 +L180=PPR07 +L181=PR12 +L182=PR12L +L183=TMPR105 +L184=TMPR106 +L185=TMPR107 +L186=PPR16 +L187=PPR17 +L188=IF0 +L189=IF0L +L190=WDTIIF +L191=LVIIF +L192=PIF0 +L193=PIF1 +L194=PIF2 +L195=PIF3 +L196=PIF4 +L197=PIF5 +L198=IF0H +L199=CMPIF0 +L200=CMPIF1 +L201=DMAIF0 +L202=DMAIF1 +L203=CSIIF00 +L204=STIF0 +L205=CSIIF01 +L206=SRIF0 +L207=SREIF0 +L208=IF1 +L209=IF1L +L210=CSIIF10 +L211=IICIF10 +L212=STIF1 +L213=SRIF1 +L214=SREIF1 +L215=IICAIF +L216=TMIF00 +L217=TMIF01 +L218=TMIF02 +L219=TMIF03 +L220=IF1H +L221=ADIF +L222=RTCIF +L223=RTCIIF +L224=KRIF +L225=MDIF +L226=TMIF04 +L227=MK0 +L228=MK0L +L229=WDTIMK +L230=LVIMK +L231=PMK0 +L232=PMK1 +L233=PMK2 +L234=PMK3 +L235=PMK4 +L236=PMK5 +L237=MK0H +L238=CMPMK0 +L239=CMPMK1 +L240=DMAMK0 +L241=DMAMK1 +L242=CSIMK00 +L243=STMK0 +L244=CSIMK01 +L245=SRMK0 +L246=SREMK0 +L247=MK1 +L248=MK1L +L249=CSIMK10 +L250=IICMK10 +L251=STMK1 +L252=SRMK1 +L253=SREMK1 +L254=IICAMK +L255=TMMK00 +L256=TMMK01 +L257=TMMK02 +L258=TMMK03 +L259=MK1H +L260=ADMK +L261=RTCMK +L262=RTCIMK +L263=KRMK +L264=MDMK +L265=TMMK04 +L266=PR00 +L267=PR00L +L268=WDTIPR0 +L269=LVIPR0 +L270=PPR00 +L271=PPR01 +L272=PPR02 +L273=PPR03 +L274=PPR04 +L275=PPR05 +L276=PR00H +L277=CMPPR00 +L278=CMPPR01 +L279=DMAPR00 +L280=DMAPR01 +L281=CSIPR000 +L282=STPR00 +L283=CSIPR001 +L284=SRPR00 +L285=SREPR00 +L286=PR01 +L287=PR01L +L288=CSIPR010 +L289=IICPR010 +L290=STPR01 +L291=SRPR01 +L292=SREPR01 +L293=IICAPR0 +L294=TMPR000 +L295=TMPR001 +L296=TMPR002 +L297=TMPR003 +L298=PR01H +L299=ADPR0 +L300=RTCPR0 +L301=RTCIPR0 +L302=KRPR0 +L303=MDPR0 +L304=TMPR004 +L305=PR10 +L306=PR10L +L307=WDTIPR1 +L308=LVIPR1 +L309=PPR10 +L310=PPR11 +L311=PPR12 +L312=PPR13 +L313=PPR14 +L314=PPR15 +L315=PR10H +L316=CMPPR10 +L317=CMPPR11 +L318=DMAPR10 +L319=DMAPR11 +L320=CSIPR100 +L321=STPR10 +L322=CSIPR101 +L323=SRPR10 +L324=SREPR10 +L325=PR11 +L326=PR11L +L327=CSIPR110 +L328=IICPR110 +L329=STPR11 +L330=SRPR11 +L331=SREPR11 +L332=IICAPR1 +L333=TMPR100 +L334=TMPR101 +L335=TMPR102 +L336=TMPR103 +L337=PR11H +L338=ADPR1 +L339=RTCPR1 +L340=RTCIPR1 +L341=KRPR1 +L342=MDPR1 +L343=TMPR104 +L344=MDAL +L345=MULA +L346=MDAH +L347=MULB +L348=MDBH +L349=MULOH +L350=MDBL +L351=MULOL +L352=PMC +L353=MAA +L354=ADPC +L355=PU0 +L356=PU1 +L357=PU3 +L358=PU4 +L359=PU5 +L360=PU7 +L361=PU12 +L362=PU14 +L363=PIM3 +L364=PIM7 +L365=PIM8 +L366=POM3 +L367=POM7 +L368=NFEN0 +L369=NFEN1 +L370=NFEN2 +L371=MDCL +L372=MDCH +L373=MDUC +L374=DIVST +L375=DIVMODE +L376=PER0 +L377=SAU0EN +L378=IICAEN +L379=ADCEN +L380=RTCEN +L381=PER1 +L382=OACMPEN +L383=PER2 +L384=TAU0EN +L385=OSMC +L386=RMC +L387=DSCCTL +L388=DSCON +L389=SELDSC +L390=DSCS +L391=BCDADJ +L392=SSR00 +L393=SSR00L +L394=SSR01 +L395=SSR01L +L396=SSR02 +L397=SSR02L +L398=SSR03 +L399=SSR03L +L400=SIR00 +L401=SIR00L +L402=SIR01 +L403=SIR01L +L404=SIR02 +L405=SIR02L +L406=SIR03 +L407=SIR03L +L408=SMR00 +L409=SMR01 +L410=SMR02 +L411=SMR03 +L412=SCR00 +L413=SCR01 +L414=SCR02 +L415=SCR03 +L416=SE0 +L417=SE0L +L418=SS0 +L419=SS0L +L420=ST0 +L421=ST0L +L422=SPS0 +L423=SPS0L +L424=SO0 +L425=SOE0 +L426=SOE0L +L427=SOL0 +L428=SOL0L +L429=TCR00 +L430=TCR01 +L431=TCR02 +L432=TCR03 +L433=TCR04 +L434=TCR05 +L435=TCR06 +L436=TCR07 +L437=TMR00 +L438=TMR01 +L439=TMR02 +L440=TMR03 +L441=TMR04 +L442=TMR05 +L443=TMR06 +L444=TMR07 +L445=TSR00 +L446=TSR00L +L447=TSR01 +L448=TSR01L +L449=TSR02 +L450=TSR02L +L451=TSR03 +L452=TSR03L +L453=TSR04 +L454=TSR04L +L455=TSR05 +L456=TSR05L +L457=TSR06 +L458=TSR06L +L459=TSR07 +L460=TSR07L +L461=TE0 +L462=TE0L +L463=TS0 +L464=TS0L +L465=TT0 +L466=TT0L +L467=TPS0 +L468=TPS0L +L469=TO0 +L470=TO0L +L471=TOE0 +L472=TOE0L +L473=TOL0 +L474=TOL0L +L475=TOM0 +L476=TOM0L +L477=IICCTL0 +L478=SPT +L479=STT +L480=ACKE +L481=WTIM +L482=SPIE +L483=WREL +L484=LREL +L485=IICE +L486=IICCTL1 +L487=DFC +L488=SMC +L489=DAD +L490=CLD +L491=WUP +L492=IICWL +L493=IICWH +L494=SVA +L495=OAM +L496=OAEN +L497=C0CTL +L498=C0OE +L499=C0EN +L500=C0RVM +L501=C0VRE +L502=C1CTL +L503=C1OE +L504=C1EN +L505=C1RVM +L506=C1VRE [Local Variable] -Geometry=1167, 795, 400, 300 -Window=Normal -Boundary=13041851 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 Mode=Proper [Trace View] Geometry=0, 0, 0, 0 @@ -772,10 +840,10 @@ SaveRange=Screen SaveStart= SaveEnd= [Register] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=13, 603, 250, 400 +Window=Normal Mode=Hex -Boundary=62 +Boundary=159 Pickup=OFF Name=Functional Register Bank=0 @@ -863,24 +931,19 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1147, 6, 440, 667 -Window=Normal -Boundary=13762700 -0=.SW_wifi_count,P,N,A,+,1 -1=.SW_pow_count,P,N,A,+,1 -2=+system_status,.,N,A,-,1 -3=+tasks_immed,P,N,A,-,1 -4=.vreg_ctr,P,N,A,+,1 -Line=5 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 +Line=0 [Quick Watch] -0=reg_shadow,P,A,1 -1=vreg_c,P,A,1 -2=vreg_ctr,P,A,1 -3=SSR02,P,A,1 -4=tasks_immed,P,A,1 -5=system_status,P,A,1 -6=SW_pow_count,P,A,1 -7=SW_wifi_count,P,A,1 +0= +1= +2= +3= +4= +5= +6= +7= 8= 9= 10= @@ -890,26 +953,10 @@ Line=5 14= 15= [Software Break] -Geometry=25, 25, 500, 200 -Window=Normal +Geometry=0, 0, 0, 0 +Window=Hide Width=150 30 200 100 -Name0=Swb00002 -Address0=renge.c#_renge_task_immed_add+0x60 -Window0=ASM -Status0=ON -Name1=Swb00001 -Address1=renge.c#_renge_task_immed_add+0x47 -Window1=ASM -Status1=ON -Name2=Swb00003 -Address2=renge.c#_renge_task_immed_add+0x2e -Window2=ASM -Status2=ON -Name3=Swb00004 -Address3=renge.c#_renge_task_immed_run+0x15 -Window3=ASM -Status3=ON -Count=4 +Count=0 [Reset] Debugger=ON Symbol=OFF @@ -925,14 +972,12 @@ Break Sound=ON TraceAutoClear=OFF RRM Clock=Internal CKC Register Value=0x09 -RRM Internal Clock Frequency=8.000 +RRM Internal Clock Frequency=8 [About] Version=Program [Pseudo Emulation] Geometry=0, 0, 0, 0 Window=Hide -[Data Flash Option] -Data Flash Emulation=OFF [List] Geometry=0, 0, 0, 0 Window=Hide diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 3717551..e3951ee 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -4,15 +4,16 @@ FrameX=158 FrameY=51 FrameCX=1299 FrameCY=1043 -OpenFile1=task_debug.c,0,324,114,1568,871,58,31,57,0 -OpenFile2=task_misc.c,0,220,220,1464,977,0,1,0,0 -OpenFile3=ProjectWindow +OpenFile1=task_misc.c,0,220,220,1464,977,0,1,0,0 +OpenFile2=task_sys.c,0,308,308,1552,1065,0,256,0,0 +OpenFile3=renge\renge.c,0,330,330,1574,1087,0,172,0,0 +OpenFile4=pm.c,0,286,286,1530,1043,27,542,30,0 +OpenFile5=loader.c,0,154,154,1398,911,0,264,0,0 +OpenFile6=task_debug.c,0,324,114,1568,871,25,13,57,0 +OpenFile7=config.h,0,264,264,1508,1021,2,11,0,0 +OpenFile8=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile4=task_sys.c,0,308,308,1552,1065,0,256,0,0 -OpenFile5=renge\renge.c,0,330,330,1574,1087,0,172,0,0 -OpenFile6=pm.c,0,286,286,1530,1043,27,542,30,0 -OpenFile7=config.h,0,264,264,1508,1021,21,15,21,0 -OpenFile8=OutputWindow +OpenFile9=OutputWindow OutputPos=0,48,992,426,1226 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 71c8222..6a03232 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4b03c375 +T=4b0e133a 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,7 +11,7 @@ T=4b03c375 7=rtc.h 8=reboot.h [pm.c] -T=4b0d00ef +T=4b0e15b9 1=incs.h 2=adc.h 3=led.h @@ -28,7 +28,7 @@ T=4b0b8f87 5=accero.h 6=led.h [magic.c] -T=4afd21ca +T=4b0de27a 1=config.h [WDT.c] T=4afd21ca @@ -81,7 +81,7 @@ T=4b0d1a2b 5=config.h 6=bsr_system.h [accero.c] -T=4b0bab54 +T=4b0e21d5 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] @@ -141,7 +141,7 @@ T=4b023fdb T=4b0d0086 1=config.h [config.h] -T=4b0d00cc +T=4b0e24a3 [bsr_system.h] T=4afd21ca [renge\renge.h]