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

LCD OFFとBL OFF が同時に来た際、BL OFF割り込みを二度入れていたのを修正

Browse Source 
0.BとしてHorizonリポジトリにリリース

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@65 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
fujita_ryohei 2009-12-15 12:23:31 +00:00
parent 28c7c8521c
commit 218a5e322f
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/pm.c
View File

@ -300,6 +300,7 @@ void PM_LCD_off()
while( !IRQ0 && ( ++tot != 0 ) ){;} while( !IRQ0 && ( ++tot != 0 ) ){;}
IRQ0_ast; IRQ0_ast;
} }
vreg_ctr[VREG_C_COMMAND2] &= ~( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF );
} }
#ifdef _PMIC_TWL_ #ifdef _PMIC_TWL_
@ -312,6 +313,8 @@ void PM_LCD_off()
PM_VDDLCD_off( ); // 残ってたの全部止めます。 PM_VDDLCD_off( ); // 残ってたの全部止めます。
vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
} }

3
trunk/vreg_ctr.h
View File

@ -245,8 +245,7 @@ enum VREG_C
VREG_C_ACC_HOSU_L = 0x4B, VREG_C_ACC_HOSU_L = 0x4B,
VREG_C_ACC_HOSU_M, VREG_C_ACC_HOSU_M,
VREG_C_ACC_HOSU_H, VREG_C_ACC_HOSU_H,
VREG_C_ACC_HOSU_LENGTH = 0x4E, VREG_C_ACC_HOSU_HIST = 0x4F,
VREG_C_ACC_HOSU_HIST,
// VREG_C_AMBIENT_BRIGHTNESS = 0x60, // VREG_C_AMBIENT_BRIGHTNESS = 0x60,

69
trunk/yav_mcu_bsr.pri
View File

@ -23,7 +23,7 @@ SubClock=None
Count=0 Count=0
[Main] [Main]
Geometry=66, 66, 1467, 1110 Geometry=66, 66, 1467, 1110
Window=Normal Window=Max
MDI_MAX=OFF MDI_MAX=OFF
Button=ON Button=ON
Mode=Auto Mode=Auto
@ -80,8 +80,8 @@ Kanji=SJIS
[Source] [Source]
Geometry=135, 77, 904, 1014 Geometry=135, 77, 904, 1014
Window=Normal Window=Normal
DispStart=267 DispStart=31
CaretPos=268,0 CaretPos=87,0
Mode=Normal Mode=Normal
DispFile= DispFile=
Address1= Address1=
@ -139,11 +139,19 @@ SaveRange=Screen
SaveStart= SaveStart=
SaveEnd= SaveEnd=
Accumulative=ON Accumulative=ON
[Source1]
Geometry=0, 0, 904, 1014
Window=Normal
DispStart=320
CaretPos=1,0
Mode=Normal
DispFile=pm.c
Accumulative=ON
[Assemble] [Assemble]
Geometry=605, 2, 600, 400 Geometry=605, 2, 600, 400
Window=Normal Window=Normal
DispStart=15777 DispStart=674
CaretPos=15777,27 CaretPos=674,27
Address1= Address1=
Address2= Address2=
Address3= Address3=
@ -859,22 +867,23 @@ Geometry=1145, 8, 440, 1086
Window=Normal Window=Normal
Boundary=13762700 Boundary=13762700
0=.blset,P,N,A,+,1 0=.blset,P,N,A,+,1
1=.pool,P,N,A,+,1 1=.blset,P,N,A,+,1
2=.hyst_pedometer,.,N,A,+,1 2=.pool,P,N,A,+,1
3=.P5.3,P,S,A,+,1 3=.hyst_pedometer,.,N,A,+,1
4=.PM5.3,P,S,A,+,1 4=.P5.3,P,S,A,+,1
5=.RTCEN,P,S,A,+,1 5=.PM5.3,P,S,A,+,1
6=.tasks_immed,P,N,A,+,1 6=.RTCEN,P,S,A,+,1
7=.system_status,.,N,A,+,1 7=.tasks_immed,P,N,A,+,1
8=.hyst_pedometer,.,N,A,+,1 8=.system_status,.,N,A,+,1
9=.pool,P,N,A,+,1 9=.hyst_pedometer,.,N,A,+,1
10=.last_year,P,N,A,+,1 10=.pool,P,N,A,+,1
11=.last_month,P,N,A,+,1 11=.last_year,P,N,A,+,1
12=.last_day,P,N,A,+,1 12=.last_month,P,N,A,+,1
13=.last_hour,P,N,A,+,1 13=.last_day,P,N,A,+,1
14=.p_record,P,N,A,+,1 14=.last_hour,P,N,A,+,1
15=.vreg_ctr[0x60],P,N,A,+,1 15=.p_record,P,N,A,+,1
Line=16 16=.vreg_ctr[0x60],P,N,A,+,1
Line=17
[Quick Watch] [Quick Watch]
0=last_hour,P,A,1 0=last_hour,P,A,1
1=last_day,P,A,1 1=last_day,P,A,1
@ -904,19 +913,15 @@ Name1=Swb00002
Address1=accero.c#_hosu_increment+0x52 Address1=accero.c#_hosu_increment+0x52
Window1=ASM Window1=ASM
Status1=ON Status1=ON
Name2=Swb00005 Name2=Swb00006
Address2=accero.c#_hosu_read+0xa Address2=pm.c#es_F0132+0x38
Window2=ASM Window2=ASM
Status2=ON Status2=OFF
Name3=Swb00006 Name3=Swb00003
Address3=pm.c#_PM_init+0x38 Address3=pm.c#_PM_BL_set+0x51
Window3=ASM Window3=ASM
Status3=OFF Status3=ON
Name4=Swb00003 Count=4
Address4=pm.c#_PM_BL_set+0x5c
Window4=ASM
Status4=ON
Count=5
[Reset] [Reset]
Debugger=ON Debugger=ON
Symbol=OFF Symbol=OFF