diff --git a/snake_trunk/bsr_k0r.map b/snake_trunk/bsr_k0r.map index 0bce31c..1b3151f 100644 --- a/snake_trunk/bsr_k0r.map +++ b/snake_trunk/bsr_k0r.map @@ -4,19 +4,19 @@ 78K0R Linker W1.33 Date:20 Dec 2013 Page: 1 Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C - C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr - _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro - nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r - m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T - ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm - .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t - wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng - e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi - sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ - status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo - ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e - i.rel util_funcs.rel i2c_mcu-sub.rel + obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool + s\CC78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -p + bsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Elec + tronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bc + l0rm.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronic + s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel + pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2 + c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel r + enge.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 ta + sk_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel + voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel ge + t_ei.rel util_funcs.rel i2c_mcu-sub.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map diff --git a/snake_trunk/task_sys.c b/snake_trunk/task_sys.c index ba035b5..ba7733d 100644 --- a/snake_trunk/task_sys.c +++ b/snake_trunk/task_sys.c @@ -229,20 +229,20 @@ void tsk_sys( ) // PMK21 = 0; // wifi 使わない PMK6 = 0; // pm_irq - // リブート時、ステータスを何となく更新、辻褄合わせ + // リブート時、ステータスを辻褄合わせ if( system_status.reboot ) { u8 bl_status_temp; - // LCD 電源ステータス + // LCD 電源onだったか？ ステータスの更新をする。 /// ファーム更新時、必ず液晶offかも？ if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ) { vreg_ctr[ VREG_C_STATUS ] |= REG_BIT_LCD_POW; - LCD_AMOL_HV_CTRL = 1; + // LCD_AMOL_HV_CTRL = 1; 不要。ファーム更新時、ピン状態は保持のため。 } - // バックライトが点いていたなら点ける + // バックライトが点いていた？　ステータスの更新をする。 bl_status_temp = read_pmic( PM_REG_ADRS_BL ); vreg_ctr[ VREG_C_STATUS ] |= (( bl_status_temp & 0x03 ) << 5 ); diff --git a/snake_trunk/yav_mcu_bsr.plg b/snake_trunk/yav_mcu_bsr.plg index 160064e..214d214 100644 --- a/snake_trunk/yav_mcu_bsr.plg +++ b/snake_trunk/yav_mcu_bsr.plg @@ -3,7 +3,7 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 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 led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 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 led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' diff --git a/snake_trunk/yav_mcu_bsr.prj b/snake_trunk/yav_mcu_bsr.prj index 4292dd6..d6c1a7b 100644 --- a/snake_trunk/yav_mcu_bsr.prj +++ b/snake_trunk/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\snake_trunk\ +Path=C:\78k_data\yav-mcu-basara\snake_branches\2.35\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -1231,7 +1231,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\snake_trunk\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\snake_branches\2.35\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf