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

telがvolを読むときに期待したのと違うのが取れることがあった

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@257 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2010-10-22 04:58:46 +00:00
parent 97d892f167
commit 3534aef9f4
10 changed files with 917 additions and 893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
trunk/adc.c
View File

@ -9,9 +9,8 @@
#include "led.h" #include "led.h"
#include "vreg_twl.h"
//#define _4db_
//#define _15db_
#define _10db_ #define _10db_
#include "voltable.h" #include "voltable.h"
@ -51,6 +50,12 @@ filter_work work_vr_vol = {
}; };
// twl の8段階volのリニア値からの境界
const u8 TWL_VOL_BOUNDARY[] = {
// 0, 2, 6, 11, 16, 21, 26, 31
0, 4, 8, 13, 18, 23, 28, 31
};
// ===================================================== // // ===================================================== //
extern void nop8(); extern void nop8();
static void adc_filter( u8 new_val, filter_work* work ); static void adc_filter( u8 new_val, filter_work* work );
@ -217,6 +222,25 @@ task_status_immed tski_vol_update()
{ {
vreg_twl[ REG_TWL_INT_ADRS_VOL ] = sent_index/2 ; vreg_twl[ REG_TWL_INT_ADRS_VOL ] = sent_index/2 ;
} }
// 8段階のレベル化。　割り込みを入れるのに必要
{
u8 new_level = 31;
u8 i;
// 8段レベルに変換
for( i=0; i<=7; i++ )
{
if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] )
{
new_level = i;
break;
}
}
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 )

900
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.

805
trunk/bsr_k0r.map
View File

