From a255f5020e74233340b01af1f68e63e0c2f8c3c5 Mon Sep 17 00:00:00 2001 From: n2232 Date: Tue, 28 Dec 2010 00:54:41 +0000 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=80=91=E9=9B=BB=E6=BA=90=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=A1?= =?UTF-8?q?=E3=82=87=E3=82=93=E6=8A=BC=E3=81=97=E6=99=82=E9=96=93=E3=82=92?= =?UTF-8?q?160ms=E2=86=92220ms=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@298 013db118-44a6-b54f-8bf7-843cb86687b1 --- branches/SDK0.14/bsr.hex | 10 ++-- branches/SDK0.14/bsr.lmf | Bin 158736 -> 158736 bytes branches/SDK0.14/bsr_k0r.map | 2 +- branches/SDK0.14/config.h | 2 +- branches/SDK0.14/hoge.bin | Bin 16387 -> 16387 bytes branches/SDK0.14/sw.h | 2 +- branches/SDK0.14/yav_mcu_bsr.plg | 98 ++++++++++++++++++++++++++++++- 7 files changed, 105 insertions(+), 9 deletions(-) diff --git a/branches/SDK0.14/bsr.hex b/branches/SDK0.14/bsr.hex index 4089032..ef8f5d8 100644 --- a/branches/SDK0.14/bsr.hex +++ b/branches/SDK0.14/bsr.hex @@ -250,8 +250,8 @@ :100F9600C09EFD62C6C2D7C3C7F3728EFDC1625C36 :100FA6000F0C000FFE00314C4100367C4F11618062 :0B0FB6000FFE0073C09EFD63C6C2D793 -:0A0FF60031383A32383A343900003D -:0A20000031383A32383A3439000022 +:0A0FF60030393A33353A3035000047 +:0A20000030393A33353A303500002C :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -570,7 +570,7 @@ :1033B2009E31142213711322717B9E8F0EFC9E9AF2 :1033C2008F0FFC9E9B717A9EC6D7CFD9FB5CCFDA5A :1033D200FB5FCFFAFB5DCF2EFC36CF2FFCC9D7C7E0 -:1033E200CFD6FB11CFD7FB11CFFEFBFFF5FFFBF5CD +:1033E200CFD6FB11CFD7FB12CFFEFBFFF5FFFBF5CC :1033F20000FCF501FCF502FCCFFBFB20F5FCFB56C3 :1034020000664C64DE08723846FB0086EFF3C6D7CE :10341200C788061617F1E73403002361E3ED3D3751 @@ -752,7 +752,7 @@ :103F12004020F902DF04F6BF84FCD520F9DF04F665 :103F2200BF8AFCB05EFDD55EFD61E8ED3840CF5E34 :103F3200FD048F20F9318FE723DD0B2402002403D7 -:103F42000061C8ED38403014004284FCDF0AE0C151 +:103F42000061C8ED3840301B004284FCDF0AE0C14A :103F52005010FDF937C0EF203077014284FCDF18A2 :103F62005002C15010FDF937C0F6428AFCDF098FBA :103F7200FAFB5010D6BF8AFCF6428AFCDD0DB28AEB @@ -1019,6 +1019,6 @@ :104FAC00E13023323A407C09F24101000000983A8A :0A4FBC00F82AFF23301299000000CC :084FC600317503F7332312D704 -:0A4FF60031383A32383A34390000FD +:0A4FF60030393A33353A3035000007 :00000001FF  \ No newline at end of file diff --git a/branches/SDK0.14/bsr.lmf b/branches/SDK0.14/bsr.lmf index efbf663c02a9c37b19536820e3d26c8b3960c7e7..1eb172786d6fcd7990fd5f8b8468d460c13bdcf0 100644 GIT binary patch delta 79 zcmbPmgLA?SPIeDL2Zr4Sk{j6<%8D3RS{a*K8JIEv0gSzQkL+V%Mxo6M4CA>Or8n93 W2ynopny2`-Pw{2kKE;=*Mh*aIXcj^M delta 79 zcmbPmgLA?SPIeDL2Zq3%q8r&4%8D3TSQ%MZnOHIa0gSzQkL+V%M#0Ss4CA>OMK;;? W2ynopny2`-Pw{2kKE;=*Mh*aSiWYMK diff --git a/branches/SDK0.14/bsr_k0r.map b/branches/SDK0.14/bsr_k0r.map index 15561ef..9f94621 100644 --- a/branches/SDK0.14/bsr_k0r.map +++ b/branches/SDK0.14/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:25 Dec 2010 Page: 1 +78K0R Linker W1.33 Date:28 Dec 2010 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool diff --git a/branches/SDK0.14/config.h b/branches/SDK0.14/config.h index 38b54d7..c4cbcab 100644 --- a/branches/SDK0.14/config.h +++ b/branches/SDK0.14/config.h @@ -13,7 +13,7 @@ //#define _FORCE_TAIKENDAI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x11 +#define MCU_VER_MINOR 0x12 #define _firm_format_v3_ diff --git a/branches/SDK0.14/hoge.bin b/branches/SDK0.14/hoge.bin index a43f740a73286fb57568247820fe3e3eeaca6cf4..2a700661ef5ce89fc4f85fce81424aa291f2ddb2 100644 GIT binary patch delta 58 zcmZo}U~Fz+-0+iM$iULd*wo6vlz{=p+RQERP?%9@^IPS3Zbs?NzWQqfxL|S&3;^97 B4&(p; delta 58 zcmZo}U~Fz+-0+iM$k4*d$im9Rl7Run+RQERP?%A0^IPS3Zbp&KzWQqfxL|S&3;^Gn B4*CE9 diff --git a/branches/SDK0.14/sw.h b/branches/SDK0.14/sw.h index 01f47bf..628895f 100644 --- a/branches/SDK0.14/sw.h +++ b/branches/SDK0.14/sw.h @@ -10,7 +10,7 @@ extern bit SW_pow_mask; #define CLICK_THRESHOLD 2 #define HOLD_THREASHOLD (u16)( 3000 /INTERVAL_TSK_SW ) -#define TIME_PWSW_CLICK (u8)( 160 /INTERVAL_TSK_SW ) +#define TIME_PWSW_CLICK (u8)( 220 /INTERVAL_TSK_SW ) #define FORCEOFF_THREASHOLD (u8)( 12000 /INTERVAL_TSK_SW /16 ) #endif diff --git a/branches/SDK0.14/yav_mcu_bsr.plg b/branches/SDK0.14/yav_mcu_bsr.plg index 2607d54..ec375bb 100644 --- a/branches/SDK0.14/yav_mcu_bsr.plg +++ b/branches/SDK0.14/yav_mcu_bsr.plg @@ -1,8 +1,104 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no pm.c +pm.c(801) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(878) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(886) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1101) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1104) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 5 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 inter_asm\pm.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.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 inter_asm\i2c_ctr.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no 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 inter_asm\magic.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.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 inter_asm\i2c_twl.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no led.c +led.c(109) : CC78K0R warning W0745: Expected function prototype +led.c(251) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(256) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(318) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(377) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(403) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(579) : 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 inter_asm\led.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no rtc.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 inter_asm\rtc.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no vreg_ctr.c +vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(216) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(216) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(225) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(225) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(229) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(229) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(233) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 14 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 inter_asm\vreg_ctr.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(57) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 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 inter_asm\vreg_twl.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no adc.c +adc.c(103) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(200) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(232) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(344) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(462) : CC78K0R warning W0745: Expected function prototype +adc.c(491) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(496) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(122) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 9 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 inter_asm\adc.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no accero.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 inter_asm\accero.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no sw.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 inter_asm\sw.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(310) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 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 inter_asm\task_misc.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no task_sys.c +task_sys.c(207) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(525) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 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 inter_asm\task_sys.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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -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 (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\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 (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 -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 (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -13,4 +109,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) : 44