rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-10-31 13:51:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

TypeT でBL ON コマンド後の割り込みビット位置が間違えていた

Browse Source 
RTCを止めた後再開忘れていた


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@55 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
fujita_ryohei 2009-12-14 10:48:11 +00:00
parent 918d61006b
commit 17900af161
8 changed files with 111 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/accero.c
View File

@ -216,7 +216,7 @@ static void hosu_increment()
else if( last_year == ( now_year -1 ) )
{
// 年をまたいでいるとき
u16 temp_hours = last_hour + now_hour - ( ( 365 + (( now_year & 0x03 ) == 1 )? 1: 0 ) * 24 );
u16 temp_hours = ( ( 365 + (( now_year & 0x03 ) == 1 )? 1: 0 ) * 24 ) - last_hour + now_hour;
fill_hosu_hist_hours( temp_hours );
}
else if( last_year < now_year )

4
trunk/config.h
View File

@ -14,9 +14,9 @@
//#define _PM_BUG_
//#define _PARRADIUM_
//#define _MODEL_TEG2_
#define _MODEL_TEG2_
//#define _MODEL_WM0_
#define _MODEL_TS0_
//#define _MODEL_TS0_
//#define _MODEL_CTR_
//#define _SW_HOME_ENABLE_

19
trunk/i2c_ctr.c
View File

@ -69,15 +69,6 @@ __interrupt void int_iic_ctr( )
EI();
if( SPD )
{
state = IIC_IDLE;
SPIE = 0;
// I2C終了時に何かする物 //
rtc_unlock( );
return;
}
// 読み出し終了
if( !ACKD )
{
@ -103,6 +94,16 @@ __interrupt void int_iic_ctr( )
// 歩数計読み出し終了
hosu_read_end( );
rtc_unlock( );
return;
}
if( SPD )
{
state = IIC_IDLE;
SPIE = 0;
// I2C終了時に何かする物 //
rtc_unlock( );
return;
}

13
trunk/pm.c
View File

@ -245,7 +245,7 @@ err PM_LCD_on( )
void PM_LCD_off( )
{
// PM_TEG_LCD_dis( 1 );
wait_ms( 1 + 50 );
wait_ms( DELAY_PM_LCD_OFF );
PM_VDDLCD_off( ); // 残ってたの全部止めます。
vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
@ -254,26 +254,31 @@ void PM_LCD_off( )
err PM_BL_set( u8 dat )
{
static u8 blset = 0;
u8 regset = 0;
// Modify
// ue
if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 )
{
blset |= PM_REG_BIT_BL_U;
regset |= REG_BIT_BL_U_ON;
}
else if(( dat & REG_BIT_CMD_BL_U_OFF ) != 0 )
{
blset &= ~PM_REG_BIT_BL_U;
regset |= REG_BIT_BL_U_OFF;
}
// shita
if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 )
{
blset |= PM_REG_BIT_BL_L;
regset |= REG_BIT_BL_L_ON;
}
else if(( dat & REG_BIT_CMD_BL_L_OFF ) != 0 )
{
blset &= ~PM_REG_BIT_BL_L;
regset |= REG_BIT_BL_L_OFF;
}
// Write
@ -286,7 +291,7 @@ err PM_BL_set( u8 dat )
{
u8 tot;
vreg_ctr[ VREG_C_IRQ3 ] |= blset;
vreg_ctr[ VREG_C_IRQ3 ] |= regset;
IRQ0_neg;
tot = 0;
while( !IRQ0 && ( ++tot != 0 ) ){;}
@ -297,6 +302,9 @@ err PM_BL_set( u8 dat )
}
/* ========================================================
======================================================== */
err PM_LCD_vcom_set( )
{
return ( ERR_SUCCESS );
@ -441,7 +449,6 @@ err PM_BL_set( u8 dat )
// Write
iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, blset );
if( blset != 0x00 ){
wait_ms( 10 );
}

65
trunk/yav_mcu_bsr.plg
View File

