diff --git a/trunk/config.h b/trunk/config.h index f5c03a5..2ee889f 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -14,7 +14,7 @@ //#define _DBG_FORCE_JIKKI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x04 +#define MCU_VER_MINOR 0x05 //#define _MODEL_TEG2_ diff --git a/trunk/led.c b/trunk/led.c index 57470a0..9dde28f 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -180,8 +180,8 @@ void LED_init( ) LED_duty_notify_red = 0; LED_duty_notify_blu = 0; LED_duty_notify_grn = 0; - LED_old_pow_red = 0; - LED_old_CAM = 0; + LED_pow_red = 0; + LED_CAM = 0; if( system_status.reboot ) { @@ -195,10 +195,14 @@ void LED_init( ) void LED_stop( ) { + LED_duty_notify_red = 0; + LED_duty_notify_blu = 0; + LED_duty_notify_grn = 0; TT0 = 0b0000000011101111; // 一斉停止(しないとだめ) TOE0 = 0b0000000000000000; // TOxをタイマーモジュールが制御?(GPIOになる) TAU0EN = 0; - + LED_pow_red = 0; + LED_CAM = 0; } diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index b8f2f22..290ea16 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -24,7 +24,6 @@ static void hosu_increment(); // ======================================================== u16 get_long_hour(); extern uni_pool pool; -extern bit is_first_hosu_inc_after_boot; @@ -45,7 +44,7 @@ void pedometer() static s16 th_L = 11000; static u16 acc_norm[3]; // 加速度の大きさのヒストリ。数字が大きい方が古い static u16 acc_norm_temp; - static u8 interval_hh; // 山-山間の時間。短過ぎたらはじく。 + static u8 interval_hh = 0xFF; // 山-山間の時間。短過ぎたらはじく。 static u8 time_l; // 前回の極小からの経過時間 static u16 peak_l; // 谷の深さ static u16 norm_hist[TAP]; @@ -202,14 +201,6 @@ static void hosu_increment() { static u16 last_hour_fny; - //起動後1回目の歩数カウントは余分なのでカウントしない - //TODO:アルゴリズムを修正 - if(is_first_hosu_inc_after_boot) - { - is_first_hosu_inc_after_boot = 0; - return; - } - // 累積の更新 // // いろいろ失敗した... if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 ) diff --git a/trunk/rtc.c b/trunk/rtc.c index 292aff5..6bb8308 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -15,8 +15,6 @@ bit rtc_lock; bit rtc_dirty; bit rtc_alarm_dirty; -//起動後初めての歩数カウントかどうか -bit is_first_hosu_inc_after_boot; /* ======================================================== ペリフェラルの初期化 @@ -63,7 +61,6 @@ void RTC_init( void ) rtc_lock = 0; rtc_dirty = 0; rtc_alarm_dirty = 0; - is_first_hosu_inc_after_boot = 1; } diff --git a/trunk/sw.c b/trunk/sw.c index fa3b736..498db29 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -100,7 +100,10 @@ void tsk_sw( ) case ( BT_CHARGE ): case ( OFF ): // 電源スイッチの監視 // +// if( SW_pow_count == (u8)(16/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) ) if( SW_pow_count == (u8)(50/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) ) +// if( SW_pow_count == (u8)(80/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) ) +// if( SW_pow_count == (u8)(160/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); } diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 67cf055..052f134 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -165,31 +165,33 @@ void tsk_misc( ) task_status_immed do_command0( ) { // command0 本体電源など + u8 temp_command = vreg_ctr[VREG_C_COMMAND0]; + vreg_ctr[VREG_C_COMMAND0] = 0; - if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_GOING_TO_SLEEP ) + if( temp_command & REG_BIT_GOING_TO_SLEEP ) { going_to_sleep = 1; } - if( ( vreg_ctr[VREG_C_COMMAND0] & ( REG_BIT_OFF_REQ | REG_BIT_RESET1_REQ | REG_BIT_FCRAM_RESET_REQ | REG_BIT_RESET2_REQ )) != 0x00 ) + if( ( temp_command & ( REG_BIT_OFF_REQ | REG_BIT_RESET1_REQ | REG_BIT_FCRAM_RESET_REQ | REG_BIT_RESET2_REQ )) != 0x00 ) { - if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_OFF_REQ ) + if( temp_command & REG_BIT_OFF_REQ ) { system_status.pwr_state = OFF_TRIG; } else { - if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET1_REQ ) + if( temp_command & REG_BIT_RESET1_REQ ) { PM_reset_ast( ); RESET2_ast; FCRAM_RST_ast; } - if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ ) + if( temp_command & REG_BIT_FCRAM_RESET_REQ ) { FCRAM_RST_ast; } - else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ ) + else if( temp_command & REG_BIT_RESET2_REQ ) { RESET2_ast; if( twl_ntr_mode ) @@ -218,8 +220,13 @@ task_status_immed do_command0( ) */ } } - - vreg_ctr[VREG_C_COMMAND0] = 0; +/* + スリープ要求直後に電源OFF・リセットコマンドは来まい + if( vreg_ctr[VREG_C_COMMAND0] != 0 ) + { + return ( ERR_CONTINUE ); + } +*/ return ( ERR_FINISED ); } diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 8820c36..d8e3f17 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -248,15 +248,15 @@ void tsk_sys( ) break; case OFF_TRIG: //--------------------------------------- - // LED消灯を待つasdf + // LED消灯を待つ vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF; + vreg_ctr[ VREG_C_LED_TUNE ] = LED_TUNE_ILM_OFF; info_led_off = 1; if( LED_duty_pow_blu != 0 ) { return; } - vreg_ctr[ VREG_C_LED_TUNE ] = LED_TUNE_ILM_OFF; system_status.force_off = 0; vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00; diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index b7b4de7..1c34fee 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -226,7 +226,19 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; case ( VREG_C_RTC_COMP ): + WDT_Restart(); + while(1) + { + RWAIT = 1; + while( !RWST ){} + if( SEC != 0 ) + { + break; + } + RWAIT = 0; + } SUBCUD = data; + RWAIT = 0; vreg_ctr[ VREG_C_RTC_COMP ] = data; break; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 3a58d13..9d8133b 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,13 +1,178 @@ C:\WINDOWS\system32\cmd.exe /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 -qvjl2w -sainter_asm -zpb -no loader.c +loader.c(104) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(105) : 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\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 -qvjl2w -sainter_asm -zpb -no pm.c +pm.c(83) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(154) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(241) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(461) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(561) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(562) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(668) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(704) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(733) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(808) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(816) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(971) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(1038) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1041) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(100) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(101) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(102) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(103) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 24 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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(205) : 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\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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no led.c +led.c(108) : CC78K0R warning W0745: Expected function prototype +led.c(248) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(253) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(315) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(374) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(400) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(574) : 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\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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c +vreg_ctr.c(110) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(119) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(128) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(138) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(142) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(149) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(265) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(270) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(275) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(305) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(321) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(431) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +Compilation complete, 0 error(s) and 17 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 -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(52) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(65) : 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\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 -qvjl2w -sainter_asm -zpb -no adc.c +adc.c(126) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(132) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(213) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(240) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(332) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(356) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(375) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(453) : CC78K0R warning W0745: Expected function prototype +adc.c(482) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(487) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 10 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 -qvjl2w -sainter_asm -zpb -no renge\renge.c +renge\renge.c(149) : CC78K0R warning W0411: Illegal pointer combination +renge\renge.c(157) : CC78K0R warning W0412: Illegal pointer combination in conditional expression +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\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 -qvjl2w -sainter_asm -zpb -no accero.c +accero.c(242) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +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\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 -qvjl2w -sainter_asm -zpb -no self_flash.c +self_flash.c(214) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(255) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(256) : 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\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 -qvjl2w -sainter_asm -zpb -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\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" -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -gb0FEFBFFh -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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel +"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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(91) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(105) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(209) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(319) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 4 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\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 -qvjl2w -sainter_asm -zpb -no task_sys.c +task_sys.c(184) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(442) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(444) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +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_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 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c +pedo_alg_thre_det2.c(58) : CC78K0R warning W0745: Expected function prototype +pedo_alg_thre_det2.c(73) : CC78K0R warning W0401: Conversion may lose significant digits +pedo_alg_thre_det2.c(140) : CC78K0R warning W0401: Conversion may lose significant digits +pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 4 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pedo_alg_thre_det2.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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no task_status.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_status.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 -gb0FEFBFFh -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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.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. @@ -17,4 +182,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 0 +Build Total error(s) : 0 Total warning(s) : 81 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 1147cd5..8475463 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=43, 34, 757, 775 Window=Normal -DispStart=70 -CaretPos=71,0 +DispStart=358 +CaretPos=359,0 Mode=Normal DispFile= Address1= @@ -139,11 +139,19 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +[Source1] +Geometry=0, 0, 757, 775 +Window=Normal +DispStart=199 +CaretPos=241,30 +Mode=Normal +DispFile=task_sys.c +Accumulative=ON [Assemble] Geometry=280, 96, 968, 626 -Window=Hide -DispStart=864531456 -CaretPos=0,0 +Window=Normal +DispStart=17647 +CaretPos=17647,27 Address1= Address2= Address3= @@ -957,11 +965,11 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1145, 20, 441, 702 +Geometry=821, 0, 441, 702 Window=Normal Boundary=18088086 0=.info_LED,.,N,A,+,1 -1=.vreg_ctr[9],P,N,A,+,1 +1=.vreg_ctr,P,N,A,+,1 2=.TDR06,P,S,A,+,1 3=.LED_dim_status_sleep,.,N,A,+,1 4=.pu20,B,S,A,+,1 @@ -974,31 +982,41 @@ Boundary=18088086 11=.P1.5,P,S,A,+,1 12=.TDR07,P,S,A,+,1 13=.info_led_override,P,N,A,+,1 -14=.system_status,.,N,A,+,1 -15=.battery_manufacturer,P,N,A,+,1 -Line=16 +14=.P12.0,P,S,A,+,1 +15=.going_to_sleep,P,N,A,+,1 +16=+system_status,.,N,A,-,1 +17=.battery_manufacturer,P,N,A,+,1 +Line=18 [Quick Watch] -0=stat,P,A,1 -1=TDR06,P,A,1 -2=TDR03,P,A,1 -3=TDR01,P,A,1 -4=TDR07,P,A,1 -5=TDR05,P,A,1 -6=TDR02,P,A,1 -7=P4.,P,A,1 -8=P4.2,P,A,1 -9=P7.5,P,A,1 -10=PM4.2,P,A,1 -11=vreg_twl,P,A,1 -12=vreg_ctr[35],P,A,1 -13=vreg_ctr[11],P,A,1 -14=vreg_ctr[5],P,A,1 -15=info_LED,P,A,1 +0=TDR01,P,A,1 +1=TDR07,P,A,1 +2=TDR05,P,A,1 +3=TDR02,P,A,1 +4=P4.,P,A,1 +5=P4.2,P,A,1 +6=P7.5,P,A,1 +7=PM4.2,P,A,1 +8=vreg_twl,P,A,1 +9=vreg_ctr[35],P,A,1 +10=vreg_ctr[11],P,A,1 +11=vreg_ctr[5],P,A,1 +12=info_LED,P,A,1 +13=going_to_sleep,P,A,1 +14=P12.0,P,A,1 +15=vreg_ctr,P,A,1 [Software Break] Geometry=1049, 744, 445, 260 Window=Normal Width=150 30 200 100 -Count=0 +Name0=Swb00001 +Address0=task_sys.c#_tsk_sys+0x175 +Window0=ASM +Status0=ON +Name1=Swb00002 +Address1=task_sys.c#_tsk_sys+0x150 +Window1=ASM +Status1=ON +Count=2 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 9d4feb9..a0da066 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -288,298 +288,6 @@ Include35=magic.h [BuildBefore-AfterCmd] Before1=touch magic.c After1=ruby nec_s_2_bsrbin2.rb bsr.hex -[Options.LK78K0R 0] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 1] -Version=100 -O0=a.lmf -G=0 -E=0 -E0=a.elk -GO=0 -GOValue= -GOStart=FC00 -GOSizeValue=1024 -GI=0 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=1 -MemInfoCheck=0 -P=1 -P0=a.map -MI=0 -GB=0 -GBValue= -KM=1 -KD=1 -KP=0 -KL=0 -LF=0 -LL=0 -S=0 -W=1 -SELFCheck=0 -SELF=0 -ZB= -CommandFile=0 -[Options.LK78K0R 2] -Version=100 -O0=bsr.lmf -O1=bsr_k0r.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=0 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=FEFBFF -KM=1 -KD=0 -KP=0 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf -[Options.LK78K0R 3] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 4] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 5] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -O0=inter_asm -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.78K0R] -BuildMode=2 -BuildMode2=K0R_dbg -BuildMode3=BSR_dbg -BuildMode4=BSR_rel -BuildMode5=BSR_WM0 -DefaultMode2=1 -DefaultMode3=1 -DefaultMode4=1 -DefaultMode5=1 [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -1046,3 +754,295 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[Options.LK78K0R 0] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 1] +Version=100 +O0=a.lmf +G=0 +E=0 +E0=a.elk +GO=0 +GOValue= +GOStart=FC00 +GOSizeValue=1024 +GI=0 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=1 +MemInfoCheck=0 +P=1 +P0=a.map +MI=0 +GB=0 +GBValue= +KM=1 +KD=1 +KP=0 +KL=0 +LF=0 +LL=0 +S=0 +W=1 +SELFCheck=0 +SELF=0 +ZB= +CommandFile=0 +[Options.LK78K0R 2] +Version=100 +O0=bsr.lmf +O1=bsr_k0r.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=FEFBFF +KM=1 +KD=0 +KP=0 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +OFILE=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf +[Options.LK78K0R 3] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 4] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 5] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +O0=inter_asm +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.78K0R] +BuildMode=2 +BuildMode2=K0R_dbg +BuildMode3=BSR_dbg +BuildMode4=BSR_rel +BuildMode5=BSR_WM0 +DefaultMode2=1 +DefaultMode3=1 +DefaultMode4=1 +DefaultMode5=1 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index ac38487..ae8fcff 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -8,8 +8,9 @@ OpenFile1=ProjectWindow PrjPos=0,2,754,3,253 OpenFile2=user_define.h,0,242,242,1486,999,0,4,26,0 OpenFile3=config.h,0,142,136,1386,893,0,1,0,0 -OpenFile4=OutputWindow -OutputPos=0,55,1000,226,1535 +OpenFile4=sw.c,0,132,132,1376,889,35,103,34,0 +OpenFile5=OutputWindow +OutputPos=0,491,1000,330,1535 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 3280ee0..4085397 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -12,7 +12,7 @@ T=4c59543c 8=reboot.h 9=magic.h [pm.c] -T=4c5a0ef7 +T=4c5a5f20 1=incs.h 2=adc.h 3=led.h @@ -26,7 +26,7 @@ T=4c3e9a73 1=config.h 2=incs.h [main.c] -T=4c5a0ef7 +T=4c5a5ef2 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -36,7 +36,7 @@ T=4c5a0ef7 7=adc.h 8=pool.h [magic.c] -T=4c5a5a64 +T=4c5bc334 1=config.h [WDT.c] T=4bf0d1e1 @@ -59,7 +59,7 @@ T=4c5957d5 T=4c58bce4 1=incs.h [vreg_ctr.c] -T=4c5a0ef8 +T=4c5a5f7c 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -107,7 +107,7 @@ T=4c59540f 6=magic.h 7=pm.h [sw.c] -T=4c5a1192 +T=4c5bc365 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -131,7 +131,7 @@ T=4c525842 6=i2c_mcu.h 7=led.h [task_sys.c] -T=4c5a0ef7 +T=4c5a5f61 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -176,9 +176,9 @@ T=4c119cde T=4c075832 1=config.h [config.h] -T=4c5a595e +T=4c5a5eda [user_define.h] -T=4c5a0ef7 +T=4c5a5ee5 [bsr_system.h] T=4c4fc515 [renge\renge.h] @@ -191,7 +191,7 @@ T=4c073c5a T=4c284e89 1=renge\renge_defs.h [vreg_ctr.h] -T=4c5a1192 +T=4c5a5eeb 1=config.h [vreg_twl.h] T=4c072cf1 @@ -201,20 +201,16 @@ T=4c318e0f T=4c3c5d1f [WDT.h] T=4c319dfc -[..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h] -T=49a3bd4e [fsl_user.h] T=4bf0d1e0 [i2c_ctr.h] T=4bf0d1e1 [pm.h] -T=4c5a0ef7 +T=4c5a5ed1 [rtc.h] T=4bf0d1e1 [reboot.h] T=4bf0d1e1 -[magic.h] -T=4c356d89 [incs.h] T=4c36dec8 1=jhl_defs.h @@ -232,17 +228,12 @@ T=4c36dec8 13=sw.h 14=adc.h 15=WDT.h -[i2c_twl.h] -T=4bf4e29e [accero.h] T=4bf0d1e1 1=jhl_defs.h 2=pedometer.h [pedometer.h] T=4bfd1372 -[sw.h] -T=4c3eb00f -1=config.h [adc.h] T=4c3b0190 1=jhl_defs.h @@ -250,19 +241,28 @@ T=4c3b0190 T=4c3c1235 [batt_params.h] T=4c36b4fc -[pool.h] -T=4c072cf1 -1=pedometer.h [i2c_twl_defs.h] T=4bf0d1e1 -[voltable.h] -T=4c31be66 [renge\renge_task_intval.h] T=4c3d4113 1=renge\renge_defs.h -[..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h] -T=45f12258 +[i2c_twl.h] +T=4bf4e29e +[sw.h] +T=4c3eb00f +1=config.h [self_flash.h] T=4bf0d1e0 +[pool.h] +T=4c072cf1 +1=pedometer.h [pedo_lpf_coeff.h] T=4bf0d1e1 +[..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h] +T=49a3bd4e +[..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h] +T=45f12258 +[voltable.h] +T=4c31be66 +[magic.h] +T=4c356d89