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

twlへのvol通知を修正

Browse Source 
充電LEDとレジスタのビットの状態が一致するように。
　CCICバグ回避＆アダプタ接続確認のために、充電中でなくても、アダプタ接続後数秒強制点灯にしていた。
　ビットをLEDの状態に合わせる方向に変更した。

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@258 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2010-10-22 08:26:44 +00:00
parent 3534aef9f4
commit 7855923415
9 changed files with 1446 additions and 1442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
trunk/adc.c
View File

@ -51,9 +51,12 @@ filter_work work_vr_vol = {
// twl の8段階volのリニア値からの境界 // twl の8段階volのリニア値からの境界
/*
twl内の32 -> 8 テーブル
0～1,～4,～8,～13,～18,～23,～28,31
*/
const u8 TWL_VOL_BOUNDARY[] = { const u8 TWL_VOL_BOUNDARY[] = {
// 0, 2, 6, 11, 16, 21, 26, 31 1, 4, 8, 13, 18, 23, 28, 31
0, 4, 8, 13, 18, 23, 28, 31
}; };
// ===================================================== // // ===================================================== //
@ -214,34 +217,46 @@ task_status_immed tski_vol_update()
// レジスタの更新 // // レジスタの更新 //
vreg_ctr[ VREG_C_SND_VOL ] = sent_index; vreg_ctr[ VREG_C_SND_VOL ] = sent_index;
if( sent_index == 1 ) // スケーリング // スケーリング
// if( sent_index == 1 )
if( sent_index == 0 )
{ {
vreg_twl[ REG_TWL_INT_ADRS_VOL ] = 1; vreg_twl[ REG_TWL_INT_ADRS_VOL ] = 0;
}
else if( sent_index <= 4 )
{
vreg_twl[ REG_TWL_INT_ADRS_VOL ] = 2;
} }
else else
{ {
vreg_twl[ REG_TWL_INT_ADRS_VOL ] = sent_index/2 ; vreg_twl[ REG_TWL_INT_ADRS_VOL ] = sent_index/2 ;
} }
// 8段階のレベル化。　割り込みを入れるのに必要 // 8段階のレベル化。　割り込みを入れるのに必要
{ {
u8 new_level = 31; static u8 vol_twl_old;
u8 i;
if( vol_twl_old != vreg_twl[ REG_TWL_INT_ADRS_VOL ] )
// 8段レベルに変換
for( i=0; i<=7; i++ )
{ {
if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] ) // 8段レベルに変換
u8 new_level = 31;
u8 i;
vol_twl_old = vreg_twl[ REG_TWL_INT_ADRS_VOL ];
for( i=0; i<=7; i++ )
{ {
new_level = i; if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] )
break; {
new_level = i;
break;
}
} }
vol_level_twl = new_level;
} }
vol_level_twl = new_level;
} }
// CODECに書きに行く？ // CODECに書きに行く？
if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_BY_SPI ) if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_BY_SPI )
{ {

1937
trunk/bsr.hex
View File

File diff suppressed because it is too large Load Diff

BIN
trunk/bsr.lmf
View File

Binary file not shown.

777
trunk/bsr_k0r.map
View File

@ -5,15 +5,16 @@
Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l
mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10
\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr_k0r.map -nk \lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499E033F240BFAA
d -gb7EFBFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0 h -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files\NEC Electr
R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -b onics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm
cl0rmf.lib -iC:\Program Files\NEC Electronics Tools\CC78K0R\W .lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files\NEC Electron
2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.r ics Tools\CC78K0R\W2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.r
el main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel el pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel
rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.r i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel
el self_flash.rel sw.rel task_debug.rel task_misc.rel task_sy renge.rel accero.rel self_flash.rel sw.rel task_debug.rel ta
s.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel sk_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel
task_status.rel
Para-file: Para-file:
Out-file: bsr.lmf Out-file: bsr.lmf
Map-file: bsr_k0r.map Map-file: bsr_k0r.map
@ -22,9 +23,9 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
64 output segment(s) 66 output segment(s)
3E9DH byte(s) real data 3EDFH byte(s) real data
5401 symbol(s) defined 5409 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -56,7 +57,8 @@ Direc-file:bsr_mcu.dr
LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL 00002H 00000H CSEG PAGE64KP
LDR_CNSL task_status LDR_CNSL task_status
00002H 00000H 00002H 00000H
* gap * 00002H 0000EH ??NMIROM 00002H 00002H CSEG
* gap * 00004H 0000CH
@@VECT10 00010H 00004H CSEG AT @@VECT10 00010H 00004H CSEG AT
@@VECT10 ini_VECT 00010H 00004H @@VECT10 ini_VECT 00010H 00004H
* gap * 00014H 00008H * gap * 00014H 00008H
@ -97,55 +99,56 @@ Direc-file:bsr_mcu.dr
LDR_CODL task_status LDR_CODL task_status
000C4H 00000H 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG ?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 0092BH CSEG ?OCDSTAD 000CEH 0000AH CSEG
LDR_CODE loader 000CEH 001F9H LDR_CODE 000D8H 0092BH CSEG
LDR_CODE main 002C7H 00046H LDR_CODE loader 000D8H 001F9H
LDR_CODE WDT 0030DH 00000H LDR_CODE main 002D1H 00046H
LDR_CODE i2c_mcu 0030DH 002F1H LDR_CODE WDT 00317H 00000H
LDR_CODE i2c_mcu 00317H 002F1H
LDR_CODE self_flash LDR_CODE self_flash
005FEH 00373H 00608H 00373H
LDR_CODE task_debug LDR_CODE task_debug
00971H 00000H 0097BH 00000H
LDR_CODE task_status LDR_CODE task_status
00971H 00088H 0097BH 00088H
FSL_CODE 009F9H 00322H CSEG FSL_CODE 00A03H 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
009F9H 0002BH 00A03H 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
00A24H 00013H 00A2EH 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
00A37H 0014FH 00A41H 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00B86H 00001H 00B90H 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00B87H 00064H 00B91H 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00BEBH 0004DH 00BF5H 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00C38H 00061H 00C42H 00061H
FSL_CODE fsl_swap 00C99H 00030H FSL_CODE fsl_swap 00CA3H 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00CC9H 00052H 00CD3H 00052H
@@LCODE 00D1BH 002AFH CSEG @@LCODE 00D25H 002AFH CSEG
@@LCODE @cstart 00D1BH 0006DH @@LCODE @cstart 00D25H 0006DH
@@LCODE @imul 00D88H 00011H @@LCODE @imul 00D92H 00011H
@@LCODE @lumul 00D99H 0002BH @@LCODE @lumul 00DA3H 0002BH
@@LCODE @isdiv 00DC4H 00022H @@LCODE @isdiv 00DCEH 00022H
@@LCODE @iudiv 00DE6H 0002DH @@LCODE @iudiv 00DF0H 0002DH
@@LCODE @isrem 00E13H 00021H @@LCODE @isrem 00E1DH 00021H
@@LCODE @iurem 00E34H 0002FH @@LCODE @iurem 00E3EH 0002FH
@@LCODE @lsdiv 00E63H 00039H @@LCODE @lsdiv 00E6DH 00039H
@@LCODE @ludiv 00E9CH 0003FH @@LCODE @ludiv 00EA6H 0003FH
@@LCODE @divuw 00EDBH 00034H @@LCODE @divuw 00EE5H 00034H
@@LCODE @ladd 00F0FH 0000FH @@LCODE @ladd 00F19H 0000FH
@@LCODE @llsh 00F1EH 0001BH @@LCODE @llsh 00F28H 0001BH
@@LCODE @lursh 00F39H 0001FH @@LCODE @lursh 00F43H 0001FH
@@LCODE @iscmp 00F58H 0000CH @@LCODE @iscmp 00F62H 0000CH
@@LCODE @lscmp 00F64H 00014H @@LCODE @lscmp 00F6EH 00014H
@@LCODE @lband 00F78H 00014H @@LCODE @lband 00F82H 00014H
@@LCODE @bcdtob 00F8CH 0001AH @@LCODE @bcdtob 00F96H 0001AH
@@LCODE @bbcd 00FA6H 00024H @@LCODE @bbcd 00FB0H 00024H
* gap * 00FCAH 0002CH * gap * 00FD4H 00022H
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -185,235 +188,235 @@ Direc-file:bsr_mcu.dr
@@CNST ini_VECT 022D8H 00000H @@CNST ini_VECT 022D8H 00000H
@@CNST task_status @@CNST task_status
022D8H 00000H 022D8H 00000H
ROM_CODE 022D8H 02723H CSEG ROM_CODE 022D8H 02759H CSEG
ROM_CODE pm 022D8H 00A14H ROM_CODE pm 022D8H 00A1AH
ROM_CODE i2c_ctr 02CECH 00060H ROM_CODE i2c_ctr 02CF2H 00060H
ROM_CODE i2c_twl 02D4CH 0005EH ROM_CODE i2c_twl 02D52H 0005EH
ROM_CODE led 02DAAH 0051AH ROM_CODE led 02DB0H 0051AH
ROM_CODE rtc 032C4H 000E0H ROM_CODE rtc 032CAH 000E0H
ROM_CODE vreg_ctr 033A4H 00475H ROM_CODE vreg_ctr 033AAH 00475H
ROM_CODE vreg_twl 03819H 0010AH ROM_CODE vreg_twl 0381FH 0010AH
ROM_CODE adc 03923H 002E2H ROM_CODE adc 03929H 002FCH
ROM_CODE renge 03C05H 00190H ROM_CODE renge 03C25H 00190H
ROM_CODE accero 03D95H 0013DH ROM_CODE accero 03DB5H 0013DH
ROM_CODE sw 03ED2H 00112H ROM_CODE sw 03EF2H 00112H
ROM_CODE task_misc ROM_CODE task_misc
03FE4H 001A9H 04004H 001BFH
ROM_CODE task_sys 0418DH 0037CH ROM_CODE task_sys 041C3H 0037CH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
04509H 004F2H 0453FH 004F2H
@@BASE 049FBH 0050EH CSEG BASE @@BASE 04A31H 0050EH CSEG BASE
@@BASE loader 049FBH 00000H @@BASE loader 04A31H 00000H
@@BASE pm 049FBH 0003FH @@BASE pm 04A31H 0003FH
@@BASE i2c_ctr 04A3AH 00198H @@BASE i2c_ctr 04A70H 00198H
@@BASE main 04BD2H 00000H @@BASE main 04C08H 00000H
@@BASE magic 04BD2H 00000H @@BASE magic 04C08H 00000H
@@BASE WDT 04BD2H 00000H @@BASE WDT 04C08H 00000H
@@BASE i2c_mcu 04BD2H 000D9H @@BASE i2c_mcu 04C08H 000D9H
@@BASE i2c_twl 04CABH 000CBH @@BASE i2c_twl 04CE1H 000CBH
@@BASE led 04D76H 00000H @@BASE led 04DACH 00000H
@@BASE rtc 04D76H 0005EH @@BASE rtc 04DACH 0005EH
@@BASE vreg_ctr 04DD4H 00000H @@BASE vreg_ctr 04E0AH 00000H
@@BASE vreg_twl 04DD4H 00000H @@BASE vreg_twl 04E0AH 00000H
@@BASE adc 04DD4H 000B3H @@BASE adc 04E0AH 000B3H
@@BASE renge 04E87H 00000H @@BASE renge 04EBDH 00000H
@@BASE accero 04E87H 0004AH @@BASE accero 04EBDH 0004AH
@@BASE self_flash @@BASE self_flash
04ED1H 00000H 04F07H 00000H
@@BASE sw 04ED1H 00000H @@BASE sw 04F07H 00000H
@@BASE task_debug @@BASE task_debug
04ED1H 00000H 04F07H 00000H
@@BASE task_misc @@BASE task_misc
04ED1H 00000H 04F07H 00000H
@@BASE task_sys 04ED1H 00000H @@BASE task_sys 04F07H 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04ED1H 00000H 04F07H 00000H
@@BASE ini_VECT 04ED1H 00038H @@BASE ini_VECT 04F07H 00038H
@@BASE task_status @@BASE task_status
04F09H 00000H 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04F09H 00000H @@CNSTL @cstart 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL pm 04F09H 00000H @@CNSTL pm 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04F09H 00000H @@CNSTL i2c_ctr 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04F09H 00000H @@CNSTL i2c_twl 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL led 04F09H 00000H @@CNSTL led 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL rtc 04F09H 00000H @@CNSTL rtc 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04F09H 00000H @@CNSTL vreg_ctr 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04F09H 00000H @@CNSTL vreg_twl 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL adc 04F09H 00000H @@CNSTL adc 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL renge 04F09H 00000H @@CNSTL renge 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL accero 04F09H 00000H @@CNSTL accero 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL sw 04F09H 00000H @@CNSTL sw 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04F09H 00000H 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04F09H 00000H @@CNSTL task_sys 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04F09H 00000H 04F3FH 00000H
@@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL 04F3FH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04F09H 00000H @@CNSTL ini_VECT 04F3FH 00000H
@@R_INIS 04F09H 00000H CSEG UNIT64KP @@R_INIS 04F3FH 00000H CSEG UNIT64KP
@@R_INIS @cstart 04F09H 00000H @@R_INIS @cstart 04F3FH 00000H
@@R_INIS loader 04F09H 00000H @@R_INIS loader 04F3FH 00000H
@@R_INIS pm 04F09H 00000H @@R_INIS pm 04F3FH 00000H
@@R_INIS i2c_ctr 04F09H 00000H @@R_INIS i2c_ctr 04F3FH 00000H
@@R_INIS main 04F09H 00000H @@R_INIS main 04F3FH 00000H
@@R_INIS magic 04F09H 00000H @@R_INIS magic 04F3FH 00000H
@@R_INIS WDT 04F09H 00000H @@R_INIS WDT 04F3FH 00000H
@@R_INIS i2c_mcu 04F09H 00000H @@R_INIS i2c_mcu 04F3FH 00000H
@@R_INIS i2c_twl 04F09H 00000H @@R_INIS i2c_twl 04F3FH 00000H
@@R_INIS led 04F09H 00000H @@R_INIS led 04F3FH 00000H
@@R_INIS rtc 04F09H 00000H @@R_INIS rtc 04F3FH 00000H
@@R_INIS vreg_ctr 04F09H 00000H @@R_INIS vreg_ctr 04F3FH 00000H
@@R_INIS vreg_twl 04F09H 00000H @@R_INIS vreg_twl 04F3FH 00000H
@@R_INIS adc 04F09H 00000H @@R_INIS adc 04F3FH 00000H
@@R_INIS renge 04F09H 00000H @@R_INIS renge 04F3FH 00000H
@@R_INIS accero 04F09H 00000H @@R_INIS accero 04F3FH 00000H
@@R_INIS self_flash @@R_INIS self_flash
04F09H 00000H 04F3FH 00000H
@@R_INIS sw 04F09H 00000H @@R_INIS sw 04F3FH 00000H
@@R_INIS task_debug @@R_INIS task_debug
04F09H 00000H 04F3FH 00000H
@@R_INIS task_misc @@R_INIS task_misc
04F09H 00000H 04F3FH 00000H
@@R_INIS task_sys 04F09H 00000H @@R_INIS task_sys 04F3FH 00000H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04F09H 00000H 04F3FH 00000H
@@R_INIS ini_VECT 04F09H 00000H @@R_INIS ini_VECT 04F3FH 00000H
@@R_INIS task_status @@R_INIS task_status
04F09H 00000H 04F3FH 00000H
@@R_INIS @rom 04F09H 00000H @@R_INIS @rom 04F3FH 00000H
@@CALT 04F09H 00000H CSEG @@CALT 04F3FH 00000H CSEG
@@CALT @cstart 04F09H 00000H @@CALT @cstart 04F3FH 00000H
@@CALT loader 04F09H 00000H @@CALT loader 04F3FH 00000H
@@CALT pm 04F09H 00000H @@CALT pm 04F3FH 00000H
@@CALT i2c_ctr 04F09H 00000H @@CALT i2c_ctr 04F3FH 00000H
@@CALT main 04F09H 00000H @@CALT main 04F3FH 00000H
@@CALT magic 04F09H 00000H @@CALT magic 04F3FH 00000H
@@CALT WDT 04F09H 00000H @@CALT WDT 04F3FH 00000H
@@CALT i2c_mcu 04F09H 00000H @@CALT i2c_mcu 04F3FH 00000H
@@CALT i2c_twl 04F09H 00000H @@CALT i2c_twl 04F3FH 00000H
@@CALT led 04F09H 00000H @@CALT led 04F3FH 00000H
@@CALT rtc 04F09H 00000H @@CALT rtc 04F3FH 00000H
@@CALT vreg_ctr 04F09H 00000H @@CALT vreg_ctr 04F3FH 00000H
@@CALT vreg_twl 04F09H 00000H @@CALT vreg_twl 04F3FH 00000H
@@CALT adc 04F09H 00000H @@CALT adc 04F3FH 00000H
@@CALT renge 04F09H 00000H @@CALT renge 04F3FH 00000H
@@CALT accero 04F09H 00000H @@CALT accero 04F3FH 00000H
@@CALT self_flash @@CALT self_flash
04F09H 00000H 04F3FH 00000H
@@CALT sw 04F09H 00000H @@CALT sw 04F3FH 00000H
@@CALT task_debug @@CALT task_debug
04F09H 00000H 04F3FH 00000H
@@CALT task_misc @@CALT task_misc
04F09H 00000H 04F3FH 00000H
@@CALT task_sys 04F09H 00000H @@CALT task_sys 04F3FH 00000H
@@CALT pedo_alg_thre_det2 @@CALT pedo_alg_thre_det2
04F09H 00000H 04F3FH 00000H
@@CALT ini_VECT 04F09H 00000H @@CALT ini_VECT 04F3FH 00000H
@@CALT task_status @@CALT task_status
04F09H 00000H 04F3FH 00000H
@@RLINIT 04F09H 00000H CSEG UNIT64KP @@RLINIT 04F3FH 00000H CSEG UNIT64KP
@@RLINIT loader 04F09H 00000H @@RLINIT loader 04F3FH 00000H
@@RLINIT pm 04F09H 00000H @@RLINIT pm 04F3FH 00000H
@@RLINIT i2c_ctr 04F09H 00000H @@RLINIT i2c_ctr 04F3FH 00000H
@@RLINIT main 04F09H 00000H @@RLINIT main 04F3FH 00000H
@@RLINIT magic 04F09H 00000H @@RLINIT magic 04F3FH 00000H
@@RLINIT WDT 04F09H 00000H @@RLINIT WDT 04F3FH 00000H
@@RLINIT i2c_mcu 04F09H 00000H @@RLINIT i2c_mcu 04F3FH 00000H
@@RLINIT i2c_twl 04F09H 00000H @@RLINIT i2c_twl 04F3FH 00000H
@@RLINIT led 04F09H 00000H @@RLINIT led 04F3FH 00000H
@@RLINIT rtc 04F09H 00000H @@RLINIT rtc 04F3FH 00000H
@@RLINIT vreg_ctr 04F09H 00000H @@RLINIT vreg_ctr 04F3FH 00000H
@@RLINIT vreg_twl 04F09H 00000H @@RLINIT vreg_twl 04F3FH 00000H
@@RLINIT adc 04F09H 00000H @@RLINIT adc 04F3FH 00000H
@@RLINIT renge 04F09H 00000H @@RLINIT renge 04F3FH 00000H
@@RLINIT accero 04F09H 00000H @@RLINIT accero 04F3FH 00000H
@@RLINIT self_flash @@RLINIT self_flash
04F09H 00000H 04F3FH 00000H
@@RLINIT sw 04F09H 00000H @@RLINIT sw 04F3FH 00000H
@@RLINIT task_debug @@RLINIT task_debug
04F09H 00000H 04F3FH 00000H
@@RLINIT task_misc @@RLINIT task_misc
04F09H 00000H 04F3FH 00000H
@@RLINIT task_sys 04F09H 00000H @@RLINIT task_sys 04F3FH 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04F09H 00000H 04F3FH 00000H
@@RLINIT ini_VECT 04F09H 00000H @@RLINIT ini_VECT 04F3FH 00000H
@@RLINIT task_status @@RLINIT task_status
04F09H 00000H 04F3FH 00000H
@@RLINIT @rom 04F09H 00000H @@RLINIT @rom 04F3FH 00000H
@@CODEL 04F09H 00000H CSEG @@CODEL 04F3FH 00000H CSEG
@@CODEL pm 04F09H 00000H @@CODEL pm 04F3FH 00000H
@@CODEL i2c_ctr 04F09H 00000H @@CODEL i2c_ctr 04F3FH 00000H
@@CODEL magic 04F09H 00000H @@CODEL magic 04F3FH 00000H
@@CODEL i2c_twl 04F09H 00000H @@CODEL i2c_twl 04F3FH 00000H
@@CODEL led 04F09H 00000H @@CODEL led 04F3FH 00000H
@@CODEL rtc 04F09H 00000H @@CODEL rtc 04F3FH 00000H
@@CODEL vreg_ctr 04F09H 00000H @@CODEL vreg_ctr 04F3FH 00000H
@@CODEL vreg_twl 04F09H 00000H @@CODEL vreg_twl 04F3FH 00000H
@@CODEL adc 04F09H 00000H @@CODEL adc 04F3FH 00000H
@@CODEL renge 04F09H 00000H @@CODEL renge 04F3FH 00000H
@@CODEL accero 04F09H 00000H @@CODEL accero 04F3FH 00000H
@@CODEL sw 04F09H 00000H @@CODEL sw 04F3FH 00000H
@@CODEL task_misc @@CODEL task_misc
04F09H 00000H 04F3FH 00000H
@@CODEL task_sys 04F09H 00000H @@CODEL task_sys 04F3FH 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04F09H 00000H 04F3FH 00000H
@@CODEL ini_VECT 04F09H 00000H @@CODEL ini_VECT 04F3FH 00000H
* gap * 04F09H 00001H * gap * 04F3FH 00001H
@@CNSTL 04F0AH 0000AH CSEG PAGE64KP @@CNSTL 04F40H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04F0AH 0000AH @@CNSTL @bcdtob 04F40H 0000AH
@@CNSTL 04F14H 00010H CSEG PAGE64KP @@CNSTL 04F4AH 00010H CSEG PAGE64KP
@@CNSTL @bbcd 04F14H 00010H @@CNSTL @bbcd 04F4AH 00010H
@@R_INIT 04F24H 0003AH CSEG UNIT64KP @@R_INIT 04F5AH 0003AH CSEG UNIT64KP
@@R_INIT @cstart 04F24H 00000H @@R_INIT @cstart 04F5AH 00000H
@@R_INIT loader 04F24H 00000H @@R_INIT loader 04F5AH 00000H
@@R_INIT pm 04F24H 00002H @@R_INIT pm 04F5AH 00002H
@@R_INIT i2c_ctr 04F26H 00002H @@R_INIT i2c_ctr 04F5CH 00002H
@@R_INIT main 04F28H 00000H @@R_INIT main 04F5EH 00000H
@@R_INIT magic 04F28H 00000H @@R_INIT magic 04F5EH 00000H
@@R_INIT WDT 04F28H 00000H @@R_INIT WDT 04F5EH 00000H
@@R_INIT i2c_mcu 04F28H 00000H @@R_INIT i2c_mcu 04F5EH 00000H
@@R_INIT i2c_twl 04F28H 00000H @@R_INIT i2c_twl 04F5EH 00000H
@@R_INIT led 04F28H 00006H @@R_INIT led 04F5EH 00006H
@@R_INIT rtc 04F2EH 00000H @@R_INIT rtc 04F64H 00000H
@@R_INIT vreg_ctr 04F2EH 00000H @@R_INIT vreg_ctr 04F64H 00000H
@@R_INIT vreg_twl 04F2EH 00000H @@R_INIT vreg_twl 04F64H 00000H
@@R_INIT adc 04F2EH 0000CH @@R_INIT adc 04F64H 0000CH
@@R_INIT renge 04F3AH 00014H @@R_INIT renge 04F70H 00014H
@@R_INIT accero 04F4EH 00000H @@R_INIT accero 04F84H 00000H
@@R_INIT self_flash @@R_INIT self_flash
04F4EH 00000H 04F84H 00000H
@@R_INIT sw 04F4EH 00002H @@R_INIT sw 04F84H 00002H
@@R_INIT task_debug @@R_INIT task_debug
04F50H 00000H 04F86H 00000H
@@R_INIT task_misc @@R_INIT task_misc
04F50H 00000H 04F86H 00000H
@@R_INIT task_sys 04F50H 00002H @@R_INIT task_sys 04F86H 00002H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
04F52H 0000AH 04F88H 0000AH
@@R_INIT ini_VECT 04F5CH 00000H @@R_INIT ini_VECT 04F92H 00000H
@@R_INIT task_status @@R_INIT task_status
04F5CH 00002H 04F92H 00002H
@@R_INIT @rom 04F5EH 00000H @@R_INIT @rom 04F94H 00000H
@@LCODEL 04F5EH 00008H CSEG @@LCODEL 04F94H 00008H CSEG
@@LCODEL abs 04F5EH 00008H @@LCODEL abs 04F94H 00008H
* gap * 04F66H 00090H * gap * 04F9CH 0005AH
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH MGC_TAIL magic 04FF6H 0000AH
@ -421,7 +424,7 @@ Direc-file:bsr_mcu.dr
BASE ADDRESS=FF900H SIZE=00500H BASE ADDRESS=FF900H SIZE=00500H
OUTPUT INPUT INPUT BASE SIZE OUTPUT INPUT INPUT BASE SIZE
SEGMENT SEGMENT MODULE ADDRESS SEGMENT SEGMENT MODULE ADDRESS
@@DATA FF900H 0042EH DSEG BASEP @@DATA FF900H 00430H DSEG BASEP
@@DATA @cstart FF900H 00002H @@DATA @cstart FF900H 00002H
@@DATA loader FF902H 00000H @@DATA loader FF902H 00000H
@@DATA pm FF902H 00016H @@DATA pm FF902H 00016H
@ -444,171 +447,171 @@ Direc-file:bsr_mcu.dr
@@DATA task_debug @@DATA task_debug
FFC88H 00000H FFC88H 00000H
@@DATA task_misc @@DATA task_misc
FFC88H 0000CH FFC88H 0000EH
@@DATA task_sys FFC94H 00002H @@DATA task_sys FFC96H 00002H
@@DATA pedo_alg_thre_det2 @@DATA pedo_alg_thre_det2
FFC96H 00096H FFC98H 00096H
@@DATA ini_VECT FFD2CH 00000H @@DATA ini_VECT FFD2EH 00000H
@@DATA task_status @@DATA task_status
FFD2CH 00002H FFD2EH 00002H
@@DATA @rom FFD2EH 00000H @@DATA @rom FFD30H 00000H
@@INIT FFD2EH 0003AH DSEG BASEP @@INIT FFD30H 0003AH DSEG BASEP
@@INIT @cstart FFD2EH 00000H @@INIT @cstart FFD30H 00000H
@@INIT loader FFD2EH 00000H @@INIT loader FFD30H 00000H
@@INIT pm FFD2EH 00002H @@INIT pm FFD30H 00002H
@@INIT i2c_ctr FFD30H 00002H @@INIT i2c_ctr FFD32H 00002H
@@INIT main FFD32H 00000H @@INIT main FFD34H 00000H
@@INIT magic FFD32H 00000H @@INIT magic FFD34H 00000H
@@INIT WDT FFD32H 00000H @@INIT WDT FFD34H 00000H
@@INIT i2c_mcu FFD32H 00000H @@INIT i2c_mcu FFD34H 00000H
@@INIT i2c_twl FFD32H 00000H @@INIT i2c_twl FFD34H 00000H
@@INIT led FFD32H 00006H @@INIT led FFD34H 00006H
@@INIT rtc FFD38H 00000H @@INIT rtc FFD3AH 00000H
@@INIT vreg_ctr FFD38H 00000H @@INIT vreg_ctr FFD3AH 00000H
@@INIT vreg_twl FFD38H 00000H @@INIT vreg_twl FFD3AH 00000H
@@INIT adc FFD38H 0000CH @@INIT adc FFD3AH 0000CH
@@INIT renge FFD44H 00014H @@INIT renge FFD46H 00014H
@@INIT accero FFD58H 00000H @@INIT accero FFD5AH 00000H
@@INIT self_flash @@INIT self_flash
FFD58H 00000H FFD5AH 00000H
@@INIT sw FFD58H 00002H @@INIT sw FFD5AH 00002H
@@INIT task_debug @@INIT task_debug
FFD5AH 00000H FFD5CH 00000H
@@INIT task_misc @@INIT task_misc
FFD5AH 00000H FFD5CH 00000H
@@INIT task_sys FFD5AH 00002H @@INIT task_sys FFD5CH 00002H
@@INIT pedo_alg_thre_det2 @@INIT pedo_alg_thre_det2
FFD5CH 0000AH FFD5EH 0000AH
@@INIT ini_VECT FFD66H 00000H @@INIT ini_VECT FFD68H 00000H
@@INIT task_status @@INIT task_status
FFD66H 00002H FFD68H 00002H
@@INIT @rom FFD68H 00000H @@INIT @rom FFD6AH 00000H
@@INIS FFD68H 00000H DSEG UNITP @@INIS FFD6AH 00000H DSEG UNITP
@@INIS @cstart FFD68H 00000H @@INIS @cstart FFD6AH 00000H
@@INIS loader FFD68H 00000H @@INIS loader FFD6AH 00000H
@@INIS pm FFD68H 00000H @@INIS pm FFD6AH 00000H
@@INIS i2c_ctr FFD68H 00000H @@INIS i2c_ctr FFD6AH 00000H
@@INIS main FFD68H 00000H @@INIS main FFD6AH 00000H
@@INIS magic FFD68H 00000H @@INIS magic FFD6AH 00000H
@@INIS WDT FFD68H 00000H @@INIS WDT FFD6AH 00000H
@@INIS i2c_mcu FFD68H 00000H @@INIS i2c_mcu FFD6AH 00000H
@@INIS i2c_twl FFD68H 00000H @@INIS i2c_twl FFD6AH 00000H
@@INIS led FFD68H 00000H @@INIS led FFD6AH 00000H
@@INIS rtc FFD68H 00000H @@INIS rtc FFD6AH 00000H
@@INIS vreg_ctr FFD68H 00000H @@INIS vreg_ctr FFD6AH 00000H
@@INIS vreg_twl FFD68H 00000H @@INIS vreg_twl FFD6AH 00000H
@@INIS adc FFD68H 00000H @@INIS adc FFD6AH 00000H
@@INIS renge FFD68H 00000H @@INIS renge FFD6AH 00000H
@@INIS accero FFD68H 00000H @@INIS accero FFD6AH 00000H
@@INIS self_flash @@INIS self_flash
FFD68H 00000H FFD6AH 00000H
@@INIS sw FFD68H 00000H @@INIS sw FFD6AH 00000H
@@INIS task_debug @@INIS task_debug
FFD68H 00000H FFD6AH 00000H
@@INIS task_misc @@INIS task_misc
FFD68H 00000H FFD6AH 00000H
@@INIS task_sys FFD68H 00000H @@INIS task_sys FFD6AH 00000H
@@INIS pedo_alg_thre_det2 @@INIS pedo_alg_thre_det2
FFD68H 00000H FFD6AH 00000H
@@INIS ini_VECT FFD68H 00000H @@INIS ini_VECT FFD6AH 00000H
@@INIS task_status @@INIS task_status
FFD68H 00000H FFD6AH 00000H
@@INIS @rom FFD68H 00000H @@INIS @rom FFD6AH 00000H
@@DATS FFD68H 00000H DSEG UNITP @@DATS FFD6AH 00000H DSEG UNITP
@@DATS @cstart FFD68H 00000H @@DATS @cstart FFD6AH 00000H
@@DATS loader FFD68H 00000H @@DATS loader FFD6AH 00000H
@@DATS pm FFD68H 00000H @@DATS pm FFD6AH 00000H
@@DATS i2c_ctr FFD68H 00000H @@DATS i2c_ctr FFD6AH 00000H
@@DATS main FFD68H 00000H @@DATS main FFD6AH 00000H
@@DATS magic FFD68H 00000H @@DATS magic FFD6AH 00000H
@@DATS WDT FFD68H 00000H @@DATS WDT FFD6AH 00000H
@@DATS i2c_mcu FFD68H 00000H @@DATS i2c_mcu FFD6AH 00000H
@@DATS i2c_twl FFD68H 00000H @@DATS i2c_twl FFD6AH 00000H
@@DATS led FFD68H 00000H @@DATS led FFD6AH 00000H
@@DATS rtc FFD68H 00000H @@DATS rtc FFD6AH 00000H
@@DATS vreg_ctr FFD68H 00000H @@DATS vreg_ctr FFD6AH 00000H
@@DATS vreg_twl FFD68H 00000H @@DATS vreg_twl FFD6AH 00000H
@@DATS adc FFD68H 00000H @@DATS adc FFD6AH 00000H
@@DATS renge FFD68H 00000H @@DATS renge FFD6AH 00000H
@@DATS accero FFD68H 00000H @@DATS accero FFD6AH 00000H
@@DATS self_flash @@DATS self_flash
FFD68H 00000H FFD6AH 00000H
@@DATS sw FFD68H 00000H @@DATS sw FFD6AH 00000H
@@DATS task_debug @@DATS task_debug
FFD68H 00000H FFD6AH 00000H
@@DATS task_misc @@DATS task_misc
FFD68H 00000H FFD6AH 00000H
@@DATS task_sys FFD68H 00000H @@DATS task_sys FFD6AH 00000H
@@DATS pedo_alg_thre_det2 @@DATS pedo_alg_thre_det2
FFD68H 00000H FFD6AH 00000H
@@DATS ini_VECT FFD68H 00000H @@DATS ini_VECT FFD6AH 00000H
@@DATS task_status @@DATS task_status
FFD68H 00000H FFD6AH 00000H
@@DATS @rom FFD68H 00000H @@DATS @rom FFD6AH 00000H
FSL_DATA FFD68H 00010H DSEG UNITP FSL_DATA FFD6AH 00010H DSEG UNITP
FSL_DATA fsl_common FSL_DATA fsl_common
FFD68H 00010H FFD6AH 00010H
@@INITL FFD78H 00000H DSEG UNIT64KP @@INITL FFD7AH 00000H DSEG UNIT64KP
@@INITL loader FFD78H 00000H @@INITL loader FFD7AH 00000H
@@INITL pm FFD78H 00000H @@INITL pm FFD7AH 00000H
@@INITL i2c_ctr FFD78H 00000H @@INITL i2c_ctr FFD7AH 00000H
@@INITL main FFD78H 00000H @@INITL main FFD7AH 00000H
@@INITL magic FFD78H 00000H @@INITL magic FFD7AH 00000H
@@INITL WDT FFD78H 00000H @@INITL WDT FFD7AH 00000H
@@INITL i2c_mcu FFD78H 00000H @@INITL i2c_mcu FFD7AH 00000H
@@INITL i2c_twl FFD78H 00000H @@INITL i2c_twl FFD7AH 00000H
@@INITL led FFD78H 00000H @@INITL led FFD7AH 00000H
@@INITL rtc FFD78H 00000H @@INITL rtc FFD7AH 00000H
@@INITL vreg_ctr FFD78H 00000H @@INITL vreg_ctr FFD7AH 00000H
@@INITL vreg_twl FFD78H 00000H @@INITL vreg_twl FFD7AH 00000H
@@INITL adc FFD78H 00000H @@INITL adc FFD7AH 00000H
@@INITL renge FFD78H 00000H @@INITL renge FFD7AH 00000H
@@INITL accero FFD78H 00000H @@INITL accero FFD7AH 00000H
@@INITL self_flash @@INITL self_flash
FFD78H 00000H FFD7AH 00000H
@@INITL sw FFD78H 00000H @@INITL sw FFD7AH 00000H
@@INITL task_debug @@INITL task_debug
FFD78H 00000H FFD7AH 00000H
@@INITL task_misc @@INITL task_misc
FFD78H 00000H FFD7AH 00000H
@@INITL task_sys FFD78H 00000H @@INITL task_sys FFD7AH 00000H
@@INITL pedo_alg_thre_det2 @@INITL pedo_alg_thre_det2
FFD78H 00000H FFD7AH 00000H
@@INITL ini_VECT FFD78H 00000H @@INITL ini_VECT FFD7AH 00000H
@@INITL task_status @@INITL task_status
FFD78H 00000H FFD7AH 00000H
@@INITL @rom FFD78H 00000H @@INITL @rom FFD7AH 00000H
@@DATAL FFD78H 00000H DSEG UNIT64KP @@DATAL FFD7AH 00000H DSEG UNIT64KP
@@DATAL loader FFD78H 00000H @@DATAL loader FFD7AH 00000H
@@DATAL pm FFD78H 00000H @@DATAL pm FFD7AH 00000H
@@DATAL i2c_ctr FFD78H 00000H @@DATAL i2c_ctr FFD7AH 00000H
@@DATAL main FFD78H 00000H @@DATAL main FFD7AH 00000H
@@DATAL magic FFD78H 00000H @@DATAL magic FFD7AH 00000H
@@DATAL WDT FFD78H 00000H @@DATAL WDT FFD7AH 00000H
@@DATAL i2c_mcu FFD78H 00000H @@DATAL i2c_mcu FFD7AH 00000H
@@DATAL i2c_twl FFD78H 00000H @@DATAL i2c_twl FFD7AH 00000H
@@DATAL led FFD78H 00000H @@DATAL led FFD7AH 00000H
@@DATAL rtc FFD78H 00000H @@DATAL rtc FFD7AH 00000H
@@DATAL vreg_ctr FFD78H 00000H @@DATAL vreg_ctr FFD7AH 00000H
@@DATAL vreg_twl FFD78H 00000H @@DATAL vreg_twl FFD7AH 00000H
@@DATAL adc FFD78H 00000H @@DATAL adc FFD7AH 00000H
@@DATAL renge FFD78H 00000H @@DATAL renge FFD7AH 00000H
@@DATAL accero FFD78H 00000H @@DATAL accero FFD7AH 00000H
@@DATAL self_flash @@DATAL self_flash
FFD78H 00000H FFD7AH 00000H
@@DATAL sw FFD78H 00000H @@DATAL sw FFD7AH 00000H
@@DATAL task_debug @@DATAL task_debug
FFD78H 00000H FFD7AH 00000H
@@DATAL task_misc @@DATAL task_misc
FFD78H 00000H FFD7AH 00000H
@@DATAL task_sys FFD78H 00000H @@DATAL task_sys FFD7AH 00000H
@@DATAL pedo_alg_thre_det2 @@DATAL pedo_alg_thre_det2
FFD78H 00000H FFD7AH 00000H
@@DATAL ini_VECT FFD78H 00000H @@DATAL ini_VECT FFD7AH 00000H
@@DATAL task_status @@DATAL task_status
FFD78H 00000H FFD7AH 00000H
@@DATAL @rom FFD78H 00000H @@DATAL @rom FFD7AH 00000H
* gap * FFD78H 00088H * gap * FFD7AH 00086H
MEMORY=RAM2 MEMORY=RAM2
BASE ADDRESS=FFE20H SIZE=000C0H BASE ADDRESS=FFE20H SIZE=000C0H

BIN
trunk/hoge.bin
View File

Binary file not shown.

11
trunk/pm.c
View File

@ -142,11 +142,9 @@ void tsk_batt( )
{ {
static u8 anti_chatter; static u8 anti_chatter;
if( BT_IN_CHG_n ) // 充電 *してない* (論理がわかりづらいな！) if( BT_IN_CHG_n ) // 充電*してない* (論理がわかりづらいな！)
{ {
anti_chatter = 0; anti_chatter = 0;
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。
/// 割り込みはmiscが引き受ける
LED_CHARGE = 0; LED_CHARGE = 0;
} }
else else
@ -157,17 +155,20 @@ void tsk_batt( )
} }
else else
{ {
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
LED_CHARGE = 1; LED_CHARGE = 1;
} }
} }
} }
if( chg_led_override != 0 ){ // 気がつく人いるかな…？ if( chg_led_override != 0 ){ // ↑から見ればわかるが、瞬間(数クロック)消える事がある。気がつく人いるかな…？
chg_led_override -= 1; chg_led_override -= 1;
LED_CHARGE = 1; LED_CHARGE = 1;
} }
// レジスタの充電中ビットはLEDに同期する
set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。
// 割り込みはmiscが引き受ける
// “d’rŽc—Ê // // “d’rŽc—Ê //
if(( system_status.pwr_state != OFF )&& if(( system_status.pwr_state != OFF )&&
( system_status.pwr_state != BT_CHARGE )) ( system_status.pwr_state != BT_CHARGE ))

