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

■1.03

Browse Source 
・スピーカー音量大 時のSVR揺れ（B+汚れ）防止でADC間隔やフィルタの変更
・Volスライダスケーリング対応
・電池無し、アダプタ有りの時に電池端子をこちょこちょすると充電LEDがぱたぱたすることがあったのを修正
・TWLの電池残量のレジスタ更新タイミングを変更。通信仁摩和合わないことがあった
・TWL(非NTR)アプリで電池アイコンが赤になるのと、本体のLEDが赤になるタイミングがずれていた
・ファームアップデータ、アップデート前の現行ファームのバックアップ時に書き込み先のアドレスが1ブロックずれてた
・キャプチャ箱を実機判定させる
・一部をブートセクタへ。メモリ不足
・お知らせLEDのパターンを書き込んだらパターンの先頭から
・スリープ時に電池残量を確認しないという悲しいバグ
・白箱でHOMEが効かなかった


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@215 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
N2232 2010-08-04 00:14:03 +00:00
parent 43c5369e70
commit 99973ab54a
21 changed files with 1700 additions and 1535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/accero.c
View File

@ -105,7 +105,7 @@ task_status_immed tsk_cbk_accero( )
{
set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY );
// ゴミデータのカラ読み
if( ACC_VALID == 1 )
if( ACC_VALID )
{
u8 temp[6];
iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp );

25
trunk/adc.c
View File