@ -1,63 +1,22 @@
C:\WINDOWS\system32\cmd.exe /c touch magic.c
"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 -quvjl3wt -sainter_asm -zp -no 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
"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 -quvjl3wt -sainter_asm -zp -no pm.c
pm.c(193) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(209) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(288) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(882) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 5 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\pm.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 -quvjl3wt -sainter_asm -zp -no accero.c
accero.c(113) : CC78K0R warning W0745: Expected function prototype
accero.c(122) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 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\accero.asm
"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 -quvjl3wt -sainter_asm -zp -no 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\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
Object Conversion Complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rloader.rel -lbsr.lmf -ointer_asm loader.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rpm.rel -lbsr.lmf -ointer_asm pm.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -ri2c_ctr.rel -lbsr.lmf -ointer_asm i2c_ctr.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rmain.rel -lbsr.lmf -ointer_asm main.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rmagic.rel -lbsr.lmf -ointer_asm magic.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rWDT.rel -lbsr.lmf -ointer_asm WDT.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -ri2c_mcu.rel -lbsr.lmf -ointer_asm i2c_mcu.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -ri2c_twl.rel -lbsr.lmf -ointer_asm i2c_twl.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rini_VECT.rel -lbsr.lmf -ointer_asm ini_VECT.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rled.rel -lbsr.lmf -ointer_asm led.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rrtc.rel -lbsr.lmf -ointer_asm rtc.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rvreg_ctr.rel -lbsr.lmf -ointer_asm vreg_ctr.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rvreg_twl.rel -lbsr.lmf -ointer_asm vreg_twl.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -radc.rel -lbsr.lmf -ointer_asm adc.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rrenge.rel -lbsr.lmf -ointer_asm renge.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -raccero.rel -lbsr.lmf -ointer_asm accero.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rself_flash.rel -lbsr.lmf -ointer_asm self_flash.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rreboot.rel -lbsr.lmf -ointer_asm reboot.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rsw.rel -lbsr.lmf -ointer_asm sw.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rtask_debug.rel -lbsr.lmf -ointer_asm task_debug.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rtask_misc.rel -lbsr.lmf -ointer_asm task_misc.prn
Conversion complete.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lc78k0r.exe" -_msgoff -rtask_sys.rel -lbsr.lmf -ointer_asm task_sys.prn
Conversion complete.
C:\WINDOWS\system32\cmd.exe /c ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex
C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored
Build Total error(s) : 0 Total warning(s) : 2
Build Total error(s) : 0 Total warning(s) : 5

6
trunk/yav_mcu_bsr.pri
View File

@ -2,9 +2,9 @@
Ver=200
Target=IDK0R32G
[Configuration]
Chip=uPD79F0104
Internal Rom=32KB
Internal Ram=1536B
Chip=uPD78F1009_64
Internal Rom=64KB
Internal Ram=3072KB
Clock=Target
Sub Clock=Target
Peripheral Break=0x2

96
trunk/yav_mcu_bsr.prj
View File

@ -3,8 +3,8 @@ Version=6.00
Path=C:\78k_data\yav-mcu-basara\
Title=yav-mcu
Series=78K0R.PM
Device=uPD79F0104
DeviceVer=E1.00b
Device=uPD78F1009_64
DeviceVer=V1.11
DebugMode=1
Target=C:\78k_data\yav-mcu-basara\bsr.lmf
[BuildMode0]
@ -419,42 +419,6 @@ ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[ToolSet]
ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
Tool1=CC78K0R|W2.10
Tool2=RA78K0R|W1.31
Tool3=ID78K0R-QB|V3.60
[Options.LCNV78K0R 0]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 1]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 2]
Version=100
LCNV_GO=1
O0=inter_asm
E=0
CommandFile=0
[Options.LCNV78K0R 3]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 4]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 5]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.RA78K0R 0]
Version=100
G=1
@ -563,16 +527,6 @@ LT=8
Z=0
CommandFile=0
RA_OPT=
[Options.78K0R]
BuildMode=2
BuildMode2=K0R_dbg
BuildMode3=BSR_dbg
BuildMode4=BSR_rel
BuildMode5=BSR_WM0
DefaultMode2=1
DefaultMode3=1
DefaultMode4=1
DefaultMode5=1
[Options.CC78K0R 0]
Version=210
Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
@ -1039,3 +993,49 @@ VfiFileBoot0=
VfiFileBoot1=boot.vfi
VF78K0Rchk=0
VF78K0Rvs=
[ToolSet]
ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
Tool1=CC78K0R|W2.10
Tool2=RA78K0R|W1.31
Tool3=ID78K0R-QB|V3.60
[Options.LCNV78K0R 0]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 1]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 2]
Version=100
LCNV_GO=0
O0=inter_asm
E=0
CommandFile=0
[Options.LCNV78K0R 3]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 4]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 5]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.78K0R]
BuildMode=2
BuildMode2=K0R_dbg
BuildMode3=BSR_dbg
BuildMode4=BSR_rel
BuildMode5=BSR_WM0
DefaultMode2=1
DefaultMode3=1
DefaultMode4=1
DefaultMode5=1

