mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
1.08
・アダプタを挿した際に強制的にしばらく充電LEDを点ける パラメータ変更(調整中) 本体電源OFF中の挙動にバグが有った。修正済 ・負論理のビットの命名のせいではまったので修正 ・電源LED赤が点灯しないと言うバグ(評価ルームより) 解消 Ver1.06で不具合が発症している本体を1.07にアップデートすると修正が反映されない という不具合(に違いない。 そう考えるとつじつまが合う 再現がほぼ不可能) 初期化コードを修正。 todo:mcuプロセスによるアップデートがちゃんと動くのを確認する ・充電中はTWLに通知する電池残量を底上げする TWLのNANDファームで不都合があるため とりあえず動作確認した ・本体電源off中のポート設定が不適切なのがあった。 git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@238 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
parent
8f3bc8812d
commit
4b6d574262
1629
trunk/bsr.hex
1629
trunk/bsr.hex
File diff suppressed because it is too large
Load Diff
BIN
trunk/bsr.lmf
BIN
trunk/bsr.lmf
Binary file not shown.
@ -1,20 +1,19 @@
|
||||
|
||||
|
||||
|
||||
78K0R Linker W1.31 Date:15 Sep 2010 Page: 1
|
||||
78K0R Linker W1.31 Date:28 Sep 2010 Page: 1
|
||||
|
||||
Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l
|
||||
mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10
|
||||
\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499E033F240BFAA
|
||||
h -pbsr_k0r.map -nkd -gb0FEFBFFh -bC:\Program Files\NEC Elect
|
||||
ronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rd
|
||||
m.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files\NEC Electro
|
||||
nics 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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.re
|
||||
l renge.rel accero.rel self_flash.rel sw.rel task_debug.rel t
|
||||
ask_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel
|
||||
task_status.rel
|
||||
\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr_k0r.map -nk
|
||||
d -gb0FEFBFFh -bC:\Program Files\NEC Electronics Tools\FSL78K
|
||||
0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -
|
||||
bcl0rmf.lib -iC:\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 led.re
|
||||
l rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.
|
||||
rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_s
|
||||
ys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel
|
||||
Para-file:
|
||||
Out-file: bsr.lmf
|
||||
Map-file: bsr_k0r.map
|
||||
@ -23,9 +22,9 @@ Direc-file:bsr_mcu.dr
|
||||
|
||||
*** Link information ***
|
||||
|
||||
66 output segment(s)
|
||||
3E04H byte(s) real data
|
||||
5416 symbol(s) defined
|
||||
64 output segment(s)
|
||||
3E31H byte(s) real data
|
||||
5407 symbol(s) defined
|
||||
|
||||
|
||||
*** Memory map ***
|
||||
@ -57,8 +56,7 @@ Direc-file:bsr_mcu.dr
|
||||
LDR_CNSL 00002H 00000H CSEG PAGE64KP
|
||||
LDR_CNSL task_status
|
||||
00002H 00000H
|
||||
??NMIROM 00002H 00002H CSEG
|
||||
* gap * 00004H 0000CH
|
||||
* gap * 00002H 0000EH
|
||||
@@VECT10 00010H 00004H CSEG AT
|
||||
@@VECT10 ini_VECT 00010H 00004H
|
||||
* gap * 00014H 00008H
|
||||
@ -99,56 +97,55 @@ Direc-file:bsr_mcu.dr
|
||||
LDR_CODL task_status
|
||||
000C4H 00000H
|
||||
?CSEGSI 000C4H 0000AH CSEG
|
||||
?OCDSTAD 000CEH 0000AH CSEG
|
||||
LDR_CODE 000D8H 008E7H CSEG
|
||||
LDR_CODE loader 000D8H 001E1H
|
||||
LDR_CODE main 002B9H 00046H
|
||||
LDR_CODE WDT 002FFH 00000H
|
||||
LDR_CODE i2c_mcu 002FFH 002F1H
|
||||
LDR_CODE 000CEH 008E0H CSEG
|
||||
LDR_CODE loader 000CEH 001D7H
|
||||
LDR_CODE main 002A5H 00046H
|
||||
LDR_CODE WDT 002EBH 00000H
|
||||
LDR_CODE i2c_mcu 002EBH 002F1H
|
||||
LDR_CODE self_flash
|
||||
005F0H 00349H
|
||||
005DCH 00349H
|
||||
LDR_CODE task_debug
|
||||
00939H 00001H
|
||||
00925H 00001H
|
||||
LDR_CODE task_status
|
||||
0093AH 00085H
|
||||
FSL_CODE 009BFH 00322H CSEG
|
||||
00926H 00088H
|
||||
FSL_CODE 009AEH 00322H CSEG
|
||||
FSL_CODE fsl_block_cmd
|
||||
009BFH 0002BH
|
||||
009AEH 0002BH
|
||||
FSL_CODE fsl_block_check
|
||||
009EAH 00013H
|
||||
009D9H 00013H
|
||||
FSL_CODE fsl_common
|
||||
009FDH 0014FH
|
||||
009ECH 0014FH
|
||||
FSL_CODE fsl_reset
|
||||
00B4CH 00001H
|
||||
00B3BH 00001H
|
||||
FSL_CODE fsl_si_ibf
|
||||
00B4DH 00064H
|
||||
00B3CH 00064H
|
||||
FSL_CODE fsl_phySwap
|
||||
00BB1H 0004DH
|
||||
00BA0H 0004DH
|
||||
FSL_CODE fsl_si_common
|
||||
00BFEH 00061H
|
||||
FSL_CODE fsl_swap 00C5FH 00030H
|
||||
00BEDH 00061H
|
||||
FSL_CODE fsl_swap 00C4EH 00030H
|
||||
FSL_CODE fsl_write
|
||||
00C8FH 00052H
|
||||
@@LCODE 00CE1H 002AFH CSEG
|
||||
@@LCODE @cstart 00CE1H 0006DH
|
||||
@@LCODE @imul 00D4EH 00011H
|
||||
@@LCODE @lumul 00D5FH 0002BH
|
||||
@@LCODE @isdiv 00D8AH 00022H
|
||||
@@LCODE @iudiv 00DACH 0002DH
|
||||
@@LCODE @isrem 00DD9H 00021H
|
||||
@@LCODE @iurem 00DFAH 0002FH
|
||||
@@LCODE @lsdiv 00E29H 00039H
|
||||
@@LCODE @ludiv 00E62H 0003FH
|
||||
@@LCODE @divuw 00EA1H 00034H
|
||||
@@LCODE @ladd 00ED5H 0000FH
|
||||
@@LCODE @llsh 00EE4H 0001BH
|
||||
@@LCODE @lursh 00EFFH 0001FH
|
||||
@@LCODE @iscmp 00F1EH 0000CH
|
||||
@@LCODE @lscmp 00F2AH 00014H
|
||||
@@LCODE @lband 00F3EH 00014H
|
||||
@@LCODE @bcdtob 00F52H 0001AH
|
||||
@@LCODE @bbcd 00F6CH 00024H
|
||||
* gap * 00F90H 00066H
|
||||
00C7EH 00052H
|
||||
@@LCODE 00CD0H 002AFH CSEG
|
||||
@@LCODE @cstart 00CD0H 0006DH
|
||||
@@LCODE @imul 00D3DH 00011H
|
||||
@@LCODE @lumul 00D4EH 0002BH
|
||||
@@LCODE @isdiv 00D79H 00022H
|
||||
@@LCODE @iudiv 00D9BH 0002DH
|
||||
@@LCODE @isrem 00DC8H 00021H
|
||||
@@LCODE @iurem 00DE9H 0002FH
|
||||
@@LCODE @lsdiv 00E18H 00039H
|
||||
@@LCODE @ludiv 00E51H 0003FH
|
||||
@@LCODE @divuw 00E90H 00034H
|
||||
@@LCODE @ladd 00EC4H 0000FH
|
||||
@@LCODE @llsh 00ED3H 0001BH
|
||||
@@LCODE @lursh 00EEEH 0001FH
|
||||
@@LCODE @iscmp 00F0DH 0000CH
|
||||
@@LCODE @lscmp 00F19H 00014H
|
||||
@@LCODE @lband 00F2DH 00014H
|
||||
@@LCODE @bcdtob 00F41H 0001AH
|
||||
@@LCODE @bbcd 00F5BH 00024H
|
||||
* gap * 00F7FH 00077H
|
||||
MGC_LOAD 00FF6H 0000AH CSEG AT
|
||||
MGC_LOAD magic 00FF6H 0000AH
|
||||
|
||||
@ -370,53 +367,53 @@ Direc-file:bsr_mcu.dr
|
||||
@@CNST ini_VECT 023C4H 00000H
|
||||
@@CNST task_status
|
||||
023C4H 00000H
|
||||
ROM_CODE 023C4H 026E0H CSEG
|
||||
ROM_CODE pm 023C4H 00A5AH
|
||||
ROM_CODE i2c_ctr 02E1EH 00060H
|
||||
ROM_CODE i2c_twl 02E7EH 0005EH
|
||||
ROM_CODE led 02EDCH 00512H
|
||||
ROM_CODE rtc 033EEH 000E0H
|
||||
ROM_CODE vreg_ctr 034CEH 0047CH
|
||||
ROM_CODE vreg_twl 0394AH 00122H
|
||||
ROM_CODE 023C4H 02720H CSEG
|
||||
ROM_CODE pm 023C4H 00A5BH
|
||||
ROM_CODE i2c_ctr 02E1FH 00060H
|
||||
ROM_CODE i2c_twl 02E7FH 0005EH
|
||||
ROM_CODE led 02EDDH 0051AH
|
||||
ROM_CODE rtc 033F7H 000E0H
|
||||
ROM_CODE vreg_ctr 034D7H 0047CH
|
||||
ROM_CODE vreg_twl 03953H 00119H
|
||||
ROM_CODE adc 03A6CH 002BFH
|
||||
ROM_CODE renge 03D2BH 00187H
|
||||
ROM_CODE accero 03EB2H 0013DH
|
||||
ROM_CODE sw 03FEFH 00113H
|
||||
ROM_CODE task_misc
|
||||
04102H 00196H
|
||||
ROM_CODE task_sys 04298H 0030EH
|
||||
04102H 00190H
|
||||
ROM_CODE task_sys 04292H 00354H
|
||||
ROM_CODE pedo_alg_thre_det2
|
||||
045A6H 004FEH
|
||||
@@BASE 04AA4H 00502H CSEG BASE
|
||||
@@BASE loader 04AA4H 00000H
|
||||
@@BASE pm 04AA4H 0003FH
|
||||
@@BASE i2c_ctr 04AE3H 00198H
|
||||
@@BASE main 04C7BH 00000H
|
||||
@@BASE magic 04C7BH 00000H
|
||||
@@BASE WDT 04C7BH 00000H
|
||||
@@BASE i2c_mcu 04C7BH 000D9H
|
||||
@@BASE i2c_twl 04D54H 000CBH
|
||||
@@BASE led 04E1FH 00000H
|
||||
@@BASE rtc 04E1FH 00052H
|
||||
@@BASE vreg_ctr 04E71H 00000H
|
||||
@@BASE vreg_twl 04E71H 00000H
|
||||
@@BASE adc 04E71H 000B3H
|
||||
@@BASE renge 04F24H 00000H
|
||||
@@BASE accero 04F24H 0004AH
|
||||
045E6H 004FEH
|
||||
@@BASE 04AE4H 00502H CSEG BASE
|
||||
@@BASE loader 04AE4H 00000H
|
||||
@@BASE pm 04AE4H 0003FH
|
||||
@@BASE i2c_ctr 04B23H 00198H
|
||||
@@BASE main 04CBBH 00000H
|
||||
@@BASE magic 04CBBH 00000H
|
||||
@@BASE WDT 04CBBH 00000H
|
||||
@@BASE i2c_mcu 04CBBH 000D9H
|
||||
@@BASE i2c_twl 04D94H 000CBH
|
||||
@@BASE led 04E5FH 00000H
|
||||
@@BASE rtc 04E5FH 00052H
|
||||
@@BASE vreg_ctr 04EB1H 00000H
|
||||
@@BASE vreg_twl 04EB1H 00000H
|
||||
@@BASE adc 04EB1H 000B3H
|
||||
@@BASE renge 04F64H 00000H
|
||||
@@BASE accero 04F64H 0004AH
|
||||
@@BASE self_flash
|
||||
04F6EH 00000H
|
||||
@@BASE sw 04F6EH 00000H
|
||||
04FAEH 00000H
|
||||
@@BASE sw 04FAEH 00000H
|
||||
@@BASE task_debug
|
||||
04F6EH 00000H
|
||||
04FAEH 00000H
|
||||
@@BASE task_misc
|
||||
04F6EH 00000H
|
||||
@@BASE task_sys 04F6EH 00000H
|
||||
04FAEH 00000H
|
||||
@@BASE task_sys 04FAEH 00000H
|
||||
@@BASE pedo_alg_thre_det2
|
||||
04F6EH 00000H
|
||||
@@BASE ini_VECT 04F6EH 00038H
|
||||
04FAEH 00000H
|
||||
@@BASE ini_VECT 04FAEH 00038H
|
||||
@@BASE task_status
|
||||
04FA6H 00000H
|
||||
* gap * 04FA6H 00050H
|
||||
04FE6H 00000H
|
||||
* gap * 04FE6H 00010H
|
||||
MGC_TAIL 04FF6H 0000AH CSEG AT
|
||||
MGC_TAIL magic 04FF6H 0000AH
|
||||
|
||||
@ -620,33 +617,33 @@ Direc-file:bsr_mcu.dr
|
||||
@@BITS FFE20H 00004H BSEG
|
||||
@@BITS @cstart FFE20H.0 00000H.0
|
||||
@@BITS loader FFE20H.0 00000H.0
|
||||
@@BITS pm FFE20H.0 00000H.5
|
||||
@@BITS i2c_ctr FFE20H.5 00000H.0
|
||||
@@BITS main FFE20H.5 00000H.0
|
||||
@@BITS magic FFE20H.5 00000H.0
|
||||
@@BITS WDT FFE20H.5 00000H.0
|
||||
@@BITS i2c_mcu FFE20H.5 00000H.3
|
||||
@@BITS i2c_twl FFE21H.0 00000H.0
|
||||
@@BITS led FFE21H.0 00000H.5
|
||||
@@BITS rtc FFE21H.5 00000H.3
|
||||
@@BITS vreg_ctr FFE22H.0 00000H.1
|
||||
@@BITS vreg_twl FFE22H.1 00000H.0
|
||||
@@BITS adc FFE22H.1 00000H.4
|
||||
@@BITS renge FFE22H.5 00000H.2
|
||||
@@BITS accero FFE22H.7 00000H.0
|
||||
@@BITS pm FFE20H.0 00000H.6
|
||||
@@BITS i2c_ctr FFE20H.6 00000H.0
|
||||
@@BITS main FFE20H.6 00000H.0
|
||||
@@BITS magic FFE20H.6 00000H.0
|
||||
@@BITS WDT FFE20H.6 00000H.0
|
||||
@@BITS i2c_mcu FFE20H.6 00000H.3
|
||||
@@BITS i2c_twl FFE21H.1 00000H.0
|
||||
@@BITS led FFE21H.1 00000H.5
|
||||
@@BITS rtc FFE21H.6 00000H.3
|
||||
@@BITS vreg_ctr FFE22H.1 00000H.1
|
||||
@@BITS vreg_twl FFE22H.2 00000H.0
|
||||
@@BITS adc FFE22H.2 00000H.4
|
||||
@@BITS renge FFE22H.6 00000H.2
|
||||
@@BITS accero FFE23H.0 00000H.0
|
||||
@@BITS self_flash
|
||||
FFE22H.7 00000H.0
|
||||
@@BITS sw FFE22H.7 00000H.2
|
||||
FFE23H.0 00000H.0
|
||||
@@BITS sw FFE23H.0 00000H.2
|
||||
@@BITS task_debug
|
||||
FFE23H.1 00000H.0
|
||||
FFE23H.2 00000H.0
|
||||
@@BITS task_misc
|
||||
FFE23H.1 00000H.3
|
||||
@@BITS task_sys FFE23H.4 00000H.0
|
||||
FFE23H.2 00000H.2
|
||||
@@BITS task_sys FFE23H.4 00000H.1
|
||||
@@BITS pedo_alg_thre_det2
|
||||
FFE23H.4 00000H.1
|
||||
@@BITS ini_VECT FFE23H.5 00000H.0
|
||||
FFE23H.5 00000H.1
|
||||
@@BITS ini_VECT FFE23H.6 00000H.0
|
||||
@@BITS task_status
|
||||
FFE23H.5 00000H.0
|
||||
FFE23H.6 00000H.0
|
||||
* gap * FFE24H 000B0H
|
||||
@@SEGREG FFED4H 00004H DSEG AT
|
||||
@@SEGREG @SEGREG FFED4H 00004H
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
//#define _TAIKENDAI_
|
||||
|
||||
#define MCU_VER_MAJOR 0x01
|
||||
#define MCU_VER_MINOR 0x07
|
||||
#define MCU_VER_MINOR 0x08
|
||||
|
||||
|
||||
//#define _MODEL_TEG2_
|
||||
|
||||
BIN
trunk/hoge.bin
BIN
trunk/hoge.bin
Binary file not shown.
@ -139,6 +139,7 @@ void LED_init( )
|
||||
7 電源 H
|
||||
*/
|
||||
INFO_LED_IS_FULLCOLOR_PU = 1; // お知らせLEDを識別 先に上げておく
|
||||
INFO_LED_IS_FULLCOLOR_PM = 1;
|
||||
|
||||
TAU0EN = 1;
|
||||
TPS0 = BIT_PRS012 | BIT_PRS002; // マスタークロックはCK01,8M/2 /2^4 = 250kHz
|
||||
@ -177,7 +178,8 @@ void LED_init( )
|
||||
system_status.info_fullcolor = 0;
|
||||
}
|
||||
}
|
||||
INFO_LED_IS_FULLCOLOR_PU = 0;
|
||||
INFO_LED_IS_FULLCOLOR_n = 0;
|
||||
INFO_LED_IS_FULLCOLOR_PM = 0;
|
||||
|
||||
LED_duty_notify_red = 0;
|
||||
LED_duty_notify_blu = 0;
|
||||
|
||||
@ -76,17 +76,10 @@ void main( )
|
||||
if( !RTCEN ) // これは書き替えたときにしか使えない
|
||||
{
|
||||
// 通常の電源投入
|
||||
u8 pwup_delay0 = 0;
|
||||
u8 pwup_delay1 = 0;
|
||||
|
||||
u16 pwup_delay0 = 0;
|
||||
do
|
||||
{ // 電池接続時、16ms待ってみる(チャタリング対策)
|
||||
pwup_delay0 += 1;
|
||||
do
|
||||
{
|
||||
pwup_delay1 += 1;
|
||||
}
|
||||
while( pwup_delay1 != 0 ); // u16にするとコンパイラが怒るんだが…。
|
||||
{ // 電池接続時、ちょっと待ってみる(チャタリング対策)
|
||||
pwup_delay0++;
|
||||
}
|
||||
while( pwup_delay0 != 0 );
|
||||
}
|
||||
@ -145,9 +138,10 @@ void main( )
|
||||
vreg_ctr[ VREG_C_MCU_STATUS ] |= ( 1 << 2 );
|
||||
}
|
||||
*/
|
||||
hdwinit2( );
|
||||
}
|
||||
|
||||
hdwinit2( );
|
||||
|
||||
// 通常運転
|
||||
main_loop( );
|
||||
}
|
||||
|
||||
29
trunk/pm.c
29
trunk/pm.c
@ -28,6 +28,7 @@ bit bt_chg_ready; //
|
||||
u8 chg_led_override; // アダプタ差したとき、充電するしないに関わらずしばらく点灯させる
|
||||
|
||||
u8 ntr_pm_bt_low_old;
|
||||
bit BT_CHG_STAT_Change;
|
||||
|
||||
|
||||
// ========================================================
|
||||
@ -187,9 +188,10 @@ void pm_chk_adapter()
|
||||
pm_extdc_old = temp_pm_extdc;
|
||||
if( temp_pm_extdc )
|
||||
{
|
||||
// 刺さった
|
||||
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
|
||||
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT );
|
||||
chg_led_override = (u8)( 1000 / INTERVAL_TSK_BATT / SYS_INTERVAL_TICK );
|
||||
chg_led_override = (u8)( 3000 / INTERVAL_TSK_BATT );
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -611,7 +613,7 @@ void BT_get_left(){
|
||||
}
|
||||
|
||||
// 充電許可(=アダプタも刺さってる)のに充電してない = 充電完了
|
||||
if( BT_CHG_Ena && !BT_IN_CHG_n ){
|
||||
if( !BT_CHG_Ena_n && BT_IN_CHG_n ){
|
||||
vreg_ctr[ VREG_C_BT_REMAIN ] = 100;
|
||||
vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0;
|
||||
}
|
||||
@ -619,7 +621,7 @@ void BT_get_left(){
|
||||
{ // 少ない方にキャップ
|
||||
if( temp_force_fule_left > temp_fuel[0] )
|
||||
{
|
||||
vreg_ctr[ VREG_C_BT_REMAIN ] = temp_fuel[0];
|
||||
vreg_ctr[ VREG_C_BT_REMAIN ] = temp_fuel[0];
|
||||
vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp_fuel[1];
|
||||
}
|
||||
else
|
||||
@ -642,15 +644,18 @@ void BT_get_left(){
|
||||
}
|
||||
|
||||
// twlに教えてあげる(先にやらないと割り込みのタイミングがまずいかもしれない)
|
||||
if( bt_remain_old_ctr != vreg_ctr[ VREG_C_BT_REMAIN ] )
|
||||
if(( bt_remain_old_ctr != vreg_ctr[ VREG_C_BT_REMAIN ] ) ||
|
||||
BT_CHG_STAT_Change )
|
||||
{
|
||||
BT_CHG_STAT_Change = false;
|
||||
if( vreg_ctr[ VREG_C_BT_REMAIN ] > 80 ){
|
||||
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0F;
|
||||
}else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 50 ){
|
||||
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0B;
|
||||
}else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_LO ){
|
||||
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x07;
|
||||
}else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY ){
|
||||
}else if(( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY )||
|
||||
!BT_CHG_Ena_n ){ // アダプタの有無で底上げ
|
||||
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x03;
|
||||
}else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 0 ){
|
||||
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x01;
|
||||
@ -853,13 +858,11 @@ err PM_BL_set( u8 dat )
|
||||
液晶の対向電圧の設定を行います。
|
||||
仮想レジスタの内容を送るだけ
|
||||
======================================================== */
|
||||
err PM_LCD_vcom_set( )
|
||||
void PM_LCD_vcom_set( )
|
||||
{
|
||||
u8 rv;
|
||||
|
||||
rv = iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC1, vreg_ctr[VREG_C_VCOM_T] ); // がっかりなことに、PMICはバースト書き込み不可
|
||||
rv |= iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC2, vreg_ctr[VREG_C_VCOM_B] );
|
||||
return ( rv );
|
||||
iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC1, vreg_ctr[VREG_C_VCOM_T] ); // がっかりなことに、PMICはバースト書き込み不可
|
||||
iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC2, vreg_ctr[VREG_C_VCOM_B] );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -929,7 +932,7 @@ err PM_sys_pow_on( )
|
||||
/* ========================================================
|
||||
電源OFFシーケンス
|
||||
======================================================== */
|
||||
err PM_sys_pow_off( )
|
||||
void PM_sys_pow_off( )
|
||||
{
|
||||
// if( RESET1_n )
|
||||
if( PM_chk_LDSW() )
|
||||
@ -948,7 +951,7 @@ err PM_sys_pow_off( )
|
||||
PM_off( );
|
||||
PM_LDSW_off( );
|
||||
|
||||
return ( ERR_SUCCESS );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
12
trunk/pm.h
12
trunk/pm.h
@ -135,9 +135,9 @@ extern bit bt_force_update;
|
||||
|
||||
//=========================================================
|
||||
err PM_sys_pow_on( );
|
||||
err PM_sys_pow_off( );
|
||||
err PM_bt_auth( );
|
||||
err PM_LCD_vcom_set( );
|
||||
void PM_sys_pow_off( );
|
||||
//err PM_bt_auth( );
|
||||
void PM_LCD_vcom_set( );
|
||||
|
||||
err PM_LCD_on( );
|
||||
void PM_LCD_off( );
|
||||
@ -180,15 +180,9 @@ task_status_immed tski_PM_BL_set();
|
||||
#define PM_VDD_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_SYS, 0 ))
|
||||
#define PM_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_SYS, 0 ))
|
||||
|
||||
#ifdef _MODEL_CTR_
|
||||
#define PM_VDD_normMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_1R15 | PM_REG_BIT_VDD_PWM ))
|
||||
#define PM_VDD_ecoMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_0R90 | PM_REG_BIT_VDD_AUTO ))
|
||||
|
||||
#else
|
||||
#define PM_VDD_ecoMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_1R05 | PM_REG_BIT_VDD_AUTO ))
|
||||
#define PM_VDD_normMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_1R05 | PM_REG_BIT_VDD_PWM ))
|
||||
#endif
|
||||
|
||||
// ‚Ù‚© //
|
||||
#define PM_reset_neg() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW | PM_REG_BIT_nRST1 )))
|
||||
#define PM_reset_ast() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW )))
|
||||
|
||||
@ -545,6 +545,7 @@ task_status_immed tski_mcu_reset()
|
||||
|
||||
|
||||
#ifdef _DBG_LED_PRINT_
|
||||
// P1.5 = led_pow_red_old
|
||||
void alert( u8 num )
|
||||
{
|
||||
u8 i;
|
||||
|
||||
@ -47,7 +47,6 @@
|
||||
|
||||
// ========================================================
|
||||
bit twl_ver_read;
|
||||
bit twl_ntr_mode;
|
||||
bit going_to_sleep;
|
||||
|
||||
// ========================================================
|
||||
@ -194,19 +193,17 @@ task_status_immed do_command0( )
|
||||
else if( temp_command & REG_BIT_RESET2_REQ )
|
||||
{
|
||||
RESET2_ast;
|
||||
if( twl_ntr_mode )
|
||||
if( vreg_twl[ REG_TWL_INT_ADRS_MODE ] == 0 )
|
||||
{
|
||||
FCRAM_RST_ast;
|
||||
FCRAM_RST_ast; // twlはntrモードで動作してる
|
||||
}
|
||||
vreg_twl[ REG_TWL_INT_ADRS_MODE ] &= ~0x03;
|
||||
vreg_twl[ REG_TWL_INT_ADRS_MODE ] = 0;
|
||||
}
|
||||
wait_ms( 5 );
|
||||
FCRAM_RST_neg;
|
||||
PM_reset_neg();
|
||||
RESET2_neg;
|
||||
|
||||
twl_ntr_mode = false;
|
||||
|
||||
// CODEC •s’背ƒWƒXƒ^<5E>‰Šú‰»
|
||||
codec_reg_init();
|
||||
}
|
||||
@ -218,6 +215,7 @@ task_status_immed do_command0( )
|
||||
return ( ERR_CONTINUE );
|
||||
}
|
||||
*/
|
||||
// SVA1 = IIC_C_SLAVEADDRESS; todo
|
||||
return ( ERR_FINISED );
|
||||
}
|
||||
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
#define INTERVAL_TSK_STATUS 4
|
||||
|
||||
|
||||
extern bit BT_CHG_STAT_Change;
|
||||
|
||||
|
||||
/* ========================================================
|
||||
ステータスレジスタなど
|
||||
@ -55,6 +57,7 @@ void tsk_status( )
|
||||
{
|
||||
if( diff & REG_BIT_BATT_CHARGE )
|
||||
{
|
||||
BT_CHG_STAT_Change = true;
|
||||
// 充電状態に以下略
|
||||
if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE )
|
||||
{
|
||||
|
||||
@ -32,7 +32,7 @@ extern bit going_to_sleep;
|
||||
extern bit bt_chg_ready;
|
||||
|
||||
static u8 timeout_sleep;
|
||||
|
||||
extern u8 chg_led_override;
|
||||
|
||||
|
||||
/* ========================================================
|
||||
@ -109,7 +109,8 @@ void tsk_sys( )
|
||||
// 残量チェック
|
||||
BT_get_left(); // 先に、BT_chk()が実行されている必要があります。
|
||||
if(
|
||||
// ( vreg_ctr[VREG_C_BT_REMAIN] < 1 ) &&
|
||||
// ( vreg_ctr[VREG_C_BT_REMAIN] < 1 ) // こっちで判定すると電池がほとんど無いときに
|
||||
// && // アダプタ差しても数分起動できなくなっちゃう
|
||||
( vreg_ctr[VREG_C_BT_VOLTAGE] < ( V_TH_ZERO / 256 ) )
|
||||
)
|
||||
{
|
||||
@ -119,6 +120,14 @@ void tsk_sys( )
|
||||
return;
|
||||
}
|
||||
|
||||
// ポートの設定 電源入れる前に。
|
||||
PM7.4 = 1; // SW_wifi
|
||||
PM20.4 = 1; // sw_home
|
||||
PM20.3 = 1; // wl_tx
|
||||
PM2.3 = 1; // key_sel
|
||||
PM2.5 = 1; // acc_valid1
|
||||
PM14.1 = 1; // acc_valid2
|
||||
|
||||
if( PM_sys_pow_on( ) != ERR_SUCCESS )
|
||||
{ // 電源起動不可エラー
|
||||
renge_task_interval_run_force = true;
|
||||
@ -126,6 +135,12 @@ void tsk_sys( )
|
||||
return;
|
||||
}
|
||||
|
||||
// ここまで来ると、電源投入確定 //
|
||||
|
||||
PU5.1 = 1; // 1:PM_CHARGE
|
||||
PU7 = 0b00011101; // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n
|
||||
PU20.4 = 1; // SW_HOME
|
||||
|
||||
if( system_status.poweron_reason == PWSW )
|
||||
{
|
||||
// 電源ボタンでのonの時は、LEDを点灯させる
|
||||
@ -138,17 +153,12 @@ void tsk_sys( )
|
||||
}
|
||||
|
||||
system_status.pwr_state = ON_TRIG;
|
||||
// ここまで来ると、電源投入確定 //
|
||||
|
||||
PM_LCD_vcom_set( ); // LCDの対向電圧値など書き込み
|
||||
|
||||
break;
|
||||
|
||||
case ON_TRIG: //-------------------------------------------------------
|
||||
PU5 = 0b00000010; // 1:PM_CHARGE
|
||||
PU7 = 0b00011101; // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n
|
||||
PU20 = 0b00010000; // SW_HOME
|
||||
|
||||
IIC_ctr_Init( );
|
||||
IIC_twl_Init( );
|
||||
RTC_32k_on( );
|
||||
@ -262,6 +272,7 @@ void tsk_sys( )
|
||||
break;
|
||||
|
||||
case OFF_TRIG: //---------------------------------------
|
||||
default:
|
||||
// LED消灯を待つ
|
||||
vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF;
|
||||
vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF;
|
||||
@ -303,7 +314,7 @@ void tsk_sys( )
|
||||
|
||||
// PU5 そのまま
|
||||
PU7 = 0b00001001; // PWSWI,PM_EXTTDC,( IRQ0_deactive(), PM_IRQ_deactive )
|
||||
PU20 = 0x00; // SW_HOME 停止
|
||||
PU20.4 = 0; // SW_HOME 停止
|
||||
|
||||
IF0 = 0;
|
||||
IF1 = 0;
|
||||
@ -313,6 +324,22 @@ void tsk_sys( )
|
||||
|
||||
PM_sys_pow_off( );
|
||||
|
||||
P7.4 = 0; // SW_wifi
|
||||
PM7.4 = 0;
|
||||
|
||||
P20.4 = 0; // sw_home
|
||||
PM20.4 = 0;
|
||||
|
||||
P20.3 = 0; // WL_TX
|
||||
PM20.3 = 0;
|
||||
|
||||
P2.3 = 0; // KEY_SEL
|
||||
PM2.3 = 0;
|
||||
P2.5 = 0; // ACC_ready1
|
||||
PM2.5 = 0;
|
||||
P14.1 = 0; // ACC_ready2
|
||||
PM14.1 = 0;
|
||||
|
||||
iic_mcu_stop( );
|
||||
|
||||
timeout = 0;
|
||||
@ -351,6 +378,15 @@ void tsk_sys( )
|
||||
}
|
||||
else
|
||||
{
|
||||
static bit chg_ena_orig;
|
||||
|
||||
if( chg_led_override != 0 ) // これがゼロになるまで待つ
|
||||
{
|
||||
return;
|
||||
};
|
||||
|
||||
chg_ena_orig = BT_CHG_Ena_n;
|
||||
|
||||
// 省電力へ移行
|
||||
system_status.poweron_reason = NONE;
|
||||
|
||||
@ -369,13 +405,17 @@ void tsk_sys( )
|
||||
CKC = 0b00001001;
|
||||
OSMC = 0x00;
|
||||
# endif
|
||||
BT_CHG_ENABLE(); // リークを減らすため
|
||||
STOP( );
|
||||
|
||||
// 起きる //
|
||||
// 起きる条件は
|
||||
// ・KeyReturn割り込み(電源ボたん)
|
||||
// ・RTCアラーム
|
||||
// ・アダプタ挿抜
|
||||
|
||||
// BT_CHG_Ena_n = chg_ena_orig; // todo rom足りない!
|
||||
|
||||
if( PM_EXTDC_n )
|
||||
{
|
||||
// 一度起こしてしまう。ペリフェラルの初期化など流用のため。
|
||||
@ -394,12 +434,10 @@ void tsk_sys( )
|
||||
}
|
||||
return;
|
||||
|
||||
#if 0
|
||||
default:
|
||||
while( 1 )
|
||||
{
|
||||
NOP( );
|
||||
// あり得ないステート
|
||||
}
|
||||
NOP( ); // あり得ないステート
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -125,7 +125,7 @@
|
||||
// 負論理です。注意。
|
||||
#define BT_CHG_ENABLE() ( P4.3 = 0 )
|
||||
#define BT_CHG_DISABLE() ( P4.3 = 1 )
|
||||
#define BT_CHG_Ena P4.3
|
||||
#define BT_CHG_Ena_n P4.3
|
||||
|
||||
// 充電中(in)
|
||||
#define BT_IN_CHG_n P5.1
|
||||
|
||||
@ -125,6 +125,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
|
||||
case ( VREG_C_COMMAND0 ):
|
||||
if( data != 0 )
|
||||
{
|
||||
// SVA1 = 0x5A; // 通信受け付けない todo
|
||||
renge_task_immed_add( do_command0 );
|
||||
}
|
||||
vreg_ctr[ VREG_C_COMMAND0 ] |= data;
|
||||
|
||||
@ -20,8 +20,6 @@ u8 vreg_twl[_REG_TWL_INT_ADRS_ENDMARK];
|
||||
|
||||
extern bit twl_ver_read;
|
||||
extern bit cam_led_update;
|
||||
extern bit twl_ntr_mode;
|
||||
|
||||
|
||||
extern bit vol_changed_by_twl;
|
||||
|
||||
@ -54,10 +52,6 @@ void vreg_twl_write( u8 adrs, u8 data )
|
||||
}
|
||||
|
||||
case ( REG_TWL_INT_ADRS_MODE ):
|
||||
if(( data & 0x03 ) == 0 )
|
||||
{
|
||||
twl_ntr_mode = true;
|
||||
}
|
||||
vreg_twl[ REG_TWL_INT_ADRS_MODE ] = ( data & 0x83 ); // [8]vol32 [1:0]nand
|
||||
break;
|
||||
|
||||
|
||||
@ -1,9 +1,39 @@
|
||||
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 -qvjl2w -sainter_asm -zpb -no pm.c
|
||||
pm.c(138) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(185) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(256) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
|
||||
pm.c(477) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(577) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(578) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(698) : CC78K0R warning W0511: Different argument types in function 'iic_mcu_write_a_byte_codec'
|
||||
pm.c(730) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(759) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(836) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(844) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(990) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
|
||||
pm.c(1057) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(1060) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(1156) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
pm.c(1160) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
|
||||
batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(100) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(101) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(102) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
batt_params.h(103) : CC78K0R warning W0401: Conversion may lose significant digits
|
||||
Compilation complete, 0 error(s) and 26 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\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 -qvjl2w -sainter_asm -zpb -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
|
||||
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 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb0FEFBFFh -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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel
|
||||
"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" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb0FEFBFFh -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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.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.
|
||||
@ -13,4 +43,4 @@ intel-HEX to bsr bin converter
|
||||
file converted!
|
||||
|
||||
|
||||
Build Total error(s) : 0 Total warning(s) : 0
|
||||
Build Total error(s) : 0 Total warning(s) : 26
|
||||
|
||||
@ -78,10 +78,10 @@ Symbol Type=OFF
|
||||
Language=C
|
||||
Kanji=SJIS
|
||||
[Source]
|
||||
Geometry=151, 98, 1021, 817
|
||||
Geometry=509, 120, 1021, 817
|
||||
Window=Normal
|
||||
DispStart=16
|
||||
CaretPos=69,0
|
||||
DispStart=418
|
||||
CaretPos=419,0
|
||||
Mode=Normal
|
||||
DispFile=
|
||||
Address1=
|
||||
@ -139,19 +139,11 @@ SaveRange=Screen
|
||||
SaveStart=
|
||||
SaveEnd=
|
||||
Accumulative=ON
|
||||
[Source1]
|
||||
Geometry=25, 25, 1021, 817
|
||||
Window=Normal
|
||||
DispStart=136
|
||||
CaretPos=46,31
|
||||
Mode=Normal
|
||||
DispFile=led.c
|
||||
Accumulative=ON
|
||||
[Assemble]
|
||||
Geometry=124, 418, 968, 626
|
||||
Window=Normal
|
||||
DispStart=764
|
||||
CaretPos=764,27
|
||||
DispStart=17732
|
||||
CaretPos=17732,27
|
||||
Address1=
|
||||
Address2=
|
||||
Address3=
|
||||
@ -193,18 +185,18 @@ SaveRange=Screen
|
||||
SaveStart=
|
||||
SaveEnd=
|
||||
[Memory]
|
||||
Geometry=224, 254, 968, 626
|
||||
Window=Hide
|
||||
Boundary=0
|
||||
Geometry=224, 254, 968, 816
|
||||
Window=Normal
|
||||
Boundary=163
|
||||
Format=Hex
|
||||
Mode=Byte
|
||||
Endian=
|
||||
Endian=Little
|
||||
Ascii=OFF
|
||||
Idtag=OFF
|
||||
Address=
|
||||
DispStart=FFFFFFFF
|
||||
CaretPosData=0, 0
|
||||
CaretPosAscii=0, 0
|
||||
DispStart=000FFC80
|
||||
CaretPosData=36, 65512
|
||||
CaretPosAscii=53248, 256
|
||||
Address1=
|
||||
Address2=
|
||||
Address3=
|
||||
@ -221,8 +213,8 @@ Address13=
|
||||
Address14=
|
||||
Address15=
|
||||
Address16=
|
||||
Data1=
|
||||
Data2=
|
||||
Data1=c8
|
||||
Data2=c6
|
||||
Data3=
|
||||
Data4=
|
||||
Data5=
|
||||
@ -239,7 +231,7 @@ Data15=
|
||||
Data16=
|
||||
Binary=ON
|
||||
Scan=OFF
|
||||
Direction=DOWN
|
||||
Direction=UP
|
||||
FindStart=
|
||||
FindEnd=
|
||||
Unit=Byte
|
||||
@ -902,7 +894,17 @@ Manager=ON
|
||||
Sort by=Unsort
|
||||
Detail=OFF
|
||||
Last Name=
|
||||
Count=0
|
||||
Name0=chg_l001
|
||||
Status0=W
|
||||
Access Size0=B
|
||||
Address Range0=EQ
|
||||
Address0=<chg_led_override> - <>
|
||||
Mask Address0=00000000
|
||||
Data Range0=NC
|
||||
Data0=<00000000> - <00000000>
|
||||
Mask Data0=FFFFFFFF
|
||||
Pass0=0001
|
||||
Count=1
|
||||
[Event Link]
|
||||
Geometry=0, 0, 0, 0
|
||||
Window=Hide
|
||||
@ -918,7 +920,10 @@ Manager=ON
|
||||
Sort by=Unsort
|
||||
Detail=OFF
|
||||
Last Name=
|
||||
Count=0
|
||||
Name0=chg_l002
|
||||
Element0=chg_l001
|
||||
Set0=ON
|
||||
Count=1
|
||||
[Trace]
|
||||
Geometry=0, 0, 0, 0
|
||||
Window=Hide
|
||||
@ -968,54 +973,56 @@ Count=0
|
||||
Geometry=1075, 10, 441, 702
|
||||
Window=Normal
|
||||
Boundary=18088086
|
||||
0=.infos,P,N,A,+,1
|
||||
1=.bt_remain_old_ctr,P,N,A,+,1
|
||||
2=.bt_remain_old_ntr,P,N,A,+,1
|
||||
3=.bt_remain_old_ntr,P,N,A,+,1
|
||||
4=.vreg_ctr,P,N,A,+,1
|
||||
5=.info_led_override,P,N,A,+,1
|
||||
6=.TDR07,P,S,A,+,1
|
||||
7=.PM4.2,P,S,A,+,1
|
||||
8=.P4.2,P,S,A,+,1
|
||||
9=.PM1.5,P,S,A,+,1
|
||||
10=.P1.5,P,S,A,+,1
|
||||
11=.SW_pow_count,P,N,A,+,1
|
||||
12=.battery_manufacturer,P,N,A,+,1
|
||||
13=.system_status,.,N,A,+,1
|
||||
14=.info_LED,.,N,A,+,1
|
||||
15=.time_to_next_frame,P,N,A,+,1
|
||||
Line=16
|
||||
0=.chg_led_override,P,N,A,+,1
|
||||
1=.vreg_twl,P,N,A,+,1
|
||||
2=.infos,P,N,A,+,1
|
||||
3=.bt_remain_old_ctr,P,N,A,+,1
|
||||
4=.bt_remain_old_ntr,P,N,A,+,1
|
||||
5=.bt_remain_old_ntr,P,N,A,+,1
|
||||
6=.vreg_ctr,P,N,A,+,1
|
||||
7=.info_led_override,P,N,A,+,1
|
||||
8=.TDR07,P,S,A,+,1
|
||||
9=.PM4.2,P,S,A,+,1
|
||||
10=.P4.2,P,S,A,+,1
|
||||
11=.PM1.5,P,S,A,+,1
|
||||
12=.P1.5,P,S,A,+,1
|
||||
13=.SW_pow_count,P,N,A,+,1
|
||||
14=.battery_manufacturer,P,N,A,+,1
|
||||
15=.system_status,.,N,A,+,1
|
||||
16=.info_LED,.,N,A,+,1
|
||||
17=.time_to_next_frame,P,N,A,+,1
|
||||
Line=18
|
||||
[Quick Watch]
|
||||
0=pm_extdc_old,P,A,1
|
||||
1=time_to_next_frame,P,A,1
|
||||
2=system_status,P,A,1
|
||||
3=vreg_ctr,P,A,1
|
||||
4=P4.2,P,A,1
|
||||
5=PM4.2,P,A,1
|
||||
6=TDR07,P,A,1
|
||||
7=info_led_override,P,A,1
|
||||
8=P1.5,P,A,1
|
||||
9=PM1.6,P,A,1
|
||||
10=PM1.5,P,A,1
|
||||
11=SW_pow_count,P,A,1
|
||||
12=bt_remain_old_ntr,P,A,1
|
||||
13=bt_remain_old_ctr,P,A,1
|
||||
14=infos,P,A,1
|
||||
15=battery_manufacturer,P,A,1
|
||||
0=system_status,P,A,1
|
||||
1=vreg_ctr,P,A,1
|
||||
2=P4.2,P,A,1
|
||||
3=PM4.2,P,A,1
|
||||
4=TDR07,P,A,1
|
||||
5=info_led_override,P,A,1
|
||||
6=P1.5,P,A,1
|
||||
7=PM1.6,P,A,1
|
||||
8=PM1.5,P,A,1
|
||||
9=SW_pow_count,P,A,1
|
||||
10=bt_remain_old_ntr,P,A,1
|
||||
11=bt_remain_old_ctr,P,A,1
|
||||
12=infos,P,A,1
|
||||
13=battery_manufacturer,P,A,1
|
||||
14=vreg_twl,P,A,1
|
||||
15=chg_led_override,P,A,1
|
||||
[Software Break]
|
||||
Geometry=709, 826, 445, 260
|
||||
Window=Normal
|
||||
Width=150 30 200 100
|
||||
Name0=Swb00001
|
||||
Address0=task_misc.c#_tski_mcu_info_read+0x87
|
||||
Name0=Swb00002
|
||||
Address0=pm.c#_tsk_batt+0x9b
|
||||
Window0=ASM
|
||||
Status0=ON
|
||||
Name1=Swb00002
|
||||
Address1=led.c#_LED_init+0x1
|
||||
Name1=Swb00001
|
||||
Address1=pm.c#_pm_chk_adapter+0x24
|
||||
Window1=ASM
|
||||
Status1=ON
|
||||
Name2=Swb00003
|
||||
Address2=led.c#_LED_init+0x54
|
||||
Address2=task_sys.c#_tsk_sys+0x275
|
||||
Window2=ASM
|
||||
Status2=ON
|
||||
Count=3
|
||||
|
||||
@ -838,7 +838,7 @@ G=1
|
||||
E=0
|
||||
E0=flash.elk
|
||||
E1=a.elk
|
||||
GO=1
|
||||
GO=0
|
||||
GOValue=85
|
||||
GOStart=FC00
|
||||
GOSizeValue=1024
|
||||
|
||||
@ -4,15 +4,19 @@ FrameX=21
|
||||
FrameY=37
|
||||
FrameCX=1299
|
||||
FrameCY=1044
|
||||
OpenFile1=ProjectWindow
|
||||
OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0
|
||||
OpenFile2=renge\renge.c,0,348,332,1592,1058,15,24,22,0
|
||||
OpenFile3=i2c_mcu.c,0,330,330,1574,1056,24,552,28,0
|
||||
OpenFile4=batt_params.h,0,352,352,1596,1078,0,97,0,0
|
||||
OpenFile5=config.h,0,220,220,1464,946,0,23,0,0
|
||||
OpenFile6=loader.c,0,242,242,1486,968,0,82,51,0
|
||||
OpenFile7=task_misc.c,0,198,198,1442,924,0,198,0,0
|
||||
OpenFile8=ProjectWindow
|
||||
PrjPos=0,2,754,3,253
|
||||
OpenFile2=jhl_defs.h,0,286,286,1530,1012,0,15,26,0
|
||||
OpenFile3=renge\renge.c,0,348,332,1592,1058,15,24,22,0
|
||||
OpenFile4=i2c_mcu.c,0,330,330,1574,1056,24,552,28,0
|
||||
OpenFile5=batt_params.h,0,352,352,1596,1078,0,97,0,0
|
||||
OpenFile6=OutputWindow
|
||||
OutputPos=0,491,1000,330,1535
|
||||
OpenFile7=pm.c,0,260,62,1504,788,1,267,0,0
|
||||
OpenFile9=task_sys.c,0,264,264,1508,990,29,389,29,0
|
||||
OpenFile10=pm.c,0,8,340,1252,1066,0,186,0,0
|
||||
OpenFile11=OutputWindow
|
||||
OutputPos=0,143,652,366,1571
|
||||
ActivePRJ=yav_mcu_bsr.prj
|
||||
[ProjectWindow]
|
||||
ProjectWindowDispType=0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[SdbInfo]
|
||||
Ver=5
|
||||
[loader.c]
|
||||
T=4c889612
|
||||
T=4ca06b2d
|
||||
1=incs_loader.h
|
||||
2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
|
||||
3=fsl_user.h
|
||||
@ -12,7 +12,7 @@ T=4c889612
|
||||
8=reboot.h
|
||||
9=magic.h
|
||||
[pm.c]
|
||||
T=4c8edcae
|
||||
T=4ca06df4
|
||||
1=incs.h
|
||||
2=adc.h
|
||||
3=led.h
|
||||
@ -26,7 +26,7 @@ T=4c8ed590
|
||||
1=config.h
|
||||
2=incs.h
|
||||
[main.c]
|
||||
T=4c8ed590
|
||||
T=4c8f1e97
|
||||
1=incs_loader.h
|
||||
2=WDT.h
|
||||
3=rtc.h
|
||||
@ -36,7 +36,7 @@ T=4c8ed590
|
||||
7=adc.h
|
||||
8=pool.h
|
||||
[magic.c]
|
||||
T=4c8edcae
|
||||
T=4ca06b54
|
||||
1=config.h
|
||||
[WDT.c]
|
||||
T=4bf0d1e1
|
||||
@ -52,14 +52,14 @@ T=4c8db696
|
||||
3=i2c_twl_defs.h
|
||||
4=i2c_twl.h
|
||||
[led.c]
|
||||
T=4c8ed590
|
||||
T=4ca06b3d
|
||||
1=incs.h
|
||||
2=led.h
|
||||
[rtc.c]
|
||||
T=4c8ed590
|
||||
1=incs.h
|
||||
[vreg_ctr.c]
|
||||
T=4c8ed590
|
||||
T=4c9c57ee
|
||||
1=incs.h
|
||||
2=vreg_ctr.h
|
||||
3=rtc.h
|
||||
@ -70,14 +70,14 @@ T=4c8ed590
|
||||
8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
|
||||
9=fsl_user.h
|
||||
[vreg_twl.c]
|
||||
T=4c8ed590
|
||||
T=4c9c5c37
|
||||
1=incs.h
|
||||
2=jhl_defs.h
|
||||
3=led.h
|
||||
4=vreg_twl.h
|
||||
5=vreg_ctr.h
|
||||
[adc.c]
|
||||
T=4c8ed8d7
|
||||
T=4c9028d9
|
||||
1=incs.h
|
||||
2=adc.h
|
||||
3=pm.h
|
||||
@ -98,7 +98,7 @@ T=4c525844
|
||||
2=incs.h
|
||||
3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
|
||||
[self_flash.c]
|
||||
T=4c88907a
|
||||
T=4ca06b3f
|
||||
1=incs_loader.h
|
||||
2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
|
||||
3=fsl_user.h
|
||||
@ -122,7 +122,7 @@ T=4c4698f9
|
||||
3=pm.h
|
||||
4=accero.h
|
||||
[task_misc.c]
|
||||
T=4c8ed590
|
||||
T=4c9c5c82
|
||||
1=incs.h
|
||||
2=renge\renge.h
|
||||
3=pm.h
|
||||
@ -131,7 +131,7 @@ T=4c8ed590
|
||||
6=i2c_mcu.h
|
||||
7=led.h
|
||||
[task_sys.c]
|
||||
T=4c8ed590
|
||||
T=4ca058f7
|
||||
1=incs.h
|
||||
2=i2c_twl.h
|
||||
3=i2c_ctr.h
|
||||
@ -143,7 +143,7 @@ T=4c8ed590
|
||||
9=adc.h
|
||||
10=self_flash.h
|
||||
[pedo_alg_thre_det2.c]
|
||||
T=4c8ed590
|
||||
T=4c9031d9
|
||||
1=incs.h
|
||||
2=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
|
||||
3=accero.h
|
||||
@ -154,7 +154,7 @@ T=4c8ed590
|
||||
T=4c8db696
|
||||
1=config.h
|
||||
[task_status.c]
|
||||
T=4c4fe85a
|
||||
T=4ca04f06
|
||||
1=incs_loader.h
|
||||
2=renge\renge.h
|
||||
3=pm.h
|
||||
@ -176,11 +176,11 @@ T=4c889601
|
||||
T=4c8ed032
|
||||
1=config.h
|
||||
[config.h]
|
||||
T=4c8ed8d7
|
||||
T=4c90281e
|
||||
[user_define.h]
|
||||
T=4c84442a
|
||||
T=4ca058f7
|
||||
[bsr_system.h]
|
||||
T=4c6b7f45
|
||||
T=4c8f1e99
|
||||
[renge\renge.h]
|
||||
T=4c318e0f
|
||||
1=renge\renge_defs.h
|
||||
@ -206,7 +206,7 @@ T=4bf0d1e0
|
||||
[i2c_ctr.h]
|
||||
T=4bf0d1e1
|
||||
[pm.h]
|
||||
T=4c8ed590
|
||||
T=4ca04fc0
|
||||
[rtc.h]
|
||||
T=4bf0d1e1
|
||||
[reboot.h]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user