mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
リブート時にADCの初期化をしていなかったのを修正
オーバークロック時、メーカーの指示によりレジスタのセットと、STOP()時の処理追加 スリープ時にPMICを省電力モードに移行するのを有効に ジャイロ仮対応 だが、マイコン配下にはつかなさそう 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
This commit is contained in:
parent
bdb79adbda
commit
969c449d11
@ -6,7 +6,7 @@
|
||||
|
||||
|
||||
#define MCU_VER_MAJOR 0x00;
|
||||
#define MCU_VER_MINOR 0x0B;
|
||||
#define MCU_VER_MINOR 0x0C;
|
||||
|
||||
#define _OVERCLOCK_
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@ void main_loop( void )
|
||||
{
|
||||
|
||||
// 電池投入時の1回のみ
|
||||
PM_init();
|
||||
RTC_init( ); // 内部でリブートか判定しています
|
||||
PM_init();
|
||||
|
||||
|
||||
@ -10,18 +10,21 @@ CTR MCU I2C
|
||||
#include "accero.h"
|
||||
#include "pm.h"
|
||||
|
||||
#include <fsl.h>
|
||||
#include "fsl_user.h"
|
||||
|
||||
|
||||
// ********************************************************
|
||||
u8 vreg_ctr[VREG_C_ENDMARK_];
|
||||
|
||||
bit irq_readed; // AAA型のため。
|
||||
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' ): // マイコン再起動
|
||||
WDTE = 0xAA;
|
||||
|
||||
DI( );
|
||||
RTCE = 0;
|
||||
while( DST1 ){;}
|
||||
DEN1 = 0;
|
||||
FSL_FLMD0_HIGH; // フラッシュ書き替え許可
|
||||
FSL_Init( pool ); // ライブラリ初期化。割り込み中断考慮せず
|
||||
FSL_ModeCheck( ); // ライトプロテクトチェック。失敗することを考慮せず
|
||||
FSL_ForceReset(); // リセット
|
||||
break;
|
||||
|
||||
default:
|
||||
vreg_ctr[adrs] = data;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user