From 969c449d117de5d2c2cc0eac14039f71ae337ba1 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Thu, 10 Dec 2009 02:42:19 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=96=E3=83=BC=E3=83=88=E6=99=82?= =?UTF-8?q?=E3=81=ABADC=E3=81=AE=E5=88=9D=E6=9C=9F=E5=8C=96=E3=82=92?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20=E3=82=AA=E3=83=BC?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=AF=E3=83=AD=E3=83=83=E3=82=AF=E6=99=82?= =?UTF-8?q?=E3=80=81=E3=83=A1=E3=83=BC=E3=82=AB=E3=83=BC=E3=81=AE=E6=8C=87?= =?UTF-8?q?=E7=A4=BA=E3=81=AB=E3=82=88=E3=82=8A=E3=83=AC=E3=82=B8=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=81=AE=E3=82=BB=E3=83=83=E3=83=88=E3=81=A8=E3=80=81?= =?UTF-8?q?STOP()=E6=99=82=E3=81=AE=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0=20?= =?UTF-8?q?=E3=82=B9=E3=83=AA=E3=83=BC=E3=83=97=E6=99=82=E3=81=ABPMIC?= =?UTF-8?q?=E3=82=92=E7=9C=81=E9=9B=BB=E5=8A=9B=E3=83=A2=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E8=A1=8C=E3=81=99=E3=82=8B=E3=81=AE=E3=82=92?= =?UTF-8?q?=E6=9C=89=E5=8A=B9=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@46 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/config.h | 2 +- trunk/main.c | 1 + trunk/vreg_ctr.c | 19 +++++++++++++++++-- trunk/yav_mcu_bsr.plg | 4 ---- trunk/yav_mcu_bsr.prk | 21 ++++++++++++--------- trunk/yav_mcu_bsr.sdb | 16 +++++++++------- 6 files changed, 40 insertions(+), 23 deletions(-) diff --git a/trunk/config.h b/trunk/config.h index c2b2c9c..a72cff5 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -6,7 +6,7 @@ #define MCU_VER_MAJOR 0x00; -#define MCU_VER_MINOR 0x0B; +#define MCU_VER_MINOR 0x0C; #define _OVERCLOCK_ diff --git a/trunk/main.c b/trunk/main.c index 9f15cdd..5cf0312 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -33,6 +33,7 @@ void main_loop( void ) { // dr̂P̂ + PM_init(); RTC_init( ); // Ńu[g肵Ă܂ PM_init(); diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 36b46a2..e9344b3 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -10,18 +10,21 @@ CTR MCU I2C #include "accero.h" #include "pm.h" +#include +#include "fsl_user.h" + // ******************************************************** u8 vreg_ctr[VREG_C_ENDMARK_]; bit irq_readed; // AAA^̂߁B extern bit update; +extern u8 pool[]; // ******************************************************** extern task_status_immed tski_firm_update(); - // ******************************************************** #ifdef _MCU_BSR_ #define IICAMK IICAMK1 @@ -221,11 +224,23 @@ void vreg_ctr_write( u8 adrs, u8 data ) #endif case ( VREG_C_COMMAND3 ): - vreg_ctr[adrs] = data; switch ( data ) { case ( 'r' ): // }CRċN WDTE = 0xAA; + + DI( ); + RTCE = 0; + while( DST1 ){;} + DEN1 = 0; + FSL_FLMD0_HIGH; // tbVւ + FSL_Init( pool ); // CuB荞ݒfl + FSL_ModeCheck( ); // CgveNg`FbNBs邱Ƃl + FSL_ForceReset(); // Zbg + break; + + default: + vreg_ctr[adrs] = data; break; } break; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 4b937de..9b18f49 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -3,10 +3,6 @@ C:\WINDOWS\system32\cmd.exe /c touch 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 -quvjl2wt -sainter_asm -zp -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\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 -kp -gb6EFBFFh -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 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 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index b4dbb41..f189f1b 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,17 +1,20 @@ [ProjectManager] -FrameMax=1 -FrameX=158 -FrameY=51 +FrameMax=0 +FrameX=225 +FrameY=80 FrameCX=1299 FrameCY=1043 OpenFile1=accero.c,0,272,165,1516,922,26,119,26,0 -OpenFile2=sw.c,0,132,132,1376,889,54,121,54,0 -OpenFile3=loader.c,0,266,31,1510,788,17,88,17,0 -OpenFile4=ProjectWindow +OpenFile2=task_sys.c,0,521,328,1765,1085,25,250,25,0 +OpenFile3=bsr_mcu.dr,0,198,198,1177,834,0,54,0,0 +OpenFile4=adc.c,0,220,220,1199,856,0,112,0,0 +OpenFile5=loader.c,0,266,31,1510,788,23,43,23,0 +OpenFile6=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile5=config.h,0,286,286,1530,1043,0,19,20,0 -OpenFile6=OutputWindow -OutputPos=0,48,992,426,1226 +OpenFile7=config.h,0,286,286,1530,1043,0,19,21,0 +OpenFile8=sw.c,0,132,132,1376,889,0,166,17,0 +OpenFile9=OutputWindow +OutputPos=0,711,1482,484,1586 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 814cd33..b6e407f 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -20,7 +20,7 @@ T=4b1e0cfa T=4b024862 1=incs.h [main.c] -T=4b1e0c63 +T=4b1f39d5 1=incs.h 2=WDT.h 3=rtc.h @@ -29,7 +29,7 @@ T=4b1e0c63 6=led.h 7=adc.h [magic.c] -T=4b1efde0 +T=4b1f5391 1=config.h [WDT.c] T=4afd21ca @@ -50,16 +50,18 @@ T=4b0499ab 1=incs.h 2=led.h [rtc.c] -T=4b03bbe1 +T=4b1f4275 1=incs.h [vreg_ctr.c] -T=4b1c9c58 +T=4b1f548f 1=incs.h 2=vreg_ctr.h 3=rtc.h 4=led.h 5=accero.h 6=pm.h +7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +8=fsl_user.h [vreg_twl.c] T=4b1c8d36 1=incs.h @@ -68,7 +70,7 @@ T=4b1c8d36 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4b1c8cd2 +T=4b1f3999 1=incs.h 2=adc.h 3=pm.h @@ -86,7 +88,7 @@ T=4b18cd05 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4b1cee10 +T=4b1f548f 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -142,7 +144,7 @@ T=4b023fdb T=4b1cdaa0 1=config.h [config.h] -T=4b1f0b1f +T=4b1f5387 [bsr_system.h] T=4afd21ca [renge\renge.h]