@ -1,7 +1,7 @@
78K0R Linker W1.31 Date:13 Oct 2010 Page: 1 78K0R Linker W1.31 Date:22 Oct 2010 Page: 1
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
@ -23,8 +23,8 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
64 output segment(s) 64 output segment(s)
3EACH byte(s) real data 3E9DH byte(s) real data
5491 symbol(s) defined 5401 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -97,55 +97,55 @@ 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 00925H CSEG LDR_CODE 000CEH 0092BH CSEG
LDR_CODE loader 000CEH 001F3H LDR_CODE loader 000CEH 001F9H
LDR_CODE main 002C1H 00049H LDR_CODE main 002C7H 00046H
LDR_CODE WDT 0030AH 00000H LDR_CODE WDT 0030DH 00000H
LDR_CODE i2c_mcu 0030AH 002F1H LDR_CODE i2c_mcu 0030DH 002F1H
LDR_CODE self_flash LDR_CODE self_flash
005FBH 00370H 005FEH 00373H
LDR_CODE task_debug LDR_CODE task_debug
0096BH 00000H 00971H 00000H
LDR_CODE task_status LDR_CODE task_status
0096BH 00088H 00971H 00088H
FSL_CODE 009F3H 00322H CSEG FSL_CODE 009F9H 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
009F3H 0002BH 009F9H 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
00A1EH 00013H 00A24H 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
00A31H 0014FH 00A37H 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00B80H 00001H 00B86H 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00B81H 00064H 00B87H 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00BE5H 0004DH 00BEBH 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00C32H 00061H 00C38H 00061H
FSL_CODE fsl_swap 00C93H 00030H FSL_CODE fsl_swap 00C99H 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00CC3H 00052H 00CC9H 00052H
@@LCODE 00D15H 002AFH CSEG @@LCODE 00D1BH 002AFH CSEG
@@LCODE @cstart 00D15H 0006DH @@LCODE @cstart 00D1BH 0006DH
@@LCODE @imul 00D82H 00011H @@LCODE @imul 00D88H 00011H
@@LCODE @lumul 00D93H 0002BH @@LCODE @lumul 00D99H 0002BH
@@LCODE @isdiv 00DBEH 00022H @@LCODE @isdiv 00DC4H 00022H
@@LCODE @iudiv 00DE0H 0002DH @@LCODE @iudiv 00DE6H 0002DH
@@LCODE @isrem 00E0DH 00021H @@LCODE @isrem 00E13H 00021H
@@LCODE @iurem 00E2EH 0002FH @@LCODE @iurem 00E34H 0002FH
@@LCODE @lsdiv 00E5DH 00039H @@LCODE @lsdiv 00E63H 00039H
@@LCODE @ludiv 00E96H 0003FH @@LCODE @ludiv 00E9CH 0003FH
@@LCODE @divuw 00ED5H 00034H @@LCODE @divuw 00EDBH 00034H
@@LCODE @ladd 00F09H 0000FH @@LCODE @ladd 00F0FH 0000FH
@@LCODE @llsh 00F18H 0001BH @@LCODE @llsh 00F1EH 0001BH
@@LCODE @lursh 00F33H 0001FH @@LCODE @lursh 00F39H 0001FH
@@LCODE @iscmp 00F52H 0000CH @@LCODE @iscmp 00F58H 0000CH
@@LCODE @lscmp 00F5EH 00014H @@LCODE @lscmp 00F64H 00014H
@@LCODE @lband 00F72H 00014H @@LCODE @lband 00F78H 00014H
@@LCODE @bcdtob 00F86H 0001AH @@LCODE @bcdtob 00F8CH 0001AH
@@LCODE @bbcd 00FA0H 00024H @@LCODE @bbcd 00FA6H 00024H
* gap * 00FC4H 00032H * gap * 00FCAH 0002CH
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -169,250 +169,251 @@ Direc-file:bsr_mcu.dr
@@CNST rtc 02244H 00000H @@CNST rtc 02244H 00000H
@@CNST vreg_ctr 02244H 00000H @@CNST vreg_ctr 02244H 00000H
@@CNST vreg_twl 02244H 00000H @@CNST vreg_twl 02244H 00000H
@@CNST adc 02244H 00040H @@CNST adc 02244H 00048H
@@CNST renge 02284H 00000H @@CNST renge 0228CH 00000H
@@CNST accero 02284H 00000H @@CNST accero 0228CH 00000H
@@CNST self_flash @@CNST self_flash
02284H 00002H 0228CH 00002H
@@CNST sw 02286H 00000H @@CNST sw 0228EH 00000H
@@CNST task_debug @@CNST task_debug
02286H 00000H 0228EH 00000H
@@CNST task_misc @@CNST task_misc
02286H 00008H 0228EH 00000H
@@CNST task_sys 0228EH 00000H @@CNST task_sys 0228EH 00000H
@@CNST pedo_alg_thre_det2 @@CNST pedo_alg_thre_det2
0228EH 0004AH 0228EH 0004AH
@@CNST ini_VECT 022D8H 00000H @@CNST ini_VECT 022D8H 00000H
@@CNST task_status @@CNST task_status
022D8H 00000H 022D8H 00000H
ROM_CODE 022D8H 02744H CSEG ROM_CODE 022D8H 02723H CSEG
ROM_CODE pm 022D8H 00A18H ROM_CODE pm 022D8H 00A14H
ROM_CODE i2c_ctr 02CF0H 00060H ROM_CODE i2c_ctr 02CECH 00060H
ROM_CODE i2c_twl 02D50H 0005EH ROM_CODE i2c_twl 02D4CH 0005EH
ROM_CODE led 02DAEH 0051AH ROM_CODE led 02DAAH 0051AH
ROM_CODE rtc 032C8H 000E0H ROM_CODE rtc 032C4H 000E0H
ROM_CODE vreg_ctr 033A8H 00475H ROM_CODE vreg_ctr 033A4H 00475H
ROM_CODE vreg_twl 0381DH 0011DH ROM_CODE vreg_twl 03819H 0010AH
ROM_CODE adc 0393AH 002C1H ROM_CODE adc 03923H 002E2H
ROM_CODE renge 03BFBH 00187H ROM_CODE renge 03C05H 00190H
ROM_CODE accero 03D82H 0013DH ROM_CODE accero 03D95H 0013DH
ROM_CODE sw 03EBFH 00113H ROM_CODE sw 03ED2H 00112H
ROM_CODE task_misc ROM_CODE task_misc
03FD2H 001C7H 03FE4H 001A9H
ROM_CODE task_sys 04199H 00385H ROM_CODE task_sys 0418DH 0037CH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
0451EH 004FEH 04509H 004F2H
@@BASE 04A1CH 00502H CSEG BASE @@BASE 049FBH 0050EH CSEG BASE
@@BASE loader 04A1CH 00000H @@BASE loader 049FBH 00000H
@@BASE pm 04A1CH 0003FH @@BASE pm 049FBH 0003FH
@@BASE i2c_ctr 04A5BH 00198H @@BASE i2c_ctr 04A3AH 00198H
@@BASE main 04BF3H 00000H @@BASE main 04BD2H 00000H
@@BASE magic 04BF3H 00000H @@BASE magic 04BD2H 00000H
@@BASE WDT 04BF3H 00000H @@BASE WDT 04BD2H 00000H
@@BASE i2c_mcu 04BF3H 000D9H @@BASE i2c_mcu 04BD2H 000D9H
@@BASE i2c_twl 04CCCH 000CBH @@BASE i2c_twl 04CABH 000CBH
@@BASE led 04D97H 00000H @@BASE led 04D76H 00000H
@@BASE rtc 04D97H 00052H @@BASE rtc 04D76H 0005EH
@@BASE vreg_ctr 04DE9H 00000H @@BASE vreg_ctr 04DD4H 00000H
@@BASE vreg_twl 04DE9H 00000H @@BASE vreg_twl 04DD4H 00000H
@@BASE adc 04DE9H 000B3H @@BASE adc 04DD4H 000B3H
@@BASE renge 04E9CH 00000H @@BASE renge 04E87H 00000H
@@BASE accero 04E9CH 0004AH @@BASE accero 04E87H 0004AH
@@BASE self_flash @@BASE self_flash
04EE6H 00000H 04ED1H 00000H
@@BASE sw 04EE6H 00000H @@BASE sw 04ED1H 00000H
@@BASE task_debug @@BASE task_debug
04EE6H 00000H 04ED1H 00000H
@@BASE task_misc @@BASE task_misc
04EE6H 00000H 04ED1H 00000H
@@BASE task_sys 04EE6H 00000H @@BASE task_sys 04ED1H 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04EE6H 00000H 04ED1H 00000H
@@BASE ini_VECT 04EE6H 00038H @@BASE ini_VECT 04ED1H 00038H
@@BASE task_status @@BASE task_status
04F1EH 00000H 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04F1EH 00000H @@CNSTL @cstart 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL pm 04F1EH 00000H @@CNSTL pm 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04F1EH 00000H @@CNSTL i2c_ctr 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04F1EH 00000H @@CNSTL i2c_twl 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL led 04F1EH 00000H @@CNSTL led 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL rtc 04F1EH 00000H @@CNSTL rtc 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04F1EH 00000H @@CNSTL vreg_ctr 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04F1EH 00000H @@CNSTL vreg_twl 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL adc 04F1EH 00000H @@CNSTL adc 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL renge 04F1EH 00000H @@CNSTL renge 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL accero 04F1EH 00000H @@CNSTL accero 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL sw 04F1EH 00000H @@CNSTL sw 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04F1EH 00000H 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04F1EH 00000H @@CNSTL task_sys 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04F1EH 00000H 04F09H 00000H
@@CNSTL 04F1EH 00000H CSEG PAGE64KP @@CNSTL 04F09H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04F1EH 00000H @@CNSTL ini_VECT 04F09H 00000H
@@CNSTL 04F1EH 0000AH CSEG PAGE64KP @@R_INIS 04F09H 00000H CSEG UNIT64KP
@@CNSTL @bcdtob 04F1EH 0000AH @@R_INIS @cstart 04F09H 00000H
@@CNSTL 04F28H 00010H CSEG PAGE64KP @@R_INIS loader 04F09H 00000H
@@CNSTL @bbcd 04F28H 00010H @@R_INIS pm 04F09H 00000H
@@R_INIT 04F38H 0003AH CSEG UNIT64KP @@R_INIS i2c_ctr 04F09H 00000H
@@R_INIT @cstart 04F38H 00000H @@R_INIS main 04F09H 00000H
@@R_INIT loader 04F38H 00000H @@R_INIS magic 04F09H 00000H
@@R_INIT pm 04F38H 00002H @@R_INIS WDT 04F09H 00000H
@@R_INIT i2c_ctr 04F3AH 00002H @@R_INIS i2c_mcu 04F09H 00000H
@@R_INIT main 04F3CH 00000H @@R_INIS i2c_twl 04F09H 00000H
@@R_INIT magic 04F3CH 00000H @@R_INIS led 04F09H 00000H
@@R_INIT WDT 04F3CH 00000H @@R_INIS rtc 04F09H 00000H
@@R_INIT i2c_mcu 04F3CH 00000H @@R_INIS vreg_ctr 04F09H 00000H
@@R_INIT i2c_twl 04F3CH 00000H @@R_INIS vreg_twl 04F09H 00000H
@@R_INIT led 04F3CH 00006H @@R_INIS adc 04F09H 00000H
@@R_INIT rtc 04F42H 00000H @@R_INIS renge 04F09H 00000H
@@R_INIT vreg_ctr 04F42H 00000H @@R_INIS accero 04F09H 00000H
@@R_INIT vreg_twl 04F42H 00000H
@@R_INIT adc 04F42H 0000CH
@@R_INIT renge 04F4EH 00014H
@@R_INIT accero 04F62H 00000H
@@R_INIT self_flash
04F62H 00000H
@@R_INIT sw 04F62H 00002H
@@R_INIT task_debug
04F64H 00000H
@@R_INIT task_misc
04F64H 00000H
@@R_INIT task_sys 04F64H 00002H
@@R_INIT pedo_alg_thre_det2
04F66H 0000AH
@@R_INIT ini_VECT 04F70H 00000H
@@R_INIT task_status
04F70H 00002H
@@R_INIT @rom 04F72H 00000H
@@R_INIS 04F72H 00000H CSEG UNIT64KP
@@R_INIS @cstart 04F72H 00000H
@@R_INIS loader 04F72H 00000H
@@R_INIS pm 04F72H 00000H
@@R_INIS i2c_ctr 04F72H 00000H
@@R_INIS main 04F72H 00000H
@@R_INIS magic 04F72H 00000H
@@R_INIS WDT 04F72H 00000H
@@R_INIS i2c_mcu 04F72H 00000H
@@R_INIS i2c_twl 04F72H 00000H
@@R_INIS led 04F72H 00000H
@@R_INIS rtc 04F72H 00000H
@@R_INIS vreg_ctr 04F72H 00000H
@@R_INIS vreg_twl 04F72H 00000H
@@R_INIS adc 04F72H 00000H
@@R_INIS renge 04F72H 00000H
@@R_INIS accero 04F72H 00000H
@@R_INIS self_flash @@R_INIS self_flash
04F72H 00000H 04F09H 00000H
@@R_INIS sw 04F72H 00000H @@R_INIS sw 04F09H 00000H
@@R_INIS task_debug @@R_INIS task_debug
04F72H 00000H 04F09H 00000H
@@R_INIS task_misc @@R_INIS task_misc
04F72H 00000H 04F09H 00000H
@@R_INIS task_sys 04F72H 00000H @@R_INIS task_sys 04F09H 00000H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04F72H 00000H 04F09H 00000H
@@R_INIS ini_VECT 04F72H 00000H @@R_INIS ini_VECT 04F09H 00000H
@@R_INIS task_status @@R_INIS task_status
04F72H 00000H 04F09H 00000H
@@R_INIS @rom 04F72H 00000H @@R_INIS @rom 04F09H 00000H
@@CALT 04F72H 00000H CSEG @@CALT 04F09H 00000H CSEG
@@CALT @cstart 04F72H 00000H @@CALT @cstart 04F09H 00000H
@@CALT loader 04F72H 00000H @@CALT loader 04F09H 00000H
@@CALT pm 04F72H 00000H @@CALT pm 04F09H 00000H
@@CALT i2c_ctr 04F72H 00000H @@CALT i2c_ctr 04F09H 00000H
@@CALT main 04F72H 00000H @@CALT main 04F09H 00000H
@@CALT magic 04F72H 00000H @@CALT magic 04F09H 00000H
@@CALT WDT 04F72H 00000H @@CALT WDT 04F09H 00000H
@@CALT i2c_mcu 04F72H 00000H @@CALT i2c_mcu 04F09H 00000H
@@CALT i2c_twl 04F72H 00000H @@CALT i2c_twl 04F09H 00000H
@@CALT led 04F72H 00000H @@CALT led 04F09H 00000H
@@CALT rtc 04F72H 00000H @@CALT rtc 04F09H 00000H
@@CALT vreg_ctr 04F72H 00000H @@CALT vreg_ctr 04F09H 00000H
@@CALT vreg_twl 04F72H 00000H @@CALT vreg_twl 04F09H 00000H
@@CALT adc 04F72H 00000H @@CALT adc 04F09H 00000H
@@CALT renge 04F72H 00000H @@CALT renge 04F09H 00000H
@@CALT accero 04F72H 00000H @@CALT accero 04F09H 00000H
@@CALT self_flash @@CALT self_flash
04F72H 00000H 04F09H 00000H
@@CALT sw 04F72H 00000H @@CALT sw 04F09H 00000H
@@CALT task_debug @@CALT task_debug
04F72H 00000H 04F09H 00000H
@@CALT task_misc @@CALT task_misc
04F72H 00000H 04F09H 00000H
@@CALT task_sys 04F72H 00000H @@CALT task_sys 04F09H 00000H
@@CALT pedo_alg_thre_det2 @@CALT pedo_alg_thre_det2
04F72H 00000H 04F09H 00000H
@@CALT ini_VECT 04F72H 00000H @@CALT ini_VECT 04F09H 00000H
@@CALT task_status @@CALT task_status
04F72H 00000H 04F09H 00000H
@@RLINIT 04F72H 00000H CSEG UNIT64KP @@RLINIT 04F09H 00000H CSEG UNIT64KP
@@RLINIT loader 04F72H 00000H @@RLINIT loader 04F09H 00000H
@@RLINIT pm 04F72H 00000H @@RLINIT pm 04F09H 00000H
@@RLINIT i2c_ctr 04F72H 00000H @@RLINIT i2c_ctr 04F09H 00000H
@@RLINIT main 04F72H 00000H @@RLINIT main 04F09H 00000H
@@RLINIT magic 04F72H 00000H @@RLINIT magic 04F09H 00000H
@@RLINIT WDT 04F72H 00000H @@RLINIT WDT 04F09H 00000H
@@RLINIT i2c_mcu 04F72H 00000H @@RLINIT i2c_mcu 04F09H 00000H
@@RLINIT i2c_twl 04F72H 00000H @@RLINIT i2c_twl 04F09H 00000H
@@RLINIT led 04F72H 00000H @@RLINIT led 04F09H 00000H
@@RLINIT rtc 04F72H 00000H @@RLINIT rtc 04F09H 00000H
@@RLINIT vreg_ctr 04F72H 00000H @@RLINIT vreg_ctr 04F09H 00000H
@@RLINIT vreg_twl 04F72H 00000H @@RLINIT vreg_twl 04F09H 00000H
@@RLINIT adc 04F72H 00000H @@RLINIT adc 04F09H 00000H
@@RLINIT renge 04F72H 00000H @@RLINIT renge 04F09H 00000H
@@RLINIT accero 04F72H 00000H @@RLINIT accero 04F09H 00000H
@@RLINIT self_flash @@RLINIT self_flash
04F72H 00000H 04F09H 00000H
@@RLINIT sw 04F72H 00000H @@RLINIT sw 04F09H 00000H
@@RLINIT task_debug @@RLINIT task_debug
04F72H 00000H 04F09H 00000H
@@RLINIT task_misc @@RLINIT task_misc
04F72H 00000H 04F09H 00000H
@@RLINIT task_sys 04F72H 00000H @@RLINIT task_sys 04F09H 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04F72H 00000H 04F09H 00000H
@@RLINIT ini_VECT 04F72H 00000H @@RLINIT ini_VECT 04F09H 00000H
@@RLINIT task_status @@RLINIT task_status
04F72H 00000H 04F09H 00000H
@@RLINIT @rom 04F72H 00000H @@RLINIT @rom 04F09H 00000H
@@CODEL 04F72H 00000H CSEG @@CODEL 04F09H 00000H CSEG
@@CODEL pm 04F72H 00000H @@CODEL pm 04F09H 00000H
@@CODEL i2c_ctr 04F72H 00000H @@CODEL i2c_ctr 04F09H 00000H
@@CODEL magic 04F72H 00000H @@CODEL magic 04F09H 00000H
@@CODEL i2c_twl 04F72H 00000H @@CODEL i2c_twl 04F09H 00000H
@@CODEL led 04F72H 00000H @@CODEL led 04F09H 00000H
@@CODEL rtc 04F72H 00000H @@CODEL rtc 04F09H 00000H
@@CODEL vreg_ctr 04F72H 00000H @@CODEL vreg_ctr 04F09H 00000H
@@CODEL vreg_twl 04F72H 00000H @@CODEL vreg_twl 04F09H 00000H
@@CODEL adc 04F72H 00000H @@CODEL adc 04F09H 00000H
@@CODEL renge 04F72H 00000H @@CODEL renge 04F09H 00000H
@@CODEL accero 04F72H 00000H @@CODEL accero 04F09H 00000H
@@CODEL sw 04F72H 00000H @@CODEL sw 04F09H 00000H
@@CODEL task_misc @@CODEL task_misc
04F72H 00000H 04F09H 00000H
@@CODEL task_sys 04F72H 00000H @@CODEL task_sys 04F09H 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04F72H 00000H 04F09H 00000H
@@CODEL ini_VECT 04F72H 00000H @@CODEL ini_VECT 04F09H 00000H
@@LCODEL 04F72H 00008H CSEG * gap * 04F09H 00001H
@@LCODEL abs 04F72H 00008H @@CNSTL 04F0AH 0000AH CSEG PAGE64KP
* gap * 04F7AH 0007CH @@CNSTL @bcdtob 04F0AH 0000AH
@@CNSTL 04F14H 00010H CSEG PAGE64KP
@@CNSTL @bbcd 04F14H 00010H
@@R_INIT 04F24H 0003AH CSEG UNIT64KP
@@R_INIT @cstart 04F24H 00000H
@@R_INIT loader 04F24H 00000H
@@R_INIT pm 04F24H 00002H
@@R_INIT i2c_ctr 04F26H 00002H
@@R_INIT main 04F28H 00000H
@@R_INIT magic 04F28H 00000H
@@R_INIT WDT 04F28H 00000H
@@R_INIT i2c_mcu 04F28H 00000H
@@R_INIT i2c_twl 04F28H 00000H
@@R_INIT led 04F28H 00006H
@@R_INIT rtc 04F2EH 00000H
@@R_INIT vreg_ctr 04F2EH 00000H
@@R_INIT vreg_twl 04F2EH 00000H
@@R_INIT adc 04F2EH 0000CH
@@R_INIT renge 04F3AH 00014H
@@R_INIT accero 04F4EH 00000H
@@R_INIT self_flash
04F4EH 00000H
@@R_INIT sw 04F4EH 00002H
@@R_INIT task_debug
04F50H 00000H
@@R_INIT task_misc
04F50H 00000H
@@R_INIT task_sys 04F50H 00002H
@@R_INIT pedo_alg_thre_det2
04F52H 0000AH
@@R_INIT ini_VECT 04F5CH 00000H
@@R_INIT task_status
04F5CH 00002H
@@R_INIT @rom 04F5EH 00000H
@@LCODEL 04F5EH 00008H CSEG
@@LCODEL abs 04F5EH 00008H
* gap * 04F66H 00090H
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH MGC_TAIL magic 04FF6H 0000AH
@ -420,7 +421,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 0042CH DSEG BASEP @@DATA FF900H 0042EH 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
@ -433,181 +434,181 @@ Direc-file:bsr_mcu.dr
@@DATA led FFB44H 00088H @@DATA led FFB44H 00088H
@@DATA rtc FFBCCH 00008H @@DATA rtc FFBCCH 00008H
@@DATA vreg_ctr FFBD4H 0005EH @@DATA vreg_ctr FFBD4H 0005EH
@@DATA vreg_twl FFC32H 00010H @@DATA vreg_twl FFC32H 00012H
@@DATA adc FFC42H 00018H @@DATA adc FFC44H 00018H
@@DATA renge FFC5AH 0001EH @@DATA renge FFC5CH 00022H
@@DATA accero FFC78H 00002H @@DATA accero FFC7EH 00002H
@@DATA self_flash @@DATA self_flash
FFC7AH 00002H FFC80H 00002H
@@DATA sw FFC7CH 00006H @@DATA sw FFC82H 00006H
@@DATA task_debug @@DATA task_debug
FFC82H 00000H FFC88H 00000H
@@DATA task_misc @@DATA task_misc
FFC82H 00010H FFC88H 0000CH
@@DATA task_sys FFC92H 00002H @@DATA task_sys FFC94H 00002H
@@DATA pedo_alg_thre_det2 @@DATA pedo_alg_thre_det2
FFC94H 00096H FFC96H 00096H
@@DATA ini_VECT FFD2AH 00000H @@DATA ini_VECT FFD2CH 00000H
@@DATA task_status @@DATA task_status
FFD2AH 00002H FFD2CH 00002H
@@DATA @rom FFD2CH 00000H @@DATA @rom FFD2EH 00000H
@@INIT FFD2CH 0003AH DSEG BASEP @@INIT FFD2EH 0003AH DSEG BASEP
@@INIT @cstart FFD2CH 00000H @@INIT @cstart FFD2EH 00000H
@@INIT loader FFD2CH 00000H @@INIT loader FFD2EH 00000H
@@INIT pm FFD2CH 00002H @@INIT pm FFD2EH 00002H
@@INIT i2c_ctr FFD2EH 00002H @@INIT i2c_ctr FFD30H 00002H
@@INIT main FFD30H 00000H @@INIT main FFD32H 00000H
@@INIT magic FFD30H 00000H @@INIT magic FFD32H 00000H
@@INIT WDT FFD30H 00000H @@INIT WDT FFD32H 00000H
@@INIT i2c_mcu FFD30H 00000H @@INIT i2c_mcu FFD32H 00000H
@@INIT i2c_twl FFD30H 00000H @@INIT i2c_twl FFD32H 00000H
@@INIT led FFD30H 00006H @@INIT led FFD32H 00006H
@@INIT rtc FFD36H 00000H @@INIT rtc FFD38H 00000H
@@INIT vreg_ctr FFD36H 00000H @@INIT vreg_ctr FFD38H 00000H
@@INIT vreg_twl FFD36H 00000H @@INIT vreg_twl FFD38H 00000H
@@INIT adc FFD36H 0000CH @@INIT adc FFD38H 0000CH
@@INIT renge FFD42H 00014H @@INIT renge FFD44H 00014H
@@INIT accero FFD56H 00000H @@INIT accero FFD58H 00000H
@@INIT self_flash @@INIT self_flash
FFD56H 00000H FFD58H 00000H
@@INIT sw FFD56H 00002H @@INIT sw FFD58H 00002H
@@INIT task_debug @@INIT task_debug
FFD58H 00000H FFD5AH 00000H
@@INIT task_misc @@INIT task_misc
FFD58H 00000H FFD5AH 00000H
@@INIT task_sys FFD58H 00002H @@INIT task_sys FFD5AH 00002H
@@INIT pedo_alg_thre_det2 @@INIT pedo_alg_thre_det2
FFD5AH 0000AH FFD5CH 0000AH
@@INIT ini_VECT FFD64H 00000H @@INIT ini_VECT FFD66H 00000H
@@INIT task_status @@INIT task_status
FFD64H 00002H FFD66H 00002H
@@INIT @rom FFD66H 00000H @@INIT @rom FFD68H 00000H
@@INIS FFD66H 00000H DSEG UNITP @@INIS FFD68H 00000H DSEG UNITP
@@INIS @cstart FFD66H 00000H @@INIS @cstart FFD68H 00000H
@@INIS loader FFD66H 00000H @@INIS loader FFD68H 00000H
@@INIS pm FFD66H 00000H @@INIS pm FFD68H 00000H
@@INIS i2c_ctr FFD66H 00000H @@INIS i2c_ctr FFD68H 00000H
@@INIS main FFD66H 00000H @@INIS main FFD68H 00000H
@@INIS magic FFD66H 00000H @@INIS magic FFD68H 00000H
@@INIS WDT FFD66H 00000H @@INIS WDT FFD68H 00000H
@@INIS i2c_mcu FFD66H 00000H @@INIS i2c_mcu FFD68H 00000H
@@INIS i2c_twl FFD66H 00000H @@INIS i2c_twl FFD68H 00000H
@@INIS led FFD66H 00000H @@INIS led FFD68H 00000H
@@INIS rtc FFD66H 00000H @@INIS rtc FFD68H 00000H
@@INIS vreg_ctr FFD66H 00000H @@INIS vreg_ctr FFD68H 00000H
@@INIS vreg_twl FFD66H 00000H @@INIS vreg_twl FFD68H 00000H
@@INIS adc FFD66H 00000H @@INIS adc FFD68H 00000H
@@INIS renge FFD66H 00000H @@INIS renge FFD68H 00000H
@@INIS accero FFD66H 00000H @@INIS accero FFD68H 00000H
@@INIS self_flash @@INIS self_flash
FFD66H 00000H FFD68H 00000H
@@INIS sw FFD66H 00000H @@INIS sw FFD68H 00000H
@@INIS task_debug @@INIS task_debug
FFD66H 00000H FFD68H 00000H
@@INIS task_misc @@INIS task_misc
FFD66H 00000H FFD68H 00000H
@@INIS task_sys FFD66H 00000H @@INIS task_sys FFD68H 00000H
@@INIS pedo_alg_thre_det2 @@INIS pedo_alg_thre_det2
FFD66H 00000H FFD68H 00000H
@@INIS ini_VECT FFD66H 00000H @@INIS ini_VECT FFD68H 00000H
@@INIS task_status @@INIS task_status
FFD66H 00000H FFD68H 00000H
@@INIS @rom FFD66H 00000H @@INIS @rom FFD68H 00000H
@@DATS FFD66H 00000H DSEG UNITP @@DATS FFD68H 00000H DSEG UNITP
@@DATS @cstart FFD66H 00000H @@DATS @cstart FFD68H 00000H
@@DATS loader FFD66H 00000H @@DATS loader FFD68H 00000H
@@DATS pm FFD66H 00000H @@DATS pm FFD68H 00000H
@@DATS i2c_ctr FFD66H 00000H @@DATS i2c_ctr FFD68H 00000H
@@DATS main FFD66H 00000H @@DATS main FFD68H 00000H
@@DATS magic FFD66H 00000H @@DATS magic FFD68H 00000H
@@DATS WDT FFD66H 00000H @@DATS WDT FFD68H 00000H
@@DATS i2c_mcu FFD66H 00000H @@DATS i2c_mcu FFD68H 00000H
@@DATS i2c_twl FFD66H 00000H @@DATS i2c_twl FFD68H 00000H
@@DATS led FFD66H 00000H @@DATS led FFD68H 00000H
@@DATS rtc FFD66H 00000H @@DATS rtc FFD68H 00000H
@@DATS vreg_ctr FFD66H 00000H @@DATS vreg_ctr FFD68H 00000H
@@DATS vreg_twl FFD66H 00000H @@DATS vreg_twl FFD68H 00000H
@@DATS adc FFD66H 00000H @@DATS adc FFD68H 00000H
@@DATS renge FFD66H 00000H @@DATS renge FFD68H 00000H
@@DATS accero FFD66H 00000H @@DATS accero FFD68H 00000H
@@DATS self_flash @@DATS self_flash
FFD66H 00000H FFD68H 00000H
@@DATS sw FFD66H 00000H @@DATS sw FFD68H 00000H
@@DATS task_debug @@DATS task_debug
FFD66H 00000H FFD68H 00000H
@@DATS task_misc @@DATS task_misc
FFD66H 00000H FFD68H 00000H
@@DATS task_sys FFD66H 00000H @@DATS task_sys FFD68H 00000H
@@DATS pedo_alg_thre_det2 @@DATS pedo_alg_thre_det2
FFD66H 00000H FFD68H 00000H
@@DATS ini_VECT FFD66H 00000H @@DATS ini_VECT FFD68H 00000H
@@DATS task_status @@DATS task_status
FFD66H 00000H FFD68H 00000H
@@DATS @rom FFD66H 00000H @@DATS @rom FFD68H 00000H
FSL_DATA FFD66H 00010H DSEG UNITP FSL_DATA FFD68H 00010H DSEG UNITP
FSL_DATA fsl_common FSL_DATA fsl_common
FFD66H 00010H FFD68H 00010H
@@INITL FFD76H 00000H DSEG UNIT64KP @@INITL FFD78H 00000H DSEG UNIT64KP
@@INITL loader FFD76H 00000H @@INITL loader FFD78H 00000H
@@INITL pm FFD76H 00000H @@INITL pm FFD78H 00000H
@@INITL i2c_ctr FFD76H 00000H @@INITL i2c_ctr FFD78H 00000H
@@INITL main FFD76H 00000H @@INITL main FFD78H 00000H
@@INITL magic FFD76H 00000H @@INITL magic FFD78H 00000H
@@INITL WDT FFD76H 00000H @@INITL WDT FFD78H 00000H
@@INITL i2c_mcu FFD76H 00000H @@INITL i2c_mcu FFD78H 00000H
@@INITL i2c_twl FFD76H 00000H @@INITL i2c_twl FFD78H 00000H
@@INITL led FFD76H 00000H @@INITL led FFD78H 00000H
@@INITL rtc FFD76H 00000H @@INITL rtc FFD78H 00000H
@@INITL vreg_ctr FFD76H 00000H @@INITL vreg_ctr FFD78H 00000H
@@INITL vreg_twl FFD76H 00000H @@INITL vreg_twl FFD78H 00000H
@@INITL adc FFD76H 00000H @@INITL adc FFD78H 00000H
@@INITL renge FFD76H 00000H @@INITL renge FFD78H 00000H
@@INITL accero FFD76H 00000H @@INITL accero FFD78H 00000H
@@INITL self_flash @@INITL self_flash
FFD76H 00000H FFD78H 00000H
@@INITL sw FFD76H 00000H @@INITL sw FFD78H 00000H
@@INITL task_debug @@INITL task_debug
FFD76H 00000H FFD78H 00000H
@@INITL task_misc @@INITL task_misc
FFD76H 00000H FFD78H 00000H
@@INITL task_sys FFD76H 00000H @@INITL task_sys FFD78H 00000H
@@INITL pedo_alg_thre_det2 @@INITL pedo_alg_thre_det2
FFD76H 00000H FFD78H 00000H
@@INITL ini_VECT FFD76H 00000H @@INITL ini_VECT FFD78H 00000H
@@INITL task_status @@INITL task_status
FFD76H 00000H FFD78H 00000H
@@INITL @rom FFD76H 00000H @@INITL @rom FFD78H 00000H
@@DATAL FFD76H 00000H DSEG UNIT64KP @@DATAL FFD78H 00000H DSEG UNIT64KP
@@DATAL loader FFD76H 00000H @@DATAL loader FFD78H 00000H
@@DATAL pm FFD76H 00000H @@DATAL pm FFD78H 00000H
@@DATAL i2c_ctr FFD76H 00000H @@DATAL i2c_ctr FFD78H 00000H
@@DATAL main FFD76H 00000H @@DATAL main FFD78H 00000H
@@DATAL magic FFD76H 00000H @@DATAL magic FFD78H 00000H
@@DATAL WDT FFD76H 00000H @@DATAL WDT FFD78H 00000H
@@DATAL i2c_mcu FFD76H 00000H @@DATAL i2c_mcu FFD78H 00000H
@@DATAL i2c_twl FFD76H 00000H @@DATAL i2c_twl FFD78H 00000H
@@DATAL led FFD76H 00000H @@DATAL led FFD78H 00000H
@@DATAL rtc FFD76H 00000H @@DATAL rtc FFD78H 00000H
@@DATAL vreg_ctr FFD76H 00000H @@DATAL vreg_ctr FFD78H 00000H
@@DATAL vreg_twl FFD76H 00000H @@DATAL vreg_twl FFD78H 00000H
@@DATAL adc FFD76H 00000H @@DATAL adc FFD78H 00000H
@@DATAL renge FFD76H 00000H @@DATAL renge FFD78H 00000H
@@DATAL accero FFD76H 00000H @@DATAL accero FFD78H 00000H
@@DATAL self_flash @@DATAL self_flash
FFD76H 00000H FFD78H 00000H
@@DATAL sw FFD76H 00000H @@DATAL sw FFD78H 00000H
@@DATAL task_debug @@DATAL task_debug
FFD76H 00000H FFD78H 00000H
@@DATAL task_misc @@DATAL task_misc
FFD76H 00000H FFD78H 00000H
@@DATAL task_sys FFD76H 00000H @@DATAL task_sys FFD78H 00000H
@@DATAL pedo_alg_thre_det2 @@DATAL pedo_alg_thre_det2
FFD76H 00000H FFD78H 00000H
@@DATAL ini_VECT FFD76H 00000H @@DATAL ini_VECT FFD78H 00000H
@@DATAL task_status @@DATAL task_status
FFD76H 00000H FFD78H 00000H
@@DATAL @rom FFD76H 00000H @@DATAL @rom FFD78H 00000H
* gap * FFD76H 0008AH * gap * FFD78H 00088H
MEMORY=RAM2 MEMORY=RAM2
BASE ADDRESS=FFE20H SIZE=000C0H BASE ADDRESS=FFE20H SIZE=000C0H
@ -628,16 +629,16 @@ Direc-file:bsr_mcu.dr
@@BITS vreg_ctr FFE22H.2 00000H.1 @@BITS vreg_ctr FFE22H.2 00000H.1
@@BITS vreg_twl FFE22H.3 00000H.0 @@BITS vreg_twl FFE22H.3 00000H.0
@@BITS adc FFE22H.3 00000H.4 @@BITS adc FFE22H.3 00000H.4
@@BITS renge FFE22H.7 00000H.2 @@BITS renge FFE22H.7 00000H.3
@@BITS accero FFE23H.1 00000H.0 @@BITS accero FFE23H.2 00000H.0
@@BITS self_flash @@BITS self_flash
FFE23H.1 00000H.0 FFE23H.2 00000H.0
@@BITS sw FFE23H.1 00000H.2 @@BITS sw FFE23H.2 00000H.2
@@BITS task_debug @@BITS task_debug
FFE23H.3 00000H.0 FFE23H.4 00000H.0
@@BITS task_misc @@BITS task_misc
FFE23H.3 00000H.2 FFE23H.4 00000H.2
@@BITS task_sys FFE23H.5 00000H.1 @@BITS task_sys FFE23H.6 00000H.0
@@BITS pedo_alg_thre_det2 @@BITS pedo_alg_thre_det2
FFE23H.6 00000H.1 FFE23H.6 00000H.1
@@BITS ini_VECT FFE23H.7 00000H.0 @@BITS ini_VECT FFE23H.7 00000H.0

