diff --git a/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.sdf b/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.sdf index 82ae8ba..d5e377c 100644 Binary files a/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.sdf and b/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.sdf differ diff --git a/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.suo b/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.suo index e46f965..83e1888 100644 Binary files a/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.suo and b/snake_branches/2.2F_IS_TOOL/VCProj/bsr_trunk.suo differ diff --git a/snake_branches/2.2F_IS_TOOL/bsr.hex b/snake_branches/2.2F_IS_TOOL/bsr.hex index e0fadf5..5f79230 100644 --- a/snake_branches/2.2F_IS_TOOL/bsr.hex +++ b/snake_branches/2.2F_IS_TOOL/bsr.hex @@ -253,8 +253,8 @@ :100FB1009DDAADDC5BD9085BD808BDD8D7C3C7F3D0 :100FC100728EFDC162314C410036584E1161A072E2 :070FD100C09EFD62C6C2D7FD -:0A0FF60031353A33383A3531000046 -:0A20000031353A33383A353100002B +:0A0FF60031333A31323A3333000050 +:0A20000031333A31323A3333000035 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -406,7 +406,7 @@ :10293C00716307716B27F21006C6D7D9A7FBC1507C :10294C0006FD722BC0D9A8FBC15007FD722BC0D756 :10295C00FD4729F2D7C716664C02DD044C04DF058F -:10296C00CD3A08EF02F43AC6D7C7711300711B2099 +:10296C00CD3A10EF02F43AC6D7C7711300711B2091 :10297C00710303710205E0C15003FD722BC05013AB :10298C00FD1B0AD83AC15005FD722BC0500FC1E097 :10299C00FD722BC0500AFD1B0A7103055008FD1B6C @@ -522,7 +522,7 @@ :10307C0031449813714398717B9E8FDCFB9E9A8F21 :10308C00DDFB9E9B717A9EC6D7CFA7FB5CCFA8FBBE :10309C005FCFC8FB5DCFFCFB36CFFDFBC9D7C7CFDD -:1030AC00A4FB12CFA5FB31CFCCFBFFF5CDFBF5CEAE +:1030AC00A4FB12CFA5FB2FCFCCFBFFF5CDFBF5CEB0 :1030BC00FBF5CFFBF5D0FB5600664C64DE0872388E :1030CC0026FB0086EFF3F5E3FB714A9D712B217112 :1030DC000A20711A20710203C6D7C788061617F189 @@ -1008,7 +1008,7 @@ :104EBC00317503F7332312D714AEF8C716AC0612AC :104ECC00C5AC0416F643DD078B99A7A5B3EFF5C265 :024EDC00C6D737 -:024FF400326128 -:0A4FF60031353A33383A3531000006 +:024FF400325F2A +:0A4FF60031333A31323A3333000010 :00000001FF  \ No newline at end of file diff --git a/snake_branches/2.2F_IS_TOOL/bsr.lmf b/snake_branches/2.2F_IS_TOOL/bsr.lmf index d684c83..828e380 100644 Binary files a/snake_branches/2.2F_IS_TOOL/bsr.lmf and b/snake_branches/2.2F_IS_TOOL/bsr.lmf differ diff --git a/snake_branches/2.2F_IS_TOOL/bsr_k0r.map b/snake_branches/2.2F_IS_TOOL/bsr_k0r.map index c02b181..6cb0430 100644 --- a/snake_branches/2.2F_IS_TOOL/bsr_k0r.map +++ b/snake_branches/2.2F_IS_TOOL/bsr_k0r.map @@ -1,22 +1,22 @@ -78K0R Linker W1.33 Date: 9 Sep 2013 Page: 1 +78K0R Linker W1.33 Date:12 Sep 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_branches/2.2F_IS_TOOL/config.h b/snake_branches/2.2F_IS_TOOL/config.h index a903a0f..8b38512 100644 --- a/snake_branches/2.2F_IS_TOOL/config.h +++ b/snake_branches/2.2F_IS_TOOL/config.h @@ -7,7 +7,7 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x31 +#define MCU_VER_MINOR 0x2F // ƒrƒ‹ƒhƒXƒCƒbƒ` diff --git a/snake_branches/2.2F_IS_TOOL/mcuFirm_2_31.bin b/snake_branches/2.2F_IS_TOOL/mcuFirm_2_2F.bin similarity index 98% rename from snake_branches/2.2F_IS_TOOL/mcuFirm_2_31.bin rename to snake_branches/2.2F_IS_TOOL/mcuFirm_2_2F.bin index 868d864..ea932d3 100644 Binary files a/snake_branches/2.2F_IS_TOOL/mcuFirm_2_31.bin and b/snake_branches/2.2F_IS_TOOL/mcuFirm_2_2F.bin differ diff --git a/snake_branches/2.2F_IS_TOOL/pm.c b/snake_branches/2.2F_IS_TOOL/pm.c index 1599397..961b06b 100644 --- a/snake_branches/2.2F_IS_TOOL/pm.c +++ b/snake_branches/2.2F_IS_TOOL/pm.c @@ -1037,8 +1037,9 @@ void set_vdd_voltages( enum family_ family ) { if(( family == FAMILY_SNAKE ) || ( family == FAMILY_CLOSER )) { - // SNAKE - pmreg_v_core = PM_REG_BIT_VDD1P_1R05; + // SNAKE +// pmreg_v_core = PM_REG_BIT_VDD1P_1R05; // LAGER 2 + pmreg_v_core = PM_REG_BIT_VDD1P_1R00; // LAGER1 } else { diff --git a/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.plg b/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.plg index 54c117d..fbd617f 100644 --- a/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.plg +++ b/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.plg @@ -13,9 +13,9 @@ pm.c(888) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(902) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(988) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(997) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1068) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1219) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1221) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1069) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1220) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1222) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 10 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\pm.asm Assembly complete, 0 error(s) and 0 warning(s) found. @@ -157,6 +157,17 @@ Assembly complete, 0 error(s) and 0 warning(s) found. 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\hal.asm Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no batt_params.c +batt_params.c(63) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(63) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(81) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(100) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(100) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(118) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(118) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 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\batt_params.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no voltable.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\voltable.asm @@ -165,10 +176,14 @@ Assembly complete, 0 error(s) and 0 warning(s) found. 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\pedo_lpf_coeff.asm Assembly 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 kanaria.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no kanaria_c.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\kanaria_c.asm Assembly 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 get_ei.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no util_funcs.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\util_funcs.asm @@ -177,7 +192,7 @@ Assembly complete, 0 error(s) and 0 warning(s) found. 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\i2c_mcu-sub.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' @@ -204,4 +219,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 68 +Build Total error(s) : 0 Total warning(s) : 75 diff --git a/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.prj b/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.prj index 13f655f..43051c6 100644 --- a/snake_branches/2.2F_IS_TOOL/yav_mcu_bsr.prj +++ b/snake_branches/2.2F_IS_TOOL/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.2F_IS_TOOL\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -1194,7 +1194,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.2F_IS_TOOL\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -1384,25 +1384,25 @@ Include11=vreg_twl.h Include12=loader.h Include13=i2c_mcu.h Include14=WDT.h -Include15=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include16=fsl_user.h -Include17=i2c_ctr.h -Include18=pm.h -Include19=rtc.h -Include20=reboot.h -Include21=magic.h -Include22=incs.h -Include23=i2c_twl.h -Include24=accero.h -Include25=pedometer.h -Include26=sw.h -Include27=adc.h -Include28=led.h -Include29=batt_params.h -Include30=pool.h -Include31=i2c_twl_defs.h -Include32=renge\renge_task_intval.h -Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include34=self_flash.h -Include35=util_funcs.h -Include36=i2c_mcu_sub.h +Include15=fsl_user.h +Include16=i2c_ctr.h +Include17=pm.h +Include18=rtc.h +Include19=reboot.h +Include20=magic.h +Include21=incs.h +Include22=i2c_twl.h +Include23=accero.h +Include24=pedometer.h +Include25=sw.h +Include26=adc.h +Include27=led.h +Include28=batt_params.h +Include29=pool.h +Include30=i2c_twl_defs.h +Include31=renge\renge_task_intval.h +Include32=self_flash.h +Include33=util_funcs.h +Include34=i2c_mcu_sub.h +Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include36=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h diff --git a/snake_branches/2.2F_IS_TOOL/θ¦šγˆζ›Έγ.txt b/snake_branches/2.2F_IS_TOOL/θ¦šγˆζ›Έγ.txt index 28269c4..eb3b034 100644 --- a/snake_branches/2.2F_IS_TOOL/θ¦šγˆζ›Έγ.txt +++ b/snake_branches/2.2F_IS_TOOL/θ¦šγˆζ›Έγ.txt @@ -1,9 +1,3 @@ -‘ƒƒ‚A‚ά‚Ζ‚ί wiki ‚ɏ‘‚―‚Θ‚’‚±‚ƂȂǁB‘ - -œ2.2C -SNAKE ‘Ξ‰ž (ŽŽμƒvƒŠƒ‰ƒCƒg) - -œ2.2D -SNAKE Œό‚― system updater ‚Ν mcu ƒvƒƒZƒXμ¬Žž‚ΙŒλ‚Α‚½‚½‚߁A -ƒo[ƒWƒ‡ƒ“”ԍ†‚̂݁A2.2D ‚Ι‚Θ‚Α‚Δ‚’‚ι +‘2.2F_IS_TOOL +‹@”\‚Ν 2.31 BIS ƒfƒoƒbƒK‚ΜƒfƒoƒbƒO‚Μ‚½‚߁ALAGER(1) ‚Μ“dˆ³‘Ξ‰žB