@ -99,7 +99,7 @@ void tsk_adc( )
}
#endif
/*
if( task_interval-- != 0 )
{
return;
@ -108,7 +108,7 @@ void tsk_adc( )
{
task_interval = (u8)( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK );
}
*/
if( adc_updated )
{
adc_updated = 0;
@ -116,10 +116,11 @@ void tsk_adc( )
if( system_status.pwr_state == ON )
{
// 3D /////////////////////////////////////////
adc_filter( adc_scaling( adc_raw_dep ), &work_vr_3d );
vreg_ctr[ VREG_C_TUNE ] = adc_raw_dep; // 生値
// Volume /////////////////////////////////////
{
vreg_ctr[ VREG_C_VOL_ADC_RAW ] = adc_raw_vol;
adc_filter( adc_scaling( adc_raw_vol ), &work_vr_vol ); // 結果は*work_vr_volから指されるvol_data_ctr 読みにくい...
vol_data_ctr = vol_data_ctr_tmp / 4;
@ -413,29 +414,23 @@ u8 get_adc( u8 ch )
/* ========================================================
VRの可動範囲を考えてスケーリング
音量Vol専用　使い回すならそのときどうにかする
======================================================== */
//#define ASOBI_L 4
//#define ASOBI_H 16
#define ASOBI_L 32+2+1
#define ASOBI_H 32+2+1
static u8 adc_scaling( u8 orig_val )
{
u16 temp;
if( orig_val <= ASOBI_L )
if( orig_val <= vreg_ctr[ VREG_C_VOL_CAL_MIN ] )
{
return( 0 );
}
if( orig_val >= ( 255 - ASOBI_H ))
if( orig_val >= vreg_ctr[ VREG_C_VOL_CAL_MAX ] )
{
return( 255 );
}
orig_val -= ASOBI_L;
temp = (u16)( orig_val * 256 ) / ( 256 - ( ASOBI_L + ASOBI_H ));
temp = (u16)(( orig_val - vreg_ctr[ VREG_C_VOL_CAL_MIN ] ) * 256 ) / ( vreg_ctr[ VREG_C_VOL_CAL_MAX ] - vreg_ctr[ VREG_C_VOL_CAL_MIN ] );
if( temp > 255 )
{
temp = 255;
@ -459,7 +454,7 @@ static void adc_filter( u8 new_val, filter_work *work )
{
// 大きく離れた
work -> large_diff_count += 1;
if( work -> large_diff_count > 3 )
if( work -> large_diff_count > 16 )
{
*( work -> value_used ) = new_val;
work -> diffs = 0;

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

527
trunk/bsr_k0r.map
View File

@ -1,20 +1,19 @@
78K0R Linker W1.31 Date:28 Jul 2010 Page: 1
78K0R Linker W1.31 Date: 4 Aug 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 -gi10A84B295BE95C03D45B
h -pbsr_k0r.map -nkd -gb7EFFFFh -bC:\Program Files\NEC Electr
onics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm
.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files\NEC Electron
ics Tools\CC78K0R\W2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.r
el 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 ta
sk_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel
task_status.rel
\lib78k0r\s0rm.rel -gi10A84B295BE95C03D45Bh -pbsr_k0r.map -nk
d -gb7EFFFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0
R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -b
cl0rmf.lib -iC:\Program Files\NEC Electronics Tools\CC78K0R\W
2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.r
el 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.r
el self_flash.rel sw.rel task_debug.rel task_misc.rel task_sy
s.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)
3DB9H byte(s) real data
5401 symbol(s) defined
64 output segment(s)
3E0CH byte(s) real data
5479 symbol(s) defined
*** Memory map ***
@ -54,8 +53,10 @@ Direc-file:bsr_mcu.dr
LDR_CNSL 00002H 00000H CSEG PAGE64KP
LDR_CNSL task_debug
00002H 00000H
??NMIROM 00002H 00002H CSEG
* gap * 00004H 0000CH
LDR_CNSL 00002H 00000H CSEG PAGE64KP
LDR_CNSL task_status
00002H 00000H
* gap * 00002H 0000EH
@@VECT10 00010H 00004H CSEG AT
@@VECT10 ini_VECT 00010H 00004H
* gap * 00014H 00008H
@ -93,55 +94,58 @@ Direc-file:bsr_mcu.dr
000C4H 00000H
LDR_CODL task_debug
000C4H 00000H
LDR_CODL task_status
000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG
?OCDSTAD 000CEH 0000AH CSEG
LDR_CODE 000D8H 00865H CSEG
LDR_CODE loader 000D8H 001CCH
LDR_CODE main 002A4H 0006EH
LDR_CODE WDT 00312H 00000H
LDR_CODE i2c_mcu 00312H 002F1H
LDR_CODE 000CEH 008FBH CSEG
LDR_CODE loader 000CEH 001CCH
LDR_CODE main 0029AH 0006EH
LDR_CODE WDT 00308H 00000H
LDR_CODE i2c_mcu 00308H 002F1H
LDR_CODE self_flash
00603H 00339H
005F9H 0034AH
LDR_CODE task_debug
0093CH 00001H
FSL_CODE 0093DH 00322H CSEG
00943H 00001H
LDR_CODE task_status
00944H 00085H
FSL_CODE 009C9H 00322H CSEG
FSL_CODE fsl_block_cmd
0093DH 0002BH
009C9H 0002BH
FSL_CODE fsl_block_check
00968H 00013H
009F4H 00013H
FSL_CODE fsl_common
0097BH 0014FH
00A07H 0014FH
FSL_CODE fsl_reset
00ACAH 00001H
00B56H 00001H
FSL_CODE fsl_si_ibf
00ACBH 00064H
00B57H 00064H
FSL_CODE fsl_phySwap
00B2FH 0004DH
00BBBH 0004DH
FSL_CODE fsl_si_common
00B7CH 00061H
FSL_CODE fsl_swap 00BDDH 00030H
00C08H 00061H
FSL_CODE fsl_swap 00C69H 00030H
FSL_CODE fsl_write
00C0DH 00052H
@@LCODE 00C5FH 002AFH CSEG
@@LCODE @cstart 00C5FH 0006DH
@@LCODE @imul 00CCCH 00011H
@@LCODE @lumul 00CDDH 0002BH
@@LCODE @isdiv 00D08H 00022H
@@LCODE @iudiv 00D2AH 0002DH
@@LCODE @isrem 00D57H 00021H
@@LCODE @iurem 00D78H 0002FH
@@LCODE @lsdiv 00DA7H 00039H
@@LCODE @ludiv 00DE0H 0003FH
@@LCODE @divuw 00E1FH 00034H
@@LCODE @ladd 00E53H 0000FH
@@LCODE @llsh 00E62H 0001BH
@@LCODE @lursh 00E7DH 0001FH
@@LCODE @iscmp 00E9CH 0000CH
@@LCODE @lscmp 00EA8H 00014H
@@LCODE @lband 00EBCH 00014H
@@LCODE @bcdtob 00ED0H 0001AH
@@LCODE @bbcd 00EEAH 00024H
* gap * 00F0EH 000E8H
00C99H 00052H
@@LCODE 00CEBH 002AFH CSEG
@@LCODE @cstart 00CEBH 0006DH
@@LCODE @imul 00D58H 00011H
@@LCODE @lumul 00D69H 0002BH
@@LCODE @isdiv 00D94H 00022H
@@LCODE @iudiv 00DB6H 0002DH
@@LCODE @isrem 00DE3H 00021H
@@LCODE @iurem 00E04H 0002FH
@@LCODE @lsdiv 00E33H 00039H
@@LCODE @ludiv 00E6CH 0003FH
@@LCODE @divuw 00EABH 00034H
@@LCODE @ladd 00EDFH 0000FH
@@LCODE @llsh 00EEEH 0001BH
@@LCODE @lursh 00F09H 0001FH
@@LCODE @iscmp 00F28H 0000CH
@@LCODE @lscmp 00F34H 00014H
@@LCODE @lband 00F48H 00014H
@@LCODE @bcdtob 00F5CH 0001AH
@@LCODE @bbcd 00F76H 00024H
* gap * 00F9AH 0005CH
MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH
@ -183,9 +187,6 @@ Direc-file:bsr_mcu.dr
02000H 00000H
@@CNSTL 02000H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 02000H 00000H
@@CNSTL 02000H 00000H CSEG PAGE64KP
@@CNSTL task_status
02000H 00000H
@@CNSTL 02000H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 02000H 0000AH
@@CNSTL 0200AH 00010H CSEG PAGE64KP
@ -331,8 +332,6 @@ Direc-file:bsr_mcu.dr
@@CODEL pedo_alg_thre_det2
02056H 00000H
@@CODEL ini_VECT 02056H 00000H
@@CODEL task_status
02056H 00000H
@@LCODEL 02056H 00008H CSEG
@@LCODEL abs 02056H 00008H
* gap * 0205EH 000A2H
@ -368,55 +367,53 @@ Direc-file:bsr_mcu.dr
@@CNST ini_VECT 023C4H 00000H
@@CNST task_status
023C4H 00000H
ROM_CODE 023C4H 0271DH CSEG
ROM_CODE pm 023C4H 009CBH
ROM_CODE i2c_ctr 02D8FH 00060H
ROM_CODE i2c_twl 02DEFH 0005EH
ROM_CODE led 02E4DH 00503H
ROM_CODE rtc 03350H 000E0H
ROM_CODE vreg_ctr 03430H 00445H
ROM_CODE vreg_twl 03875H 00162H
ROM_CODE adc 039D7H 002BFH
ROM_CODE renge 03C96H 001C3H
ROM_CODE accero 03E59H 0013DH
ROM_CODE sw 03F96H 000F4H
ROM_CODE 023C4H 026E6H CSEG
ROM_CODE pm 023C4H 00A34H
ROM_CODE i2c_ctr 02DF8H 00060H
ROM_CODE i2c_twl 02E58H 0005EH
ROM_CODE led 02EB6H 00512H
ROM_CODE rtc 033C8H 000E0H
ROM_CODE vreg_ctr 034A8H 00457H
ROM_CODE vreg_twl 038FFH 00122H
ROM_CODE adc 03A21H 002B9H
ROM_CODE renge 03CDAH 001C3H
ROM_CODE accero 03E9DH 0013DH
ROM_CODE sw 03FDAH 000F5H
ROM_CODE task_misc
0408AH 001BAH
ROM_CODE task_sys 04244H 00309H
040CFH 001C1H
ROM_CODE task_sys 04290H 0030BH
ROM_CODE pedo_alg_thre_det2
0454DH 0050FH
ROM_CODE task_status
04A5CH 00085H
@@BASE 04AE1H 004FCH CSEG BASE
@@BASE loader 04AE1H 00000H
@@BASE pm 04AE1H 00043H
@@BASE i2c_ctr 04B24H 00198H
@@BASE main 04CBCH 00000H
@@BASE magic 04CBCH 00000H
@@BASE WDT 04CBCH 00000H
@@BASE i2c_mcu 04CBCH 000D9H
@@BASE i2c_twl 04D95H 000CDH
@@BASE led 04E62H 00000H
@@BASE rtc 04E62H 00043H
@@BASE vreg_ctr 04EA5H 00000H
@@BASE vreg_twl 04EA5H 00000H
@@BASE adc 04EA5H 000B3H
@@BASE renge 04F58H 00000H
@@BASE accero 04F58H 0004AH
0459BH 0050FH
@@BASE 04AAAH 004FCH CSEG BASE
@@BASE loader 04AAAH 00000H
@@BASE pm 04AAAH 00043H
@@BASE i2c_ctr 04AEDH 00198H
@@BASE main 04C85H 00000H
@@BASE magic 04C85H 00000H
@@BASE WDT 04C85H 00000H
@@BASE i2c_mcu 04C85H 000D9H
@@BASE i2c_twl 04D5EH 000CDH
@@BASE led 04E2BH 00000H
@@BASE rtc 04E2BH 00043H
@@BASE vreg_ctr 04E6EH 00000H
@@BASE vreg_twl 04E6EH 00000H
@@BASE adc 04E6EH 000B3H
@@BASE renge 04F21H 00000H
@@BASE accero 04F21H 0004AH
@@BASE self_flash
04FA2H 00000H
@@BASE sw 04FA2H 00000H
04F6BH 00000H
@@BASE sw 04F6BH 00000H
@@BASE task_debug
04FA2H 00000H
04F6BH 00000H
@@BASE task_misc
04FA2H 00000H
@@BASE task_sys 04FA2H 00000H
04F6BH 00000H
@@BASE task_sys 04F6BH 00000H
@@BASE pedo_alg_thre_det2
04FA2H 00000H
@@BASE ini_VECT 04FA2H 0003BH
04F6BH 00000H
@@BASE ini_VECT 04F6BH 0003BH
@@BASE task_status
04FDDH 00000H
* gap * 04FDDH 00019H
04FA6H 00000H
* gap * 04FA6H 00050H
MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH
@ -424,194 +421,194 @@ Direc-file:bsr_mcu.dr
BASE ADDRESS=FF900H SIZE=00500H
OUTPUT INPUT INPUT BASE SIZE
SEGMENT SEGMENT MODULE ADDRESS
@@DATA FF900H 00408H DSEG BASEP
@@DATA FF900H 00410H DSEG BASEP
@@DATA @cstart FF900H 00002H
@@DATA loader FF902H 00000H
@@DATA pm FF902H 00014H
@@DATA i2c_ctr FF916H 00006H
@@DATA main FF91CH 0021EH
@@DATA pm FF902H 00016H
@@DATA i2c_ctr FF918H 00006H
@@DATA main FF91EH 0021CH
@@DATA magic FFB3AH 00000H
@@DATA WDT FFB3AH 00000H
@@DATA i2c_mcu FFB3AH 0000AH
@@DATA i2c_twl FFB44H 00000H
@@DATA led FFB44H 00088H
@@DATA rtc FFBCCH 00008H
@@DATA vreg_ctr FFBD4H 00056H
@@DATA vreg_twl FFC2AH 00010H
@@DATA adc FFC3AH 00016H
@@DATA renge FFC50H 00016H
@@DATA accero FFC66H 00002H
@@DATA vreg_ctr FFBD4H 0005EH
@@DATA vreg_twl FFC32H 00010H
@@DATA adc FFC42H 00016H
@@DATA renge FFC58H 00016H
@@DATA accero FFC6EH 00002H
@@DATA self_flash
FFC68H 00002H
@@DATA sw FFC6AH 00004H
FFC70H 00002H
@@DATA sw FFC72H 00004H
@@DATA task_debug
FFC6EH 00000H
FFC76H 00000H
@@DATA task_misc
FFC6EH 00002H
@@DATA task_sys FFC70H 00002H
FFC76H 00002H
@@DATA task_sys FFC78H 00002H
@@DATA pedo_alg_thre_det2
FFC72H 00094H
@@DATA ini_VECT FFD06H 00000H
FFC7AH 00094H
@@DATA ini_VECT FFD0EH 00000H
@@DATA task_status
FFD06H 00002H
@@DATA @rom FFD08H 00000H
@@INIT FFD08H 0003CH DSEG BASEP
@@INIT @cstart FFD08H 00000H
@@INIT loader FFD08H 00000H
@@INIT pm FFD08H 00002H
@@INIT i2c_ctr FFD0AH 00002H
@@INIT main FFD0CH 00000H
@@INIT magic FFD0CH 00000H
@@INIT WDT FFD0CH 00000H
@@INIT i2c_mcu FFD0CH 00000H
@@INIT i2c_twl FFD0CH 00000H
@@INIT led FFD0CH 00006H
@@INIT rtc FFD12H 00000H
@@INIT vreg_ctr FFD12H 00000H
@@INIT vreg_twl FFD12H 00000H
@@INIT adc FFD12H 0000EH
@@INIT renge FFD20H 00016H
@@INIT accero FFD36H 00000H
FFD0EH 00002H
@@DATA @rom FFD10H 00000H
@@INIT FFD10H 0003CH DSEG BASEP
@@INIT @cstart FFD10H 00000H
@@INIT loader FFD10H 00000H
@@INIT pm FFD10H 00002H
@@INIT i2c_ctr FFD12H 00002H
@@INIT main FFD14H 00000H
@@INIT magic FFD14H 00000H
@@INIT WDT FFD14H 00000H
@@INIT i2c_mcu FFD14H 00000H
@@INIT i2c_twl FFD14H 00000H
@@INIT led FFD14H 00006H
@@INIT rtc FFD1AH 00000H
@@INIT vreg_ctr FFD1AH 00000H
@@INIT vreg_twl FFD1AH 00000H
@@INIT adc FFD1AH 0000EH
@@INIT renge FFD28H 00016H
@@INIT accero FFD3EH 00000H
@@INIT self_flash
FFD36H 00000H
@@INIT sw FFD36H 00002H
FFD3EH 00000H
@@INIT sw FFD3EH 00002H
@@INIT task_debug
FFD38H 00000H
FFD40H 00000H
@@INIT task_misc
FFD38H 00000H
@@INIT task_sys FFD38H 00002H
FFD40H 00000H
@@INIT task_sys FFD40H 00002H
@@INIT pedo_alg_thre_det2
FFD3AH 00008H
@@INIT ini_VECT FFD42H 00000H
FFD42H 00008H
@@INIT ini_VECT FFD4AH 00000H
@@INIT task_status
FFD42H 00002H
@@INIT @rom FFD44H 00000H
@@INIS FFD44H 00000H DSEG UNITP
@@INIS @cstart FFD44H 00000H
@@INIS loader FFD44H 00000H
@@INIS pm FFD44H 00000H
@@INIS i2c_ctr FFD44H 00000H
@@INIS main FFD44H 00000H
@@INIS magic FFD44H 00000H
@@INIS WDT FFD44H 00000H
@@INIS i2c_mcu FFD44H 00000H
@@INIS i2c_twl FFD44H 00000H
@@INIS led FFD44H 00000H
@@INIS rtc FFD44H 00000H
@@INIS vreg_ctr FFD44H 00000H
@@INIS vreg_twl FFD44H 00000H
@@INIS adc FFD44H 00000H
@@INIS renge FFD44H 00000H
@@INIS accero FFD44H 00000H
FFD4AH 00002H
@@INIT @rom FFD4CH 00000H
@@INIS FFD4CH 00000H DSEG UNITP
@@INIS @cstart FFD4CH 00000H
@@INIS loader FFD4CH 00000H
@@INIS pm FFD4CH 00000H
@@INIS i2c_ctr FFD4CH 00000H
@@INIS main FFD4CH 00000H
@@INIS magic FFD4CH 00000H
@@INIS WDT FFD4CH 00000H
@@INIS i2c_mcu FFD4CH 00000H
@@INIS i2c_twl FFD4CH 00000H
@@INIS led FFD4CH 00000H
@@INIS rtc FFD4CH 00000H
@@INIS vreg_ctr FFD4CH 00000H
@@INIS vreg_twl FFD4CH 00000H
@@INIS adc FFD4CH 00000H
@@INIS renge FFD4CH 00000H
@@INIS accero FFD4CH 00000H
@@INIS self_flash
FFD44H 00000H
@@INIS sw FFD44H 00000H
FFD4CH 00000H
@@INIS sw FFD4CH 00000H
@@INIS task_debug
FFD44H 00000H
FFD4CH 00000H
@@INIS task_misc
FFD44H 00000H
@@INIS task_sys FFD44H 00000H
FFD4CH 00000H
@@INIS task_sys FFD4CH 00000H
@@INIS pedo_alg_thre_det2
FFD44H 00000H
@@INIS ini_VECT FFD44H 00000H
FFD4CH 00000H
@@INIS ini_VECT FFD4CH 00000H
@@INIS task_status
FFD44H 00000H
@@INIS @rom FFD44H 00000H
@@DATS FFD44H 00000H DSEG UNITP
@@DATS @cstart FFD44H 00000H
@@DATS loader FFD44H 00000H
@@DATS pm FFD44H 00000H
@@DATS i2c_ctr FFD44H 00000H
@@DATS main FFD44H 00000H
@@DATS magic FFD44H 00000H
@@DATS WDT FFD44H 00000H
@@DATS i2c_mcu FFD44H 00000H
@@DATS i2c_twl FFD44H 00000H
@@DATS led FFD44H 00000H
@@DATS rtc FFD44H 00000H
@@DATS vreg_ctr FFD44H 00000H
@@DATS vreg_twl FFD44H 00000H
@@DATS adc FFD44H 00000H
@@DATS renge FFD44H 00000H
@@DATS accero FFD44H 00000H
FFD4CH 00000H
@@INIS @rom FFD4CH 00000H
@@DATS FFD4CH 00000H DSEG UNITP
@@DATS @cstart FFD4CH 00000H
@@DATS loader FFD4CH 00000H
@@DATS pm FFD4CH 00000H
@@DATS i2c_ctr FFD4CH 00000H
@@DATS main FFD4CH 00000H
@@DATS magic FFD4CH 00000H
@@DATS WDT FFD4CH 00000H
@@DATS i2c_mcu FFD4CH 00000H
@@DATS i2c_twl FFD4CH 00000H
@@DATS led FFD4CH 00000H
@@DATS rtc FFD4CH 00000H
@@DATS vreg_ctr FFD4CH 00000H
@@DATS vreg_twl FFD4CH 00000H
@@DATS adc FFD4CH 00000H
@@DATS renge FFD4CH 00000H
@@DATS accero FFD4CH 00000H
@@DATS self_flash
FFD44H 00000H
@@DATS sw FFD44H 00000H
FFD4CH 00000H
@@DATS sw FFD4CH 00000H
@@DATS task_debug
FFD44H 00000H
FFD4CH 00000H
@@DATS task_misc
FFD44H 00000H
@@DATS task_sys FFD44H 00000H
FFD4CH 00000H
@@DATS task_sys FFD4CH 00000H
@@DATS pedo_alg_thre_det2
FFD44H 00000H
@@DATS ini_VECT FFD44H 00000H
FFD4CH 00000H
@@DATS ini_VECT FFD4CH 00000H
@@DATS task_status
FFD44H 00000H
@@DATS @rom FFD44H 00000H
FSL_DATA FFD44H 00010H DSEG UNITP
FFD4CH 00000H
@@DATS @rom FFD4CH 00000H
FSL_DATA FFD4CH 00010H DSEG UNITP
FSL_DATA fsl_common
FFD44H 00010H
@@INITL FFD54H 00000H DSEG UNIT64KP
@@INITL loader FFD54H 00000H
@@INITL pm FFD54H 00000H
@@INITL i2c_ctr FFD54H 00000H
@@INITL main FFD54H 00000H
@@INITL magic FFD54H 00000H
@@INITL WDT FFD54H 00000H
@@INITL i2c_mcu FFD54H 00000H
@@INITL i2c_twl FFD54H 00000H
@@INITL led FFD54H 00000H
@@INITL rtc FFD54H 00000H
@@INITL vreg_ctr FFD54H 00000H
@@INITL vreg_twl FFD54H 00000H
@@INITL adc FFD54H 00000H
@@INITL renge FFD54H 00000H
@@INITL accero FFD54H 00000H
FFD4CH 00010H
@@INITL FFD5CH 00000H DSEG UNIT64KP
@@INITL loader FFD5CH 00000H
@@INITL pm FFD5CH 00000H
@@INITL i2c_ctr FFD5CH 00000H
@@INITL main FFD5CH 00000H
@@INITL magic FFD5CH 00000H
@@INITL WDT FFD5CH 00000H
@@INITL i2c_mcu FFD5CH 00000H
@@INITL i2c_twl FFD5CH 00000H
@@INITL led FFD5CH 00000H
@@INITL rtc FFD5CH 00000H
@@INITL vreg_ctr FFD5CH 00000H
@@INITL vreg_twl FFD5CH 00000H
@@INITL adc FFD5CH 00000H
@@INITL renge FFD5CH 00000H
@@INITL accero FFD5CH 00000H
@@INITL self_flash
FFD54H 00000H
@@INITL sw FFD54H 00000H
FFD5CH 00000H
@@INITL sw FFD5CH 00000H
@@INITL task_debug
FFD54H 00000H
FFD5CH 00000H
@@INITL task_misc
FFD54H 00000H
@@INITL task_sys FFD54H 00000H
FFD5CH 00000H
@@INITL task_sys FFD5CH 00000H
@@INITL pedo_alg_thre_det2
FFD54H 00000H
@@INITL ini_VECT FFD54H 00000H
FFD5CH 00000H
@@INITL ini_VECT FFD5CH 00000H
@@INITL task_status
FFD54H 00000H
@@INITL @rom FFD54H 00000H
@@DATAL FFD54H 00000H DSEG UNIT64KP
@@DATAL loader FFD54H 00000H
@@DATAL pm FFD54H 00000H
@@DATAL i2c_ctr FFD54H 00000H
@@DATAL main FFD54H 00000H
@@DATAL magic FFD54H 00000H
@@DATAL WDT FFD54H 00000H
@@DATAL i2c_mcu FFD54H 00000H
@@DATAL i2c_twl FFD54H 00000H
@@DATAL led FFD54H 00000H
@@DATAL rtc FFD54H 00000H
@@DATAL vreg_ctr FFD54H 00000H
@@DATAL vreg_twl FFD54H 00000H
@@DATAL adc FFD54H 00000H
@@DATAL renge FFD54H 00000H
@@DATAL accero FFD54H 00000H
FFD5CH 00000H
@@INITL @rom FFD5CH 00000H
@@DATAL FFD5CH 00000H DSEG UNIT64KP
@@DATAL loader FFD5CH 00000H
@@DATAL pm FFD5CH 00000H
@@DATAL i2c_ctr FFD5CH 00000H
@@DATAL main FFD5CH 00000H
@@DATAL magic FFD5CH 00000H
@@DATAL WDT FFD5CH 00000H
@@DATAL i2c_mcu FFD5CH 00000H
@@DATAL i2c_twl FFD5CH 00000H
@@DATAL led FFD5CH 00000H
@@DATAL rtc FFD5CH 00000H
@@DATAL vreg_ctr FFD5CH 00000H
@@DATAL vreg_twl FFD5CH 00000H
@@DATAL adc FFD5CH 00000H
@@DATAL renge FFD5CH 00000H
@@DATAL accero FFD5CH 00000H
@@DATAL self_flash
FFD54H 00000H
@@DATAL sw FFD54H 00000H
FFD5CH 00000H
@@DATAL sw FFD5CH 00000H
@@DATAL task_debug
FFD54H 00000H
FFD5CH 00000H
@@DATAL task_misc
FFD54H 00000H
@@DATAL task_sys FFD54H 00000H
FFD5CH 00000H
@@DATAL task_sys FFD5CH 00000H
@@DATAL pedo_alg_thre_det2
FFD54H 00000H
@@DATAL ini_VECT FFD54H 00000H
FFD5CH 00000H
@@DATAL ini_VECT FFD5CH 00000H
@@DATAL task_status
FFD54H 00000H
@@DATAL @rom FFD54H 00000H
* gap * FFD54H 000ACH
FFD5CH 00000H
@@DATAL @rom FFD5CH 00000H
* gap * FFD5CH 000A4H
MEMORY=RAM2
BASE ADDRESS=FFE20H SIZE=000C0H
@ -627,26 +624,26 @@ Direc-file:bsr_mcu.dr
@@BITS WDT FFE20H.4 00000H.0
@@BITS i2c_mcu FFE20H.4 00000H.3
@@BITS i2c_twl FFE20H.7 00000H.0
@@BITS led FFE20H.7 00000H.4
@@BITS rtc FFE21H.3 00000H.3
@@BITS vreg_ctr FFE21H.6 00000H.1
@@BITS vreg_twl FFE21H.7 00000H.0
@@BITS adc FFE21H.7 00000H.4
@@BITS renge FFE22H.3 00000H.2
@@BITS accero FFE22H.5 00000H.0
@@BITS led FFE20H.7 00000H.5
@@BITS rtc FFE21H.4 00000H.3
@@BITS vreg_ctr FFE21H.7 00000H.1
@@BITS vreg_twl FFE22H.0 00000H.0
@@BITS adc FFE22H.0 00000H.4
@@BITS renge FFE22H.4 00000H.2
@@BITS accero FFE22H.6 00000H.0
@@BITS self_flash
FFE22H.5 00000H.0
@@BITS sw FFE22H.5 00000H.2
FFE22H.6 00000H.0
@@BITS sw FFE22H.6 00000H.2
@@BITS task_debug
FFE22H.7 00000H.0
FFE23H.0 00000H.0
@@BITS task_misc
FFE22H.7 00000H.3
@@BITS task_sys FFE23H.2 00000H.0
FFE23H.0 00000H.3
@@BITS task_sys FFE23H.3 00000H.0
@@BITS pedo_alg_thre_det2
FFE23H.2 00000H.1
@@BITS ini_VECT FFE23H.3 00000H.0
FFE23H.3 00000H.1
@@BITS ini_VECT FFE23H.4 00000H.0
@@BITS task_status
FFE23H.3 00000H.0
FFE23H.4 00000H.0
* gap * FFE24H 000B0H
@@SEGREG FFED4H 00004H DSEG AT
@@SEGREG @SEGREG FFED4H 00004H

3
trunk/bsr_system.h
View File

@ -44,8 +44,9 @@ typedef struct _system_status_
unsigned char dipsw2:1;
unsigned char reboot:1;
unsigned char info_fullcolor:1;
unsigned char force_off:1;
unsigned char fake_jikki:1; // キャプチャ箱 SDKには実機と返す
enum model_ model;
unsigned char force_off; // bitできないんだそうな
}system_status_;

3
trunk/config.h
View File

@ -8,12 +8,13 @@
//#define _DBG_PEDO_AUTO_ENABLE_
//#define _DBG_LED_PRINT_
//#define _DEBUG_CODEC_POLLING_
//#define _DBG_FORCE_FULLCOLOR_
//#define _PMIC_TEST_
//#define _ENABLE_WDT_TEST_
//#define _DBG_FORCE_JIKKI_
#define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x01
#define MCU_VER_MINOR 0x03
//#define PM_CCIC_TIM

BIN
trunk/hoge.bin
View File

Binary file not shown.

100
trunk/led.c
View File

@ -164,6 +164,9 @@ void LED_init( )
system_status.info_fullcolor = 0;
if( system_status.model == MODEL_TS_BOARD )
{
#ifdef _DBG_FORCE_FULLCOLOR_
system_status.info_fullcolor = 1;
#endif
}
else
{
@ -496,13 +499,12 @@ void tsk_led_wifi( )
bit info_led_pattern_updated;
/* ========================================================
お知らせLED
======================================================== */
void tsk_led_notify( )
{
// static u8 task_interval;
static u8 time_to_next_frame;
static u8 frame;
static u8 loops_to_go;
@ -527,48 +529,7 @@ void tsk_led_notify( )
LED_dim_status_info_B.now = 0;
}
if( !info_led_off ) // ←電源off時など強制off
{
// 次のフレームに進める？
if( time_to_next_frame == 0 )
{
time_to_next_frame = info_LED.info_LED.term;
if( frame >= NOTIFY_LED_TERM -1 )
{
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP;
if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ
{
if( loops_to_go != 0 )
{
loops_to_go -= 1;
}
else
{
loops_to_go = info_LED.info_LED.last_loop;
frame = 0;
}
}
}
else
{
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP;
frame = (( frame + 1 ) & 0x1F ); // ←ここでマスクをかけておかないと最終フレーム～先頭間のグラデが効かない
}
LED_dim_status_info_R.to = info_LED.info_LED.red[frame] * 128;
LED_dim_status_info_G.to = info_LED.info_LED.grn[frame] * 128;
LED_dim_status_info_B.to = info_LED.info_LED.blu[frame] * 128;
// グラデーションのデルタを計算
LED_dim_status_info_R.delta = (( LED_dim_status_info_R.to - LED_dim_status_info_R.now ) ) / info_LED.info_LED.fade_time;
LED_dim_status_info_G.delta = (( LED_dim_status_info_G.to - LED_dim_status_info_G.now ) ) / info_LED.info_LED.fade_time;
LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time;
}
time_to_next_frame -= 1;
}
else
if( info_led_off ) // ←電源off時など強制off
{
// フェードアウトさせる
LED_dim_status_info_R.to = 0;
@ -578,6 +539,57 @@ void tsk_led_notify( )
LED_dim_status_info_G.delta = 0 - LED_dim_status_info_G.now / 64;
LED_dim_status_info_B.delta = 0 - LED_dim_status_info_B.now / 64;
}
else
{
// 通常運転
if( info_led_pattern_updated )
{
info_led_pattern_updated = 0;
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP;
frame = 0; // ちゃんと書こう
}
else
{
// 次のフレームに進める？
if( time_to_next_frame == 0 )
{
time_to_next_frame = info_LED.info_LED.term;
if( frame >= NOTIFY_LED_TERM -1 )
{
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP;
if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ
{
if( loops_to_go != 0 )
{
loops_to_go -= 1;
}
else
{
loops_to_go = info_LED.info_LED.last_loop;
frame = 0;
}
}
}
else
{
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP;
frame = (( frame + 1 ) & 0x1F ); // ←ここでマスクをかけておかないと最終フレーム～先頭間のグラデが効かない
}
LED_dim_status_info_R.to = info_LED.info_LED.red[frame] * 128;
LED_dim_status_info_G.to = info_LED.info_LED.grn[frame] * 128;
LED_dim_status_info_B.to = info_LED.info_LED.blu[frame] * 128;
// グラデーションのデルタを計算
LED_dim_status_info_R.delta = (( LED_dim_status_info_R.to - LED_dim_status_info_R.now ) ) / info_LED.info_LED.fade_time;
LED_dim_status_info_G.delta = (( LED_dim_status_info_G.to - LED_dim_status_info_G.now ) ) / info_LED.info_LED.fade_time;
LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time;
}
time_to_next_frame -= 1;
}
}
if( system_status.info_fullcolor )
{

118
trunk/pm.c
View File

@ -63,13 +63,12 @@ u8 blset;
PM_EXTDCは割り込みメインにするかも
======================================================== */
#define INTERVAL_TSK_BATT 250
#define INTERVAL_TSK_BATT 100
bit temp_zone_charge_disable; // 温度で充電停止する時にヒステリシスを付けるため
void tsk_batt( )
{
static u8 task_interval = 0;
static bit pm_extdc_old;
static u8 heikinka_h,heikinka_l;
if( task_interval-- != 0 )
@ -83,20 +82,40 @@ void tsk_batt( )
// アダプタステータス更新 /////////
if( pm_extdc_old != !PM_EXTDC_n )
{
pm_extdc_old = !PM_EXTDC_n;
if( pm_extdc_old )
static u8 anti_chatter;
static bit pm_extdc_old;
u8 temp_EXT_DC;
temp_EXT_DC = !PM_EXTDC_n; // volatileのため
if( pm_extdc_old == temp_EXT_DC )
{
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 );
anti_chatter = 0;
}
else
{
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
chg_led_override = 0;
if( anti_chatter < 4 ) // 電池無しでアダプタさすとCHG_ENがぱたぱたするので
{
anti_chatter++;
}
else
{
// アダプタの情報など更新
pm_extdc_old = temp_EXT_DC;
if( pm_extdc_old )
{
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 );
}
else
{
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
chg_led_override = 0;
}
}
}
}
@ -147,16 +166,32 @@ void tsk_batt( )
// 充電 //
// →割り込み。miscの中でよろしくやってくれている。
if( !BT_IN_CHG_n )
// →割り込み。
{
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
LED_CHARGE = 1;
}
else
{
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
LED_CHARGE = 0;
static u8 anti_chatter;
u8 temp_CHARGE;
temp_CHARGE = !BT_IN_CHG_n; // volatileのため。このピンはチャタらない。
if( !temp_CHARGE )
{
anti_chatter = 0;
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。
/// 割り込みはmiscが引き受ける
LED_CHARGE = 0;
}
else
{
if( anti_chatter < 4 ) // 電池無しでアダプタさして、電極をさわさわ
{ // すると充電LEDががさがさするので
anti_chatter++;
}
else
{
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
LED_CHARGE = 1;
}
}
}
if( chg_led_override != 0 ){ // 気がつく人いるかな…？
@ -165,7 +200,8 @@ void tsk_batt( )
}
// 電池残量 //
if( system_status.pwr_state == ON )
if(( system_status.pwr_state == ON )||
( system_status.pwr_state == SLEEP ))
{
BT_get_left();
}
@ -249,7 +285,6 @@ void BT_model_detect()
}
else if( raw_adc_temperature < 4 )
{
u8 temp;
// 白箱 //
system_status.model = MODEL_SHIROBAKO;
@ -605,37 +640,56 @@ void BT_get_left(){
// 残量で割り込み。急激に減ると飛ぶことがある //
{
static u8 bt_remain_old;
static u8 bt_remain_old_ctr;
if( (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO ) && ( BATT_TH_LO < bt_remain_old ))||
(( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_EMPTY ) && ( BATT_TH_EMPTY < bt_remain_old ))||
(( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ) && ( bt_remain_old != 0 )) )
if( (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO ) && ( BATT_TH_LO < bt_remain_old_ctr ))||
(( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_EMPTY ) && ( BATT_TH_EMPTY < bt_remain_old_ctr ))||
(( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ) && ( bt_remain_old_ctr != 0 )) )
{
set_irq( VREG_C_IRQ1, REG_BIT_BT_REMAIN );
}
bt_remain_old = vreg_ctr[ VREG_C_BT_REMAIN ];
if( system_status.pwr_state == OFF_TRIG )
{
bt_remain_old = 100;
bt_remain_old_ctr = 100;
}
// twlに教えてあげる
if( bt_remain_old_ctr != vreg_ctr[ VREG_C_BT_REMAIN ] )
{
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 ){
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;
}else{
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x00;
}
}
bt_remain_old_ctr = vreg_ctr[ VREG_C_BT_REMAIN ];
}
// PMIC-NTRに電池残量を教えてあげる
{
static u8 bt_remain_old;
static u8 bt_remain_old_ntr;
u8 flag;
if( system_status.pwr_state != ON )
{
bt_remain_old = NTR_PM_BT_ENOUGH;
bt_remain_old_ntr = NTR_PM_BT_ENOUGH;
}
flag = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH ); // 1で電池切れ
if( bt_remain_old != flag )
if( bt_remain_old_ntr != flag )
{
bt_remain_old = flag;
bt_remain_old_ntr = flag;
iic_mcu_write_a_byte_codec( CODEC_REG_BT, flag );
}
}

40
trunk/self_flash.c
View File

@ -36,7 +36,7 @@ const u8 fsl_low_voltage_u08 = 1;
#define INACTIVE_BOOTSECT_TOP 4
#define FIRM_TOP 8
#define FIRM_SIZE 12
#define UPDATE_BLOCK_LAST ( FIRM_TOP + FIRM_SIZE - 1 )
#define ALTERNATE_FIRM_BLOCK_TOP ( FIRM_TOP + FIRM_SIZE )
#ifdef _MCU_BSR_
@ -116,13 +116,13 @@ void firm_update( )
0x5000 - 0x7FFF (ブロック 20 - 31) にコピー
*/
firm_duplicate( FIRM_TOP,
UPDATE_BLOCK_LAST +1 );
ALTERNATE_FIRM_BLOCK_TOP );
// 全ブロック削除 /////////////////////////////////////
// 電源断を判定するため、最初に全クラスタ消去する
//（新ファームが書かれるところに残ってる、以前のファームのフッタを消したい）
for( target_block = INACTIVE_BOOTSECT_TOP;
target_block <= UPDATE_BLOCK_LAST;
target_block < ALTERNATE_FIRM_BLOCK_TOP;
target_block += 1 )
{
FSL_Erase( target_block );
@ -132,7 +132,7 @@ void firm_update( )
// ●ストップコンディションが来るまで続ける
// ●終わったら、スタートアップルーチンに飛ぶ
for( target_block = INACTIVE_BOOTSECT_TOP;
target_block <= UPDATE_BLOCK_LAST;
target_block < ALTERNATE_FIRM_BLOCK_TOP;
target_block += 1 )
{
/* すでに消してある。でないと中断されたとき終了してるか判別出来ない
@ -173,32 +173,24 @@ void firm_update( )
!= FSL_OK )
{
alert(1);
// 書き込み後のチェックエラー
while(1){}
// リストア
firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP );
FSL_ForceReset();
firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP );
FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要
// 戻ってこない //
}
}
// 1ブロック書き込み完了。内部ベリファイを行う
#ifdef _DBG_LED_PRINT_
P1.5 = 1;
DBG_LED_on;
#endif
if( FSL_IVerify( target_block ) != FSL_OK ){
while(1){}
alert(2);
// 再度消去→書き込み ベリファイを繰り返すだけじゃダメでした... todo…？
// リストア
firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP );
FSL_ForceReset();
firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP );
FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要
// 戻ってこない //
}
#ifdef _DBG_LED_PRINT_
DBG_LED_off;
P1.5 = 0;
#endif
if( SPD )
{
@ -222,17 +214,16 @@ void firm_update( )
{
// OK!
FSL_InvertBootFlag( );
FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要
// 戻ってこない //
}
else
{
// データ(マジックナンバーしか見てない)エラー
// リストア
firm_duplicate( UPDATE_BLOCK_LAST, FIRM_TOP );
FSL_ForceReset(); // リセット
// 戻ってこない //
alert(3);
firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP );
}
FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要
// 戻ってこない //
}
}
@ -352,7 +343,7 @@ void firm_restore( )
0x4800 - 0x7FFF (ブロック 18 - 27) から
0x2000 - 0x47FF (ブロック 8 - 17) へコピー
*/
if( firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP ) != ERR_SUCCESS )
if( firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP ) != ERR_SUCCESS )
{
alert(2);
}
@ -501,7 +492,6 @@ static err firm_duplicate( u8 block_src,
{
// リカバリはリブート時 todo //
led_print(7);
// while(1){}
return ( ERR_ERR );
}
}

13
trunk/task_misc.c
View File

@ -84,9 +84,9 @@ void tsk_misc( )
BSRマイコンはaccero.cで割り込みルーチンからタスク登録します。
======================================================== */
// 割り込みの取りこぼし？
if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 )
// if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 )
{
if( ACC_VALID == 1 )
if( ACC_VALID )
{
if( renge_task_immed_add( tsk_cbk_accero ) == ERR_SUCCESS ){
NOP();
@ -273,7 +273,14 @@ task_status_immed tski_mcu_info_read()
#ifdef _DBG_FORCE_JIKKI_
IICA = MODEL_JIKKI;
#else
IICA = (u8)system_status.model;
if( !system_status.fake_jikki )
{
IICA = (u8)system_status.model;
}
else
{
IICA = MODEL_JIKKI;
}
#endif
break;

2
trunk/task_status.c
View File

@ -3,7 +3,7 @@
#pragma HALT
#pragma STOP
#include "incs.h"
#include "incs_loader.h"
#include "renge\renge.h"
#include "pm.h"

10
trunk/vreg_ctr.c
View File

@ -18,7 +18,9 @@ CTR MCU I2C
extern u8 mcu_info_read(); // task_misc.c
extern u8 iic_burst_state;
extern u8 iic_burst_state; // 特殊バーストアクセスする時のカウンタ
extern bit info_led_pattern_updated; // お知らせLEDのパターンを先頭に戻す
@ -78,6 +80,8 @@ void vreg_ctr_reset( )
vreg_ctr[ VREG_C_LED_TUNE ] = 0;
vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20;
vreg_ctr[ VREG_C_VOL_OPTION ] = 0;
vreg_ctr[ VREG_C_VOL_CAL_MIN ] = 0x36;
vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36;
{
u8 i;
for( i = 0; i < sizeof( uni_info_LED ); i++ )
@ -195,6 +199,10 @@ void vreg_ctr_write( u8 adrs, u8 data )
{
info_LED.bindata[ iic_burst_state ] = data;
iic_burst_state += 1;
if( iic_burst_state > 4 ) // パターンを1文字でも書いた
{
info_led_pattern_updated = 1;
}
}
/// 非同期で動いているためここでは書かない。

4
trunk/vreg_ctr.h
View File

@ -192,6 +192,7 @@ enum VREG_C_ADRS
VREG_C_OFF_DELAY = 0x24,
VREG_C_VOL_DIGITAL = 0x25,
VREG_C_VOL_OPTION,
VREG_C_VOL_ADC_RAW,
VREG_C_LED_BRIGHT = 0x28,
VREG_C_LED_POW,
@ -242,6 +243,9 @@ enum VREG_C_ADRS
VREG_C_ACC_HOSU_HOUR_BOUNDARY = 0x50,
VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC,
VREG_C_VOL_CAL_MIN = 0x58,
VREG_C_VOL_CAL_MAX,
VREG_C_ENDMARK_
};

3
trunk/vreg_twl.c
View File

@ -112,6 +112,8 @@ u8 vreg_twl_read( u8 phy_adrs )
switch( phy_adrs ){
// 10%以下で赤になる
case( REG_TWL_INT_ADRS_POWER_INFO ):
/*
get_batt_left()に引っ越し
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 ){
@ -125,6 +127,7 @@ u8 vreg_twl_read( u8 phy_adrs )
}else{
vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x00;
}
*/
return( vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] | ( !PM_EXTDC_n ? 0x80: 0x00 ) ); // アダプタbit(アダプタ有無)
case( REG_TWL_INT_ADRS_IRQ ):

174
trunk/yav_mcu_bsr.plg
View File

@ -1,18 +1,25 @@
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 loader.c
loader.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(105) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.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 pm.c
pm.c(225) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(437) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(537) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(538) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(625) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(661) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(699) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(783) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(791) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(871) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_read'
pm.c(952) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(1019) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1022) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(90) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(174) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(261) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(481) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(581) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(582) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(688) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(724) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(762) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(846) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(854) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1009) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(1076) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1079) : CC78K0R warning W0401: Conversion may lose significant digits
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
@ -23,14 +30,149 @@ batt_params.h(100) : CC78K0R warning W0401: Conversion may lose significant digi
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 23 warning(s) found.
Compilation complete, 0 error(s) and 24 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 i2c_ctr.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\i2c_ctr.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 main.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\main.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 -gi10A84B295BE95C03D45Bh -pbsr_k0r.map -nkd -gb7EFFFFh -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\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 WDT.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\WDT.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 i2c_mcu.c
i2c_mcu.c(205) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 1 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\i2c_mcu.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 i2c_twl.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\i2c_twl.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 led.c
led.c(108) : CC78K0R warning W0745: Expected function prototype
led.c(244) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(249) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(311) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(370) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(396) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(577) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 7 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\led.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 rtc.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\rtc.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 vreg_ctr.c
vreg_ctr.c(114) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(123) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(132) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(142) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(146) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(153) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(257) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(262) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(267) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(297) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(313) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(423) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 17 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\vreg_ctr.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 vreg_twl.c
vreg_twl.c(52) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_twl.c(65) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 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\vreg_twl.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 adc.c
adc.c(126) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(132) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
adc.c(213) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(240) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(332) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(356) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
adc.c(375) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(453) : CC78K0R warning W0745: Expected function prototype
adc.c(482) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(487) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 10 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\adc.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 renge\renge.c
renge\renge.c(149) : CC78K0R warning W0411: Illegal pointer combination
renge\renge.c(157) : CC78K0R warning W0412: Illegal pointer combination in conditional expression
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.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 accero.c
accero.c(242) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 1 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm
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 self_flash.c
self_flash.c(211) : CC78K0R warning W0401: Conversion may lose significant digits
self_flash.c(250) : CC78K0R warning W0401: Conversion may lose significant digits
self_flash.c(251) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 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\self_flash.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 sw.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\sw.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 task_debug.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\task_debug.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 task_misc.c
task_misc.c(91) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
task_misc.c(105) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
task_misc.c(207) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
task_misc.c(312) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 4 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\task_misc.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 task_sys.c
task_sys.c(184) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(446) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(448) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 3 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\task_sys.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 pedo_alg_thre_det2.c
pedo_alg_thre_det2.c(58) : CC78K0R warning W0745: Expected function prototype
pedo_alg_thre_det2.c(73) : CC78K0R warning W0401: Conversion may lose significant digits
pedo_alg_thre_det2.c(140) : CC78K0R warning W0401: Conversion may lose significant digits
pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 4 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\pedo_alg_thre_det2.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 ini_VECT.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\ini_VECT.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 task_status.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\task_status.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" -gi10A84B295BE95C03D45Bh -pbsr_k0r.map -nkd -gb7EFFFFh -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 -ki -U0FFH -R bsr.lmf
Object Conversion Complete, 0 error(s) and 0 warning(s) found.
@ -40,4 +182,4 @@ intel-HEX to bsr bin converter
file converted!
Build Total error(s) : 0 Total warning(s) : 23
Build Total error(s) : 0 Total warning(s) : 81

147
trunk/yav_mcu_bsr.pri
View File

@ -22,7 +22,7 @@ SubClock=None
[Mapping]
Count=0
[Main]
Geometry=-1211, 40, 1200, 882
Geometry=92, 176, 1200, 882
Window=Max
MDI_MAX=OFF
Button=ON
@ -78,10 +78,10 @@ Symbol Type=OFF
Language=C
Kanji=SJIS
[Source]
Geometry=27, 151, 757, 775
Geometry=406, 215, 757, 775
Window=Normal
DispStart=95
CaretPos=138,0
DispStart=70
CaretPos=117,0
Mode=Normal
DispFile=
Address1=
@ -139,26 +139,10 @@ SaveRange=Screen
SaveStart=
SaveEnd=
Accumulative=ON
[Source1]
Geometry=50, 50, 757, 775
Window=Normal
DispStart=439
CaretPos=440,0
Mode=Normal
DispFile=adc.c
Accumulative=ON
[Source2]
Geometry=0, 0, 757, 775
Window=Normal
DispStart=95
CaretPos=148,0
Mode=Normal
DispFile=sw.c
Accumulative=ON
[Assemble]
Geometry=282, 92, 968, 626
Geometry=280, 96, 968, 626
Window=Hide
DispStart=864252928
DispStart=864531456
CaretPos=0,0
Address1=
Address2=
@ -273,7 +257,7 @@ Boundary=13762687
Mode=Proper
[Sfr]
Geometry=39, -4, 596, 915
Window=Normal
Window=Hide
Address1=
Address2=
Address3=
@ -830,7 +814,7 @@ L529=IICWL1
L530=IICWH1
L531=SVA1
[Local Variable]
Geometry=909, 497, 353, 199
Geometry=1151, 707, 353, 199
Window=Normal
Boundary=11468964
Mode=Proper
@ -910,17 +894,7 @@ Manager=ON
Sort by=Unsort
Detail=OFF
Last Name=
Name0=vreg_003
Status0=W
Access Size0=B
Address Range0=EQ
Address0=<vreg_ctr[0x19]> - <>
Mask Address0=00000000
Data Range0=NC
Data0=<00000000> - <00000000>
Mask Data0=FFFFFFFF
Pass0=0001
Count=1
Count=0
[Event Link]
Geometry=0, 0, 0, 0
Window=Hide
@ -936,10 +910,7 @@ Manager=ON
Sort by=Unsort
Detail=OFF
Last Name=
Name0=vreg_004
Element0=vreg_003
Set0=OFF
Count=1
Count=0
[Trace]
Geometry=0, 0, 0, 0
Window=Hide
@ -986,76 +957,56 @@ Detail=OFF
Last Name=
Count=0
[Variable]
Geometry=835, -4, 441, 502
Geometry=1145, 20, 441, 702
Window=Normal
Boundary=18088086
0=.vreg_ctr[9],P,N,A,+,1
1=.timeout_sleep,P,N,A,+,1
2=.going_to_sleep,P,N,A,+,1
3=.now_longhour,P,N,A,+,1
4=.TDR06,P,S,A,+,1
5=.LED_dim_status_sleep,.,N,A,+,1
6=.frame_sleep,P,N,A,+,1
7=.PM20,B,S,A,+,1
8=.P20,P,S,A,+,1
9=.pu20,B,S,A,+,1
10=.work_vr_vol,.,N,A,+,1
11=.vol_data_ctr_tmp,P,N,A,+,1
12=.vol_data_ctr,P,N,A,+,1
13=.last_modifyer,P,N,A,+,1
14=.sent_index,P,N,A,+,1
15=.vreg_ctr,P,N,A,+,1
16=.P1.5,P,S,A,+,1
17=.TDR07,P,S,A,+,1
18=.info_led_override,P,N,A,+,1
19=+system_status,.,N,A,-,1
20=.battery_manufacturer,P,N,A,+,1
21=.last_year,P,N,A,+,1
22=.last_month,P,N,A,+,1
23=.last_day,P,N,A,+,1
24=.last_hour,P,N,A,+,1
25=.now_min,P,N,A,+,1
26=.now_sec,P,N,A,+,1
27=.adc_raw_vol,P,N,A,+,1
28=.vol_data_ctr_tmp,P,N,A,+,1
29=.vol_data_ctr,P,N,A,+,1
30=.vol_old,P,N,A,+,1
31=.SW_HOME_n,P,N,A,+,1
Line=32
0=.info_LED,.,N,A,+,1
1=.vreg_ctr[9],P,N,A,+,1
2=.TDR06,P,S,A,+,1
3=.LED_dim_status_sleep,.,N,A,+,1
4=.pu20,B,S,A,+,1
5=.work_vr_vol,.,N,A,+,1
6=.vol_data_ctr_tmp,P,N,A,+,1
7=.vol_data_ctr,P,N,A,+,1
8=.last_modifyer,P,N,A,+,1
9=.sent_index,P,N,A,+,1
10=.vreg_ctr,P,N,A,+,1
11=.P1.5,P,S,A,+,1
12=.TDR07,P,S,A,+,1
13=.info_led_override,P,N,A,+,1
14=.system_status,.,N,A,+,1
15=.battery_manufacturer,P,N,A,+,1
Line=16
[Quick Watch]
0=info_led_override,P,A,1
1=TDR07,P,A,1
2=P1.5,P,A,1
3=last_year,P,A,1
4=last_month,P,A,1
5=last_day,P,A,1
6=last_hour,P,A,1
7=now_min,P,A,1
8=now_sec,P,A,1
9=vreg_ctr[ 9],P,A,1
10=vreg_ctr[9],P,A,1
11=vol_old,P,A,1
12=vol_data_ctr,P,A,1
13=vol_data_ctr_tmp,P,A,1
14=adc_raw_vol,P,A,1
15=SW_HOME_n,P,A,1
0=stat,P,A,1
1=TDR06,P,A,1
2=TDR03,P,A,1
3=TDR01,P,A,1
4=TDR07,P,A,1
5=TDR05,P,A,1
6=TDR02,P,A,1
7=P4.,P,A,1
8=P4.2,P,A,1
9=P7.5,P,A,1
10=PM4.2,P,A,1
11=vreg_twl,P,A,1
12=vreg_ctr[35],P,A,1
13=vreg_ctr[11],P,A,1
14=vreg_ctr[5],P,A,1
15=info_LED,P,A,1
[Software Break]
Geometry=869, 649, 445, 260
Geometry=1049, 744, 445, 260
Window=Normal
Width=150 30 200 100
Name0=Swb00002
Address0=adc.c#_adc_filter+0x9d
Name0=Swb00001
Address0=pm.c#_tsk_batt+0xd9
Window0=ASM
Status0=ON
Name1=Swb00003
Address1=adc.c#_adc_filter+0x84
Address1=pm.c#_tsk_batt+0xcd
Window1=ASM
Status1=ON
Name2=Swb00004
Address2=sw.c#_tsk_sw+0xae
Window2=ASM
Status2=ON
Count=3
Count=2
[Reset]
Debugger=ON
Symbol=OFF

64
trunk/yav_mcu_bsr.prj
View File

@ -756,37 +756,6 @@ ZF=0
S=1
E=0
CommandFile=0
[Options.LCNV78K0R 0]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 1]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 2]
Version=100
LCNV_GO=0
O0=inter_asm
E=0
CommandFile=0
[Options.LCNV78K0R 3]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 4]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 5]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LK78K0R 0]
Version=100
O0=bsr_k0r.lmf
@ -871,7 +840,7 @@ G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GO=0
GOValue=85
GOStart=FC00
GOSizeValue=1024
@ -1038,6 +1007,37 @@ ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LCNV78K0R 0]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 1]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 2]
Version=100
LCNV_GO=0
O0=inter_asm
E=0
CommandFile=0
[Options.LCNV78K0R 3]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 4]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 5]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.78K0R]
BuildMode=2
BuildMode2=K0R_dbg

