mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
WDRリセットでの割り込み追加(動作未確認)
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@105 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
parent
73bde40732
commit
abb4d47511
@ -142,7 +142,7 @@ void tsk_adc( )
|
||||
#ifndef _MODEL_CTR_
|
||||
iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - adc_raw_vol ) / 4 ] ); // todo
|
||||
#endif
|
||||
set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE );
|
||||
// set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); // 割り込み廃止
|
||||
force_update_vol = 100;
|
||||
}
|
||||
}
|
||||
|
||||
@ -74,10 +74,11 @@ void main( )
|
||||
{
|
||||
system_status.reboot = 1;
|
||||
}
|
||||
else if( ( RESF & 0x10 ) != 0) // WDRF
|
||||
else if( ( RESF & 0x10 ) != 0) // WDRF,WDTでリセット
|
||||
{
|
||||
system_status.reboot = 1;
|
||||
vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_WDT_RESET;
|
||||
set_irq( VREG_C_IRQ0, REG_BIT_WDT_RESET );
|
||||
hdwinit2( );
|
||||
}
|
||||
else
|
||||
|
||||
@ -36,7 +36,8 @@
|
||||
|
||||
|
||||
// VREG_C_IRQ0
|
||||
#define REG_BIT_VR_SNDVOL_CHANGE ( 1 << 7 )
|
||||
//#define REG_BIT_VR_SNDVOL_CHANGE ( 1 << 7 )
|
||||
#define REG_BIT_WDT_RESET ( 1 << 7 )
|
||||
#define REG_BIT_SHELL_OPEN ( 1 << 6 )
|
||||
#define REG_BIT_SHELL_CLOSE ( 1 << 5 )
|
||||
#define REG_BIT_SW_WIFI_CLICK ( 1 << 4 )
|
||||
|
||||
@ -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" -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.
|
||||
"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,21 +1,21 @@
|
||||
[ProjectManager]
|
||||
FrameMax=0
|
||||
FrameX=75
|
||||
FrameY=122
|
||||
FrameX=255
|
||||
FrameY=34
|
||||
FrameCX=1299
|
||||
FrameCY=1044
|
||||
OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0
|
||||
OpenFile2=jhl_defs.h,0,250,539,1494,1265,0,10,8,0
|
||||
OpenFile3=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0
|
||||
OpenFile4=renge\renge_defs.h,0,667,22,1514,748,0,16,0,0
|
||||
OpenFile5=sw.c,0,264,264,1508,990,0,105,0,0
|
||||
OpenFile6=adc.c,0,286,286,1530,1012,24,134,50,0
|
||||
OpenFile7=task_sys.c,0,330,330,1574,1056,0,172,37,0
|
||||
OpenFile8=loader.c,0,296,307,1286,923,20,214,20,0
|
||||
OpenFile9=pm.h,0,254,446,1244,1062,0,115,0,0
|
||||
OpenFile10=ProjectWindow
|
||||
OpenFile5=adc.c,0,286,286,1530,1012,24,134,50,0
|
||||
OpenFile6=task_sys.c,0,330,330,1574,1056,0,172,37,0
|
||||
OpenFile7=loader.c,0,296,307,1286,923,20,214,20,0
|
||||
OpenFile8=pm.h,0,254,446,1244,1062,0,115,0,0
|
||||
OpenFile9=ProjectWindow
|
||||
PrjPos=0,2,754,3,253
|
||||
OpenFile11=config.h,0,257,193,1501,919,22,24,0,0
|
||||
OpenFile10=config.h,0,257,193,1501,919,0,19,22,0
|
||||
OpenFile11=sw.c,0,266,96,1510,822,43,36,43,0
|
||||
OpenFile12=OutputWindow
|
||||
OutputPos=0,438,904,19,1077
|
||||
ActivePRJ=yav_mcu_bsr.prj
|
||||
|
||||
@ -32,7 +32,7 @@ T=4bab2e2f
|
||||
6=led.h
|
||||
7=adc.h
|
||||
[magic.c]
|
||||
T=4bab2e35
|
||||
T=4bab34a0
|
||||
1=config.h
|
||||
[WDT.c]
|
||||
T=4afd21ca
|
||||
@ -101,7 +101,7 @@ T=4ba9a066
|
||||
T=4afd21cb
|
||||
1=incs_loader.h
|
||||
[sw.c]
|
||||
T=4bab21cc
|
||||
T=4bab34a0
|
||||
1=incs.h
|
||||
2=i2c_twl.h
|
||||
3=i2c_ctr.h
|
||||
@ -157,7 +157,7 @@ T=4b90c1b8
|
||||
[user_define.h]
|
||||
T=4bab22c9
|
||||
[config.h]
|
||||
T=4bab0559
|
||||
T=4bab347f
|
||||
[bsr_system.h]
|
||||
T=4bab22a2
|
||||
[renge\renge.h]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user