16
trunk/task_misc.c
View File

@ -106,15 +106,15 @@ void tsk_misc( )
} }
else else
{ {
mabiki = 4; mabiki = 6;
if( is_TWL ) if( is_TWL )
{
if( vol_level_twl != vol_level_twl_readed )
{ {
set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY ); if( vol_level_twl != vol_level_twl_readed )
{
set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY );
}
} }
}
} }
} }
} }
@ -136,9 +136,9 @@ void tsk_misc( )
} }
else else
{ {
if( LED_duty_3d != vreg_ctr[VREG_C_LED_BRIGHT] ) if( LED_duty_3d != vreg_ctr[VREG_C_LED_BRIGHT] /32 )
{ {
if( LED_duty_3d < vreg_ctr[VREG_C_LED_BRIGHT] ) if( LED_duty_3d < vreg_ctr[VREG_C_LED_BRIGHT] /32 )
{ {
LED_duty_3d += 1; LED_duty_3d += 1;
} }

100
trunk/yav_mcu_bsr.pri
View File

@ -139,27 +139,11 @@ SaveRange=Screen
SaveStart= SaveStart=
SaveEnd= SaveEnd=
Accumulative=ON Accumulative=ON
[Source1]
Geometry=0, 0, 1021, 817
Window=Normal
DispStart=91
CaretPos=1,0
Mode=Normal
DispFile=adc.c
Accumulative=ON
[Source2]
Geometry=25, 25, 1021, 817
Window=Normal
DispStart=100
CaretPos=123,21
Mode=Normal
DispFile=task_misc.c
Accumulative=ON
[Assemble] [Assemble]
Geometry=30, 440, 968, 626 Geometry=30, 440, 968, 626
Window=Normal Window=Hide
DispStart=788 DispStart=864338944
CaretPos=788,27 CaretPos=0,0
Address1= Address1=
Address2= Address2=
Address3= Address3=
@ -202,17 +186,17 @@ SaveStart=
SaveEnd= SaveEnd=
[Memory] [Memory]
Geometry=224, 254, 968, 816 Geometry=224, 254, 968, 816
Window=Normal Window=Hide
Boundary=163 Boundary=0
Format=Hex Format=Hex
Mode=Byte Mode=Byte
Endian=Little Endian=
Ascii=OFF Ascii=OFF
Idtag=OFF Idtag=OFF
Address= Address=
DispStart=000FFC80 DispStart=000FFC80
CaretPosData=0, 65480 CaretPosData=0, 0
CaretPosAscii=3, 65480 CaretPosAscii=0, 0
Address1= Address1=
Address2= Address2=
Address3= Address3=
@ -976,51 +960,47 @@ Count=0
Geometry=1075, 10, 441, 702 Geometry=1075, 10, 441, 702
Window=Normal Window=Normal
Boundary=18088086 Boundary=18088086
0=.temp_twl_bt_level,P,N,A,+,1 0=.vol_level_twl_readed,P,N,A,+,1
1=.bt_remain_old_ctr,P,N,A,+,1 1=.vol_level_twl,P,N,A,+,1
2=.chg_led_override,P,N,A,+,1 2=.temp_twl_bt_level,P,N,A,+,1
3=+vreg_twl,P,N,A,-,1 3=.bt_remain_old_ctr,P,N,A,+,1
4=.infos,P,N,A,+,1 4=.chg_led_override,P,N,A,+,1
5=.vreg_ctr,P,N,A,+,1 5=.vreg_twl,P,N,A,+,1
6=.info_led_override,P,N,A,+,1 6=.infos,P,N,A,+,1
7=.battery_manufacturer,P,N,A,+,1 7=.vreg_ctr,P,N,A,+,1
8=.battery_manufacturer,P,N,A,+,1 8=.battery_manufacturer,P,N,A,+,1
9=+system_status,.,N,A,-,1 9=.system_status,.,N,A,+,1
10=.info_LED,.,N,A,+,1 Line=10
11=.time_to_next_frame,P,N,A,+,1
12=.vol_level_old,P,N,A,+,1
13=.new_level,P,N,A,+,1
14=.vreg_twl[6],P,N,A,+,1
15=.bt_chg_ready,P,N,A,+,1
16=.P5.1,P,S,A,+,1
17=.p4.3,P,S,A,+,1
Line=18
[Quick Watch] [Quick Watch]
0=vol_twl_readed,P,A,1 0=new_level,P,A,1
1=vreg_twl[6],P,A,1 1=vol_level_old,P,A,1
2=new_level,P,A,1 2=battery_manufacturer,P,A,1
3=vol_level_old,P,A,1 3=bt_chg_ready,P,A,1
4=battery_manufacturer,P,A,1 4=PM_EXTDC_n,P,A,1
5=bt_chg_ready,P,A,1 5=chg_led_override,P,A,1
6=PM_EXTDC_n,P,A,1 6=LED_CHARGE,P,A,1
7=chg_led_override,P,A,1 7=P4.3,P,A,1
8=LED_CHARGE,P,A,1 8=P5.1,P,A,1
9=P4.3,P,A,1 9=PU4,P,A,1
10=P5.1,P,A,1 10=PU4.3,P,A,1
11=PU4,P,A,1 11=p4.3,P,A,1
12=PU4.3,P,A,1 12=PU5.1,P,A,1
13=p4.3,P,A,1 13=PM4.3,P,A,1
14=PU5.1,P,A,1 14=vol_level_twl,P,A,1
15=PM4.3,P,A,1 15=vol_level_twl_readed,P,A,1
[Software Break] [Software Break]
Geometry=709, 826, 445, 260 Geometry=709, 826, 445, 260
Window=Normal Window=Normal
Width=150 30 200 100 Width=150 30 200 100
Name0=Swb00001 Name0=Swb00001
Address0=task_misc.c#_tsk_misc+0x5d Address0=task_misc.c#_tsk_misc+0x3f
Window0=ASM Window0=ASM
Status0=ON Status0=ON
Count=1 Name1=Swb00002
Address1=vreg_twl.c#_vreg_twl_read+0x3f
Window1=ASM
Status1=ON
Count=2
[Reset] [Reset]
Debugger=ON Debugger=ON
Symbol=OFF Symbol=OFF

2
trunk/yav_mcu_bsr.prj
View File

@ -838,7 +838,7 @@ G=1
E=0 E=0
E0=flash.elk E0=flash.elk
E1=a.elk E1=a.elk
GO=0 GO=1
GOValue=85 GOValue=85
GOStart=FC00 GOStart=FC00
GOSizeValue=1024 GOSizeValue=1024