BIN
trunk/hoge.bin
View File

Binary file not shown.

34
trunk/task_misc.c
View File

@ -11,6 +11,8 @@
#include "adc.h" #include "adc.h"
#include "i2c_mcu.h" #include "i2c_mcu.h"
#include "led.h" #include "led.h"
#include "vreg_twl.h"
#ifdef _MCU_BSR_ #ifdef _MCU_BSR_
@ -49,12 +51,6 @@
bit twl_ver_read; bit twl_ver_read;
bit going_to_sleep; bit going_to_sleep;
u8 vol_twl_readed; // 最後にSoCが読んだVol。TWLとの不整合防止
// twl の8段階volのリニア値からの境界
const u8 TWL_VOL_BOUNDARY[] = {
0, 2, 6, 11, 16, 21, 26, 31
};
/* ======================================================== /* ========================================================
@ -102,9 +98,6 @@ void tsk_misc( )
TWLでは8通常時、押しボタンは8段階だった。それに合わせて割り込みを入れたい TWLでは8通常時、押しボタンは8段階だった。それに合わせて割り込みを入れたい
======================================================== */ ======================================================== */
{ {
static u8 vol_level_old;
u8 new_level = 31;
u8 i;
static u8 mabiki; static u8 mabiki;
if( mabiki != 0 ) if( mabiki != 0 )
@ -115,27 +108,14 @@ void tsk_misc( )
{ {
mabiki = 4; mabiki = 4;
if( is_TWL ) if( is_TWL )
{
if( vol_level_twl != vol_level_twl_readed )
{ {
// if( vol_twl_readed != vreg_twl[ REG_TWL_INT_ADRS_VOL ] ) set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY );
{
// 8段レベルに変換
for( i=0; i<=7; i++ )
{
if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] )
{
new_level = i;
break;
}
}
if( vol_level_old != new_level )
{
vol_level_old = new_level;
set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY );
}
}
} }
} }
}
} }
} }