32
trunk/yav_mcu_bsr.prk
View File

@ -1,23 +1,25 @@
[ProjectManager]
FrameMax=1
FrameX=267
FrameY=20
FrameX=0
FrameY=55
FrameCX=1299
FrameCY=1044
OpenFile1=ProjectWindow
OpenFile1=task_sys.c,0,220,220,1464,977,0,137,31,0
OpenFile2=adc.c,0,264,264,1508,1021,0,423,5,0
OpenFile3=task_debug.c,0,363,341,1342,978,30,26,42,0
OpenFile4=magic.c,0,527,528,1771,1285,0,3,0,0
OpenFile5=vreg_ctr.c,0,447,377,1691,1134,9,197,9,0
OpenFile6=self_flash.c,0,440,170,1684,927,0,133,0,0
OpenFile7=accero.c,0,264,264,1243,901,0,160,0,0
OpenFile8=pedo_alg_thre_det2.c,0,220,220,1188,845,0,434,0,0
OpenFile9=ProjectWindow
PrjPos=0,2,754,3,253
OpenFile2=task_sys.c,0,220,220,1464,977,0,137,31,0
OpenFile3=vreg_ctr.c,0,367,300,1611,1057,8,109,28,0
OpenFile4=pedo_alg_thre_det2.c,0,220,220,1188,845,0,434,0,0
OpenFile5=pm.h,0,242,242,1486,999,0,119,4,0
OpenFile6=pm.c,0,335,300,1579,1057,42,630,42,0
OpenFile7=adc.c,0,264,264,1508,1021,0,423,5,0
OpenFile8=accero.c,0,264,264,1243,901,0,160,0,0
OpenFile9=task_debug.c,0,363,341,1342,978,30,26,42,0
OpenFile10=task_misc.c,0,184,129,1152,754,0,275,0,0
OpenFile11=OutputWindow
OutputPos=0,21,966,690,1552
OpenFile12=config.h,0,88,228,1332,985,18,42,18,0
OpenFile10=config.h,0,53,125,1297,882,29,17,29,0
OpenFile11=pm.h,0,242,242,1486,999,14,107,14,0
OpenFile12=pm.c,0,335,300,1579,1057,15,156,0,0
OpenFile13=OutputWindow
OutputPos=0,73,1018,56,1365
OpenFile14=incs.h,0,0,0,968,625,11,1,11,0
ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow]
ProjectWindowDispType=0