47
trunk/yav_mcu_bsr.sdb
View File

@ -11,17 +11,18 @@ T=4b1efd24
7=rtc.h
8=reboot.h
[pm.c]
T=4b1e0cfa
T=4b257ed5
1=incs.h
2=adc.h
3=led.h
4=pm.h
[i2c_ctr.c]
T=4b024862
T=4b20aa4e
1=incs.h
2=accero.h
[main.c]
T=4b1f39d5
1=incs.h
T=4b25f14b
1=incs_loader.h
2=WDT.h
3=rtc.h
4=pm.h
@ -29,7 +30,7 @@ T=4b1f39d5
6=led.h
7=adc.h
[magic.c]
T=4b1f5391
T=4b25f2ac
1=config.h
[WDT.c]
T=4afd21ca
@ -53,7 +54,7 @@ T=4b0499ab
T=4b1f4275
1=incs.h
[vreg_ctr.c]
T=4b1f548f
T=4b20a996
1=incs.h
2=vreg_ctr.h
3=rtc.h
@ -70,13 +71,13 @@ T=4b1c8d36
4=vreg_ctr.h
5=renge\renge_task_intval.h
[adc.c]
T=4b1f3999
T=4b25ee1e
1=incs.h
2=adc.h
3=pm.h
4=led.h
[renge\renge.c]
T=4b1cb2ad
T=4b205fce
1=renge\renge_defs.h
2=renge\renge_task_intval.h
3=renge\renge_task_immediate.h
@ -84,11 +85,11 @@ T=4b1cb2ad
5=config.h
6=bsr_system.h
[accero.c]
T=4b18cd05
T=4b25f461
1=incs.h
2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
[self_flash.c]
T=4b1f548f
T=4b20a948
1=incs_loader.h
2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
3=fsl_user.h
@ -97,7 +98,7 @@ T=4b1f548f
T=4afd21cb
1=incs_loader.h
[sw.c]
T=4b1cabb6
T=4b21cccc
1=incs.h
2=i2c_twl.h
3=i2c_ctr.h
@ -118,7 +119,7 @@ T=4b0b8f86
3=pm.h
4=accero.h
[task_sys.c]
T=4b1efdd2
T=4b20b95f
1=incs.h
2=i2c_twl.h
3=i2c_ctr.h
@ -128,15 +129,16 @@ T=4b1efdd2
7=rtc.h
8=sw.h
[incs_loader.h]
T=4afd21cb
T=4b25f1a9
1=jhl_defs.h
2=user_define.h
3=bsr_system.h
4=renge\renge.h
5=vreg_ctr.h
6=loader.h
7=i2c_mcu.h
8=WDT.h
6=vreg_twl.h
7=loader.h
8=i2c_mcu.h
9=WDT.h
[jhl_defs.h]
T=4b023fdb
1=config.h
@ -144,7 +146,7 @@ T=4b023fdb
T=4b1cdaa0
1=config.h
[config.h]
T=4b1f5387
T=4b258474
[bsr_system.h]
T=4afd21ca
[renge\renge.h]
@ -157,7 +159,7 @@ T=4b024862
T=4afa8168
1=renge\renge_defs.h
[vreg_ctr.h]
T=4b1c8cd1
T=4b25ede2
1=config.h
[loader.h]
T=4afd21ca
@ -173,16 +175,16 @@ T=4afd21cb
[i2c_ctr.h]
T=4afd21cb
[pm.h]
T=4b1efd58
T=4b21ce6e
[rtc.h]
T=4b161be1
[adc.h]
T=4b1c8cd1
T=4b25ee1e
1=jhl_defs.h
[led.h]
T=4b038a57
[incs.h]
T=4afd21ca
T=4b25e780
1=jhl_defs.h
2=user_define.h
3=bsr_system.h
@ -191,10 +193,11 @@ T=4afd21ca
6=vreg_twl.h
7=i2c_mcu.h
8=rtc.h
9=accero.h
[vreg_twl.h]
T=4afd21cb
[accero.h]
T=4b18b6b6
T=4b25e782
1=jhl_defs.h
[i2c_twl_defs.h]
T=4afd21ca