2
trunk/vreg_ctr.h
View File

@ -255,6 +255,8 @@ enum VREG_C_ADRS
// VREG_C_AMBIENT_BRIGHTNESS = 0xXX, // VREG_C_AMBIENT_BRIGHTNESS = 0xXX,
/*============================================================================*/ /*============================================================================*/
void vreg_ctr_init( ); void vreg_ctr_init( );
void vreg_ctr_reset( ); void vreg_ctr_reset( );

10
trunk/vreg_twl.c
View File

@ -17,12 +17,12 @@ TWL
// ======================================================== // ========================================================
u8 vreg_twl[_REG_TWL_INT_ADRS_ENDMARK]; u8 vreg_twl[_REG_TWL_INT_ADRS_ENDMARK];
extern bit twl_ver_read; extern bit twl_ver_read;
extern bit cam_led_update; extern bit cam_led_update;
extern bit vol_changed_by_twl; extern bit vol_changed_by_twl;
extern u8 vol_twl_readed; // SoC が最後に読んだVol値 u8 vol_level_twl,vol_level_twl_readed; // SoC が最後に読んだVol値
/* ======================================================== /* ========================================================
@ -63,7 +63,7 @@ void vreg_twl_write( u8 adrs, u8 data )
{ {
cam_led_update = true; cam_led_update = true;
} }
tsk_led_cam(); // todo 大丈夫？ tsk_led_cam();
break; break;
case ( REG_TWL_INT_ADRS_TEMP0 ): case ( REG_TWL_INT_ADRS_TEMP0 ):
@ -117,8 +117,8 @@ u8 vreg_twl_read( u8 phy_adrs )
return( temp ); return( temp );
case( REG_TWL_INT_ADRS_VOL ): case( REG_TWL_INT_ADRS_VOL ):
vol_twl_readed = vreg_twl[ REG_TWL_INT_ADRS_VOL ]; // TWLとスライダと不整合が起きないように vol_level_twl_readed = vol_level_twl; // TWLとスライダと不整合が起きないように
return( vol_twl_readed ); return( vreg_twl[ REG_TWL_INT_ADRS_VOL ] );
case( REG_TWL_INT_ADRS_VER_INFO ): case( REG_TWL_INT_ADRS_VER_INFO ):
// set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); // ‘¬“x“I‚É–³—<C2B3>‚È‚Ì‚Å // set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); // ‘¬“x“I‚É–³—<C2B3>‚È‚Ì‚Å

1
trunk/vreg_twl.h
View File

@ -2,6 +2,7 @@
#define __vreg_twl__ #define __vreg_twl__
/* ========================================================================= */ /* ========================================================================= */
extern u8 vreg_twl[]; extern u8 vreg_twl[];
extern u8 vol_level_twl,vol_level_twl_readed; // SoC が最後に読んだVol値