30
trunk/yav_mcu_bsr.sdb
View File

@ -12,7 +12,7 @@ T=4c3fc60e
8=reboot.h
9=magic.h
[pm.c]
T=4c465d07
T=4c5769ce
1=incs.h
2=adc.h
3=led.h
@ -36,7 +36,7 @@ T=4c3c0229
7=adc.h
8=pool.h
[magic.c]
T=4c4e9b2a
T=4c527b9d
1=config.h
[WDT.c]
T=4bf0d1e1
@ -52,14 +52,14 @@ T=4c29c700
3=i2c_twl_defs.h
4=i2c_twl.h
[led.c]
T=4c3ecd56
T=4c4ff708
1=incs.h
2=led.h
[rtc.c]
T=4c3db81b
1=incs.h
[vreg_ctr.c]
T=4c3fc4a7
T=4c510269
1=incs.h
2=vreg_ctr.h
3=rtc.h
@ -70,14 +70,14 @@ T=4c3fc4a7
8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
9=fsl_user.h
[vreg_twl.c]
T=4c465cb6
T=4c4fe78d
1=incs.h
2=jhl_defs.h
3=led.h
4=vreg_twl.h
5=vreg_ctr.h
[adc.c]
T=4c48ff0b
T=4c5230b3
1=incs.h
2=adc.h
3=pm.h
@ -93,12 +93,12 @@ T=4c318e0f
6=user_define.h
7=bsr_system.h
[accero.c]
T=4c3d767c
T=4c525844
1=config.h
2=incs.h
3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
[self_flash.c]
T=4c3f9f78
T=4c502289
1=incs_loader.h
2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
3=fsl_user.h
@ -107,7 +107,7 @@ T=4c3f9f78
6=magic.h
7=pm.h
[sw.c]
T=4c3ec9e4
T=4c4f8e06
1=incs.h
2=i2c_twl.h
3=i2c_ctr.h
@ -122,7 +122,7 @@ T=4c4698f9
3=pm.h
4=accero.h
[task_misc.c]
T=4c4e424f
T=4c525842
1=incs.h
2=renge\renge.h
3=pm.h
@ -154,8 +154,8 @@ T=4c3fdc7e
T=4c312edd
1=config.h
[task_status.c]
T=4c2aacdb
1=incs.h
T=4c4fe85a
1=incs_loader.h
2=renge\renge.h
3=pm.h
4=accero.h
@ -176,11 +176,11 @@ T=4c119cde
T=4c075832
1=config.h
[config.h]
T=4c4ea335
T=4c50d4a9
[user_define.h]
T=4c3d838c
[bsr_system.h]
T=4c3ec384
T=4c4fc515
[renge\renge.h]
T=4c318e0f
1=renge\renge_defs.h
@ -191,7 +191,7 @@ T=4c073c5a
T=4c284e89
1=renge\renge_defs.h
[vreg_ctr.h]
T=4c3e964e
T=4c523053
1=config.h
[vreg_twl.h]
T=4c072cf1