mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
WDTリセット時、SoCに割り込みを通知するタイミングが良くなかった。
ちゃんとMCUのI2Cを初期化してから通知するよう変更 Horizonリポジトリに0.10としてリリース(r13538) git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@124 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
parent
947647e316
commit
ebd37460a4
@ -83,7 +83,8 @@ void main( )
|
||||
/// hdwinit2ないでリセット解除される。続きに続行してよい(頭痛が痛い的)
|
||||
#endif
|
||||
vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_STATUS_WDT_RESET;
|
||||
set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET );
|
||||
// set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET );
|
||||
// ↑I2Cの初期化後に行う
|
||||
hdwinit2( );
|
||||
}
|
||||
else
|
||||
|
||||
@ -123,7 +123,18 @@ void tsk_sys( )
|
||||
|
||||
PU7 = 0b00011101; // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n
|
||||
|
||||
IIC_ctr_Init( ); // とりあえずはここで初期化
|
||||
IIC_ctr_Init( );
|
||||
if( ( vreg_ctr[ VREG_C_MCU_STATUS ] & REG_BIT_STATUS_WDT_RESET )
|
||||
/*
|
||||
if( vreg_ctr[ VREG_C_IRQ0 ]
|
||||
| vreg_ctr[ VREG_C_IRQ0 ]
|
||||
| vreg_ctr[ VREG_C_IRQ0 ]
|
||||
| vreg_ctr[ VREG_C_IRQ0 ]
|
||||
*/
|
||||
!= 0 )
|
||||
{
|
||||
set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET );
|
||||
}
|
||||
IIC_twl_Init( );
|
||||
RTC_32k_on( );
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ Target=IDK0R32G
|
||||
[Configuration]
|
||||
Chip=uPD79F0104
|
||||
Internal Rom=32KB
|
||||
Internal Ram=1536B
|
||||
Internal Ram=1536KB
|
||||
Clock=Target
|
||||
Sub Clock=Target
|
||||
Peripheral Break=0x1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
[SdbInfo]
|
||||
Ver=5
|
||||
[loader.c]
|
||||
T=4bb92f33
|
||||
T=4bb93708
|
||||
1=incs_loader.h
|
||||
2=fsl.h
|
||||
3=fsl_user.h
|
||||
@ -34,7 +34,7 @@ T=4bb92f33
|
||||
6=led.h
|
||||
7=adc.h
|
||||
[magic.c]
|
||||
T=4bb930dc
|
||||
T=4bb94d0f
|
||||
1=config.h
|
||||
[WDT.c]
|
||||
T=4bb92f33
|
||||
@ -156,9 +156,9 @@ T=4bb92f33
|
||||
[jhl_defs.h]
|
||||
T=4bb92f33
|
||||
1=config.h
|
||||
[user_define.h]
|
||||
T=4bb92f33
|
||||
[config.h]
|
||||
T=4bb9687f
|
||||
[user_define.h]
|
||||
T=4bb92f33
|
||||
[bsr_system.h]
|
||||
T=4bb92f33
|
||||
@ -174,6 +174,8 @@ T=4bb92f32
|
||||
[vreg_ctr.h]
|
||||
T=4bb92f33
|
||||
1=config.h
|
||||
[vreg_twl.h]
|
||||
T=4bb92f33
|
||||
[loader.h]
|
||||
T=4bb92f33
|
||||
1=jhl_defs.h
|
||||
@ -191,10 +193,7 @@ T=4bb92f33
|
||||
T=4bb92f33
|
||||
[rtc.h]
|
||||
T=4bb92f33
|
||||
[adc.h]
|
||||
T=4bb92f33
|
||||
1=jhl_defs.h
|
||||
[led.h]
|
||||
[reboot.h]
|
||||
T=4bb92f33
|
||||
[incs.h]
|
||||
T=4bb92f33
|
||||
@ -207,28 +206,29 @@ T=4bb92f33
|
||||
7=i2c_mcu.h
|
||||
8=rtc.h
|
||||
9=accero.h
|
||||
[vreg_twl.h]
|
||||
T=4bb92f33
|
||||
[accero.h]
|
||||
T=4bb92f33
|
||||
1=jhl_defs.h
|
||||
2=pedometer.h
|
||||
[pedometer.h]
|
||||
T=4bb92f33
|
||||
[adc.h]
|
||||
T=4bb92f33
|
||||
1=jhl_defs.h
|
||||
[led.h]
|
||||
T=4bb92f33
|
||||
[batt_params.h]
|
||||
T=4bb92f33
|
||||
[..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h]
|
||||
T=49a3bd4e
|
||||
[i2c_twl_defs.h]
|
||||
T=4bb92f33
|
||||
[renge\renge_task_intval.h]
|
||||
T=4bb92f32
|
||||
1=renge\renge_defs.h
|
||||
[..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h]
|
||||
T=45f12258
|
||||
[i2c_twl.h]
|
||||
T=4bb92f33
|
||||
[..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h]
|
||||
T=49a3bd4e
|
||||
[reboot.h]
|
||||
T=4bb92f33
|
||||
[sw.h]
|
||||
T=4bb92f33
|
||||
[..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h]
|
||||
T=45f12258
|
||||
[batt_params.h]
|
||||
T=4bb92f33
|
||||
[pedometer.h]
|
||||
T=4bb92f33
|
||||
|
||||
Loading…
Reference in New Issue
Block a user