diff --git a/trunk/config.h b/trunk/config.h index d31fe15..9938c00 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -16,12 +16,12 @@ //#define _PM_BUG_ //#define _PARRADIUM_ -//#define _MODEL_TEG2_ +#define _MODEL_TEG2_ // TEG2 CPU { Type-T //#define _MODEL_WM0_ //#define _MODEL_TS0_ // TEG2 CPU { Type-C -#define _MODEL_CTR_TS_ +//#define _MODEL_CTR_TS_ // FINAL SoC { Type-C //#define _MODEL_CTR_JIKKI_ diff --git a/trunk/sw.c b/trunk/sw.c index f836b30..ea60fdf 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -136,9 +136,11 @@ void tsk_sw( ) // HOME XCb` // switch( system_status.model ) { +#ifdef _MODEL_CTR_ case( MODEL_JIKKI ): SW_HOME_n = SW_HOME_n_JIKKI; break; +#endif case( MODEL_TS_BOARD ): case( MODEL_SHIROBAKO ): SW_HOME_n = SW_HOME_n_TSBOARD; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 123c86c..f4c435b 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,19 +1,11 @@ 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 -qvjl3wt -sainter_asm -zp -no pm.c -pm.c(173) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(184) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(188) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(239) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(276) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(355) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(363) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(885) : 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\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 -qvjl3wt -sainter_asm -zp -no magic.c +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -cF100964 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl3wt -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 +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -cF100964 -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" -cF100964 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl3wt -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" -cF100964 -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" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -gb7EFBFFh -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 pedo_alg_thre_det2.rel Link complete, 0 error(s) and 0 warning(s) found. @@ -25,4 +17,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 8 +Build Total error(s) : 0 Total warning(s) : 0 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 45e6b04..e5d329b 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -7,7 +7,7 @@ Internal Rom=32KB Internal Ram=1536B Clock=Target Sub Clock=Target -Peripheral Break=0x3 +Peripheral Break=0x1 Firm Clock=System Flash Programming=Permit Low-voltage Flash Rewriting=On @@ -23,7 +23,7 @@ SubClock=None Count=0 [Main] Geometry=-707, 91, 1200, 882 -Window=Max +Window=Normal MDI_MAX=OFF Button=ON Mode=Auto @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=164, 95, 871, 684 +Geometry=11, -10, 871, 684 Window=Normal -DispStart=277 -CaretPos=278,0 +DispStart=68 +CaretPos=69,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=24, 657, 600, 400 Window=Normal -DispStart=17446 -CaretPos=17446,27 +DispStart=1208 +CaretPos=1208,27 Address1= Address2= Address3= @@ -256,8 +256,8 @@ Window=Hide Boundary=0 Mode=Proper [Sfr] -Geometry=50, 50, 596, 915 -Window=Normal +Geometry=613, 51, 596, 915 +Window=Hide Address1= Address2= Address3= @@ -280,7 +280,7 @@ Attribute=Show Sort=Unsort Pickup=OFF SelectSort=Address -Last Name=PR00 +Last Name=IF0 Line=531 L1=P0 L2=P1 @@ -866,8 +866,8 @@ SaveRange=Screen SaveStart= SaveEnd= [Register] -Geometry=884, 10, 250, 400 -Window=Normal +Geometry=471, 434, 250, 400 +Window=Hide Mode=Hex Boundary=62 Pickup=OFF @@ -879,7 +879,7 @@ RP2=3 RP3=3 PC=3 SP=3 -PSW=3 +PSW=7 ES=3 CS=3 [Event Manager] @@ -957,64 +957,66 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1146, 11, 440, 793 +Geometry=815, 27, 440, 793 Window=Normal Boundary=13762700 -0=.force_update_adc,P,N,A,+,1 -1=.temp,P,N,A,+,1 -2=.iic_mcu_bus_status,P,N,A,+,1 -3=.adc_raw_vol,P,N,A,+,1 -4=.P12.0,P,S,A,+,1 -5=.PM12.0,P,S,A,+,1 -6=.PM7.5,P,S,A,+,1 -7=.P7.5,P,S,A,+,1 -8=.TRC1,P,S,A,+,1 -9=.IICA1,P,S,A,+,1 -10=.temp,P,N,A,+,1 -11=.p12.0,P,S,A,+,1 -12=.pm12.0,P,S,A,+,1 -13=.SPD1,P,S,A,+,1 -14=.STD1,P,S,A,+,1 -15=.pr10,B,S,A,+,1 -16=.pr00,B,S,A,+,1 -17=.pr11,B,S,A,+,1 -18=.pr01,B,S,A,+,1 -19=.iics1,P,S,A,+,1 -20=.iicf1,P,S,A,+,1 -21=.P3.3,P,S,A,+,1 -22=.PU3.3,P,S,A,+,1 -23=.PM3.3,P,S,A,+,1 -24=.SW_home_mask,P,N,A,+,1 -25=.SW_home_mask,P,N,A,+,1 -26=.SW_home_count,P,N,A,+,1 -27=.PU20,B,S,A,+,1 -28=.P2.0,P,S,A,+,1 -29=.PM2.0,P,S,A,+,1 -30=.P20.4,B,S,A,+,1 -31=.PM20.4,B,S,A,+,1 -32=.PM3,B,S,A,+,1 -33=.P3,B,S,A,+,1 -34=.adc_raw_vol,P,N,A,+,1 -35=.vol_old,P,N,A,+,1 -36=.iic_burst_state,P,N,A,+,1 -Line=37 +0=.DMAIF1,P,S,A,+,1 +1=.DMAMK1,P,S,A,+,1 +2=.force_update_adc,P,N,A,+,1 +3=.temp,P,N,A,+,1 +4=.iic_mcu_bus_status,P,N,A,+,1 +5=.adc_raw_vol,P,N,A,+,1 +6=.P12.0,P,S,A,+,1 +7=.PM12.0,P,S,A,+,1 +8=.PM7.5,P,S,A,+,1 +9=.P7.5,P,S,A,+,1 +10=.TRC1,P,S,A,+,1 +11=.IICA1,P,S,A,+,1 +12=.temp,P,N,A,+,1 +13=.p12.0,P,S,A,+,1 +14=.pm12.0,P,S,A,+,1 +15=.SPD1,P,S,A,+,1 +16=.STD1,P,S,A,+,1 +17=.pr10,B,S,A,+,1 +18=.pr00,B,S,A,+,1 +19=.pr11,B,S,A,+,1 +20=.pr01,B,S,A,+,1 +21=.iics1,P,S,A,+,1 +22=.iicf1,P,S,A,+,1 +23=.P3.3,P,S,A,+,1 +24=.PU3.3,P,S,A,+,1 +25=.PM3.3,P,S,A,+,1 +26=.SW_home_mask,P,N,A,+,1 +27=.SW_home_mask,P,N,A,+,1 +28=.SW_home_count,P,N,A,+,1 +29=.PU20,B,S,A,+,1 +30=.P2.0,P,S,A,+,1 +31=.PM2.0,P,S,A,+,1 +32=.P20.4,B,S,A,+,1 +33=.PM20.4,B,S,A,+,1 +34=.PM3,B,S,A,+,1 +35=.P3,B,S,A,+,1 +36=.adc_raw_vol,P,N,A,+,1 +37=.vol_old,P,N,A,+,1 +38=.iic_burst_state,P,N,A,+,1 +Line=39 [Quick Watch] -0=STD1,P,A,1 -1=SPD1,P,A,1 -2=IICA,P,A,1 -3=pm12.0,P,A,1 -4=p12.0,P,A,1 -5=IICA1,P,A,1 -6=TRC1,P,A,1 -7=P7.5,P,A,1 -8=PM7.6,P,A,1 -9=PM7.5,P,A,1 -10=PM12.0,P,A,1 -11=P12.0,P,A,1 -12=iic_mcu_bus_status,P,A,1 -13=temp,P,A,1 -14=adc_raw_vol,P,A,1 -15=force_update_adc,P,A,1 +0=IICA,P,A,1 +1=pm12.0,P,A,1 +2=p12.0,P,A,1 +3=IICA1,P,A,1 +4=TRC1,P,A,1 +5=P7.5,P,A,1 +6=PM7.6,P,A,1 +7=PM7.5,P,A,1 +8=PM12.0,P,A,1 +9=P12.0,P,A,1 +10=iic_mcu_bus_status,P,A,1 +11=temp,P,A,1 +12=adc_raw_vol,P,A,1 +13=force_update_adc,P,A,1 +14=DMAMK1,P,A,1 +15=DMAIF1,P,A,1 [Software Break] Geometry=1085, 803, 500, 296 Window=Normal @@ -1059,7 +1061,11 @@ Name9=Swb00014 Address9=pm.c#_ntr_pmic_comm+0x65 Window9=ASM Status9=ON -Count=10 +Name10=Swb00006 +Address10=pm.c#_PM_init+0x38 +Window10=ASM +Status10=ON +Count=11 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 5e9cd20..a9e23c1 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -3,8 +3,8 @@ Version=6.00 Path=C:\78k_data\yav-mcu-basara\ Title=yav-mcu Series=78K0R.PM -Device=uPD79F0104 -DeviceVer=E1.00b +Device=uPD78F1009_64 +DeviceVer=V1.11 DebugMode=1 Target=C:\78k_data\yav-mcu-basara\bsr.lmf [BuildMode0] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index f1d483e..3d41283 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4ba2fdb7 +T=4bab1d9d 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,7 +11,7 @@ T=4ba2fdb7 7=rtc.h 8=reboot.h [pm.c] -T=4bab0231 +T=4bab30ef 1=incs.h 2=adc.h 3=led.h @@ -23,7 +23,7 @@ T=4ba9a43e 1=incs.h 2=accero.h [main.c] -T=4b999c7e +T=4bab2e2f 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -32,7 +32,7 @@ T=4b999c7e 6=led.h 7=adc.h [magic.c] -T=4bab0559 +T=4bab2e35 1=config.h [WDT.c] T=4afd21ca @@ -56,7 +56,7 @@ T=4b4438bb T=4b6a6fa4 1=incs.h [vreg_ctr.c] -T=4bab04a3 +T=4bab215d 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -73,7 +73,7 @@ T=4b8b5f7f 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4baaefdd +T=4bab215d 1=incs.h 2=adc.h 3=pm.h @@ -101,7 +101,7 @@ T=4ba9a066 T=4afd21cb 1=incs_loader.h [sw.c] -T=4b95fcac +T=4bab21cc 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -110,13 +110,13 @@ T=4b95fcac 6=pm.h 7=rtc.h [task_debug.c] -T=4baaef6c +T=4bab1d9d 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4baafb81 +T=4bab22ef 1=incs.h 2=renge\renge.h 3=pm.h @@ -155,11 +155,11 @@ T=4b25f1a9 T=4b90c1b8 1=config.h [user_define.h] -T=4ba9e8b6 +T=4bab22c9 [config.h] T=4bab0559 [bsr_system.h] -T=4b3064de +T=4bab22a2 [renge\renge.h] T=4b32c168 1=renge\renge_defs.h @@ -186,7 +186,7 @@ T=4afd21cb [i2c_ctr.h] T=4ba9a39e [pm.h] -T=4ba1e3ed +T=4bab215d [rtc.h] T=4b6a6fa4 [adc.h]