30
trunk/yav_mcu_bsr.pri
View File

@ -80,8 +80,8 @@ Kanji=SJIS
[Source] [Source]
Geometry=79, 64, 1021, 817 Geometry=79, 64, 1021, 817
Window=Normal Window=Normal
DispStart=16 DispStart=15
CaretPos=69,0 CaretPos=68,0
Mode=Normal Mode=Normal
DispFile= DispFile=
Address1= Address1=
@ -139,11 +139,27 @@ 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=Normal
DispStart=791 DispStart=788
CaretPos=791,27 CaretPos=788,27
Address1= Address1=
Address2= Address2=
Address3= Address3=
@ -963,13 +979,13 @@ Boundary=18088086
0=.temp_twl_bt_level,P,N,A,+,1 0=.temp_twl_bt_level,P,N,A,+,1
1=.bt_remain_old_ctr,P,N,A,+,1 1=.bt_remain_old_ctr,P,N,A,+,1
2=.chg_led_override,P,N,A,+,1 2=.chg_led_override,P,N,A,+,1
3=.vreg_twl,P,N,A,+,1 3=+vreg_twl,P,N,A,-,1
4=.infos,P,N,A,+,1 4=.infos,P,N,A,+,1
5=.vreg_ctr,P,N,A,+,1 5=.vreg_ctr,P,N,A,+,1
6=.info_led_override,P,N,A,+,1 6=.info_led_override,P,N,A,+,1
7=.battery_manufacturer,P,N,A,+,1 7=.battery_manufacturer,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 10=.info_LED,.,N,A,+,1
11=.time_to_next_frame,P,N,A,+,1 11=.time_to_next_frame,P,N,A,+,1
12=.vol_level_old,P,N,A,+,1 12=.vol_level_old,P,N,A,+,1
@ -1001,7 +1017,7 @@ 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+0x6b Address0=task_misc.c#_tsk_misc+0x5d
Window0=ASM Window0=ASM
Status0=ON Status0=ON
Count=1 Count=1