rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-06-19 00:55:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.16（仮）

Browse Source 
AVATAR音量変化SEが鳴りまくるのを修正
　一部のソフトでスライダ値と画面上のアイコンがずれる確率が上がった（確認済み仕様）

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@307 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-02-01 00:24:54 +00:00
parent fc270a0da6
commit 2afd580bdd
23 changed files with 1354 additions and 1419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
branches/SDK0.14/accero.c
View File

@ -111,8 +111,8 @@ task_status_immed tski_cbk_accero( )
iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp ); iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp );
} }
} }
if(( system_status.pwr_state != OFF ) if(( system_status.pwr_state != ON_CHECK )
&&( system_status.pwr_state != BT_CHARGE ) &&( system_status.pwr_state != OFF )
#ifndef _DBG_PEDO_AUTO_ENABLE_ #ifndef _DBG_PEDO_AUTO_ENABLE_
&&( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0 ) &&( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0 )
#endif #endif

20
branches/SDK0.14/adc.c
View File

@ -151,6 +151,7 @@ void vol_reset()
　　・ユーザーがVolスライダを動かした 　　・ユーザーがVolスライダを動かした
　　・Horizonに強制更新を指示された　（codecリセット時） 　　・Horizonに強制更新を指示された　（codecリセット時）
　　・TWLアプリがVolをいじった 　　・TWLアプリがVolをいじった
i2c_mを使うので逐次タスク化
======================================================== */ ======================================================== */
task_status_immed tski_vol_update() task_status_immed tski_vol_update()
{ {
@ -268,7 +269,24 @@ task_status_immed tski_vol_update()
/// 同値でも書く /// 同値でも書く
iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] ); iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] );
// set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); // 割り込み廃止
// TWL の音量変化割り込みチェック
// check_twl_vol_irq(); をtask_miscで行っていたが、mcuとtwlで不整合が出ることがあるので
{
static u8 vol_twl_old;
if( is_TWL )
{
if(( vol_twl_old != vol_level_twl ) || // vrの最新値
( vol_twl_old != vol_level_twl_readed )) // twlが最後に読み出した値
{
vol_twl_old = vol_level_twl_readed = vol_level_twl;
set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY );
}
}
}
return( ERR_FINISED ); return( ERR_FINISED );
} }

1842
branches/SDK0.14/bsr.hex
View File

File diff suppressed because it is too large Load Diff

BIN
branches/SDK0.14/bsr.lmf
View File

Binary file not shown.

488
branches/SDK0.14/bsr_k0r.map
View File

@ -1,7 +1,7 @@
78K0R Linker W1.33 Date: 7 Jan 2011 Page: 1 78K0R Linker W1.33 Date:31 Jan 2011 Page: 1
Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff -
obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool
@ -24,8 +24,8 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
66 output segment(s) 66 output segment(s)
3F05H byte(s) real data 3F19H byte(s) real data
5444 symbol(s) defined 5482 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -100,54 +100,54 @@ Direc-file:bsr_mcu.dr
000C4H 00000H 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG ?CSEGSI 000C4H 0000AH CSEG
?OCDSTAD 000CEH 0000AH CSEG ?OCDSTAD 000CEH 0000AH CSEG
LDR_CODE 000D8H 00936H CSEG LDR_CODE 000D8H 00944H CSEG
LDR_CODE loader 000D8H 001F9H LDR_CODE loader 000D8H 00207H
LDR_CODE main 002D1H 00046H LDR_CODE main 002DFH 00046H
LDR_CODE WDT 00317H 00000H LDR_CODE WDT 00325H 00000H
LDR_CODE i2c_mcu 00317H 002F0H LDR_CODE i2c_mcu 00325H 002F0H
LDR_CODE self_flash LDR_CODE self_flash
00607H 0037FH 00615H 0037FH
LDR_CODE task_debug LDR_CODE task_debug
00986H 00000H 00994H 00000H
LDR_CODE task_status LDR_CODE task_status
00986H 00088H 00994H 00088H
FSL_CODE 00A0EH 00322H CSEG FSL_CODE 00A1CH 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
00A0EH 0002BH 00A1CH 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
00A39H 00013H 00A47H 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
00A4CH 0014FH 00A5AH 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00B9BH 00001H 00BA9H 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00B9CH 00064H 00BAAH 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00C00H 0004DH 00C0EH 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00C4DH 00061H 00C5BH 00061H
FSL_CODE fsl_swap 00CAEH 00030H FSL_CODE fsl_swap 00CBCH 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00CDEH 00052H 00CECH 00052H
@@LCODE 00D30H 0029BH CSEG @@LCODE 00D3EH 0029BH CSEG
@@LCODE @cstart 00D30H 0006DH @@LCODE @cstart 00D3EH 0006DH
@@LCODE @imul 00D9DH 00011H @@LCODE @imul 00DABH 00011H
@@LCODE @lumul 00DAEH 0002BH @@LCODE @lumul 00DBCH 0002BH
@@LCODE @isdiv 00DD9H 00022H @@LCODE @isdiv 00DE7H 00022H
@@LCODE @iudiv 00DFBH 0002DH @@LCODE @iudiv 00E09H 0002DH
@@LCODE @isrem 00E28H 00021H @@LCODE @isrem 00E36H 00021H
@@LCODE @iurem 00E49H 0002FH @@LCODE @iurem 00E57H 0002FH
@@LCODE @lsdiv 00E78H 00039H @@LCODE @lsdiv 00E86H 00039H
@@LCODE @ludiv 00EB1H 0003FH @@LCODE @ludiv 00EBFH 0003FH
@@LCODE @divuw 00EF0H 00034H @@LCODE @divuw 00EFEH 00034H
@@LCODE @ladd 00F24H 0000FH @@LCODE @ladd 00F32H 0000FH
@@LCODE @llsh 00F33H 0001BH @@LCODE @llsh 00F41H 0001BH
@@LCODE @lursh 00F4EH 0001FH @@LCODE @lursh 00F5CH 0001FH
@@LCODE @iscmp 00F6DH 0000CH @@LCODE @iscmp 00F7BH 0000CH
@@LCODE @lband 00F79H 00014H @@LCODE @lband 00F87H 00014H
@@LCODE @bcdtob 00F8DH 0001AH @@LCODE @bcdtob 00F9BH 0001AH
@@LCODE @bbcd 00FA7H 00024H @@LCODE @bbcd 00FB5H 00024H
* gap * 00FCBH 0002BH * gap * 00FD9H 0001DH
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -187,234 +187,234 @@ Direc-file:bsr_mcu.dr
@@CNST ini_VECT 022D2H 00000H @@CNST ini_VECT 022D2H 00000H
@@CNST task_status @@CNST task_status
022D2H 00000H 022D2H 00000H
ROM_CODE 022D2H 0278EH CSEG ROM_CODE 022D2H 027DCH CSEG
ROM_CODE pm 022D2H 00A42H ROM_CODE pm 022D2H 00A66H
ROM_CODE i2c_ctr 02D14H 00060H ROM_CODE i2c_ctr 02D38H 00060H
ROM_CODE i2c_twl 02D74H 0005EH ROM_CODE i2c_twl 02D98H 0005EH
ROM_CODE led 02DD2H 0051AH ROM_CODE led 02DF6H 00540H
ROM_CODE rtc 032ECH 000E0H ROM_CODE rtc 03336H 000E0H
ROM_CODE vreg_ctr 033CCH 00475H ROM_CODE vreg_ctr 03416H 00475H
ROM_CODE vreg_twl 03841H 0010AH ROM_CODE vreg_twl 0388BH 0010AH
ROM_CODE adc 0394BH 002FCH ROM_CODE adc 03995H 00326H
ROM_CODE renge 03C47H 00190H ROM_CODE renge 03CBBH 00190H
ROM_CODE accero 03DD7H 0013DH ROM_CODE accero 03E4BH 0013DH
ROM_CODE sw 03F14H 00120H ROM_CODE sw 03F88H 00120H
ROM_CODE task_misc ROM_CODE task_misc
04034H 001B7H 040A8H 0018DH
ROM_CODE task_sys 041EBH 00383H ROM_CODE task_sys 04235H 00387H
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
0456EH 004F2H 045BCH 004F2H
@@BASE 04A60H 0050EH CSEG BASE @@BASE 04AAEH 004C6H CSEG BASE
@@BASE loader 04A60H 00000H @@BASE loader 04AAEH 00000H
@@BASE pm 04A60H 0003FH @@BASE pm 04AAEH 0003FH
@@BASE i2c_ctr 04A9FH 00198H @@BASE i2c_ctr 04AEDH 0018DH
@@BASE main 04C37H 00000H @@BASE main 04C7AH 00000H
@@BASE magic 04C37H 00000H @@BASE magic 04C7AH 00000H
@@BASE WDT 04C37H 00000H @@BASE WDT 04C7AH 00000H
@@BASE i2c_mcu 04C37H 000D9H @@BASE i2c_mcu 04C7AH 0009CH
@@BASE i2c_twl 04D10H 000CBH @@BASE i2c_twl 04D16H 000CBH
@@BASE led 04DDBH 00000H @@BASE led 04DE1H 00000H
@@BASE rtc 04DDBH 0005EH @@BASE rtc 04DE1H 0005EH
@@BASE vreg_ctr 04E39H 00000H @@BASE vreg_ctr 04E3FH 00000H
@@BASE vreg_twl 04E39H 00000H @@BASE vreg_twl 04E3FH 00000H
@@BASE adc 04E39H 000B3H @@BASE adc 04E3FH 000B3H
@@BASE renge 04EECH 00000H @@BASE renge 04EF2H 00000H
@@BASE accero 04EECH 0004AH @@BASE accero 04EF2H 0004AH
@@BASE self_flash @@BASE self_flash
04F36H 00000H 04F3CH 00000H
@@BASE sw 04F36H 00000H @@BASE sw 04F3CH 00000H
@@BASE task_debug @@BASE task_debug
04F36H 00000H 04F3CH 00000H
@@BASE task_misc @@BASE task_misc
04F36H 00000H 04F3CH 00000H
@@BASE task_sys 04F36H 00000H @@BASE task_sys 04F3CH 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04F36H 00000H 04F3CH 00000H
@@BASE ini_VECT 04F36H 00038H @@BASE ini_VECT 04F3CH 00038H
@@BASE task_status @@BASE task_status
04F6EH 00000H 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04F6EH 00000H @@CNSTL @cstart 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL pm 04F6EH 00000H @@CNSTL pm 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04F6EH 00000H @@CNSTL i2c_ctr 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04F6EH 00000H @@CNSTL i2c_twl 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL led 04F6EH 00000H @@CNSTL led 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL rtc 04F6EH 00000H @@CNSTL rtc 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04F6EH 00000H @@CNSTL vreg_ctr 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04F6EH 00000H @@CNSTL vreg_twl 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL adc 04F6EH 00000H @@CNSTL adc 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL renge 04F6EH 00000H @@CNSTL renge 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL accero 04F6EH 00000H @@CNSTL accero 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL sw 04F6EH 00000H @@CNSTL sw 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04F6EH 00000H 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04F6EH 00000H @@CNSTL task_sys 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04F6EH 00000H 04F74H 00000H
@@CNSTL 04F6EH 00000H CSEG PAGE64KP @@CNSTL 04F74H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04F6EH 00000H @@CNSTL ini_VECT 04F74H 00000H
@@CNSTL 04F6EH 0000AH CSEG PAGE64KP @@CNSTL 04F74H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04F6EH 0000AH @@CNSTL @bcdtob 04F74H 0000AH
@@CNSTL 04F78H 00010H CSEG PAGE64KP @@CNSTL 04F7EH 00010H CSEG PAGE64KP
@@CNSTL @bbcd 04F78H 00010H @@CNSTL @bbcd 04F7EH 00010H
@@R_INIT 04F88H 0003AH CSEG UNIT64KP @@R_INIT 04F8EH 0003AH CSEG UNIT64KP
@@R_INIT @cstart 04F88H 00000H @@R_INIT @cstart 04F8EH 00000H
@@R_INIT loader 04F88H 00000H @@R_INIT loader 04F8EH 00000H
@@R_INIT pm 04F88H 00002H @@R_INIT pm 04F8EH 00002H
@@R_INIT i2c_ctr 04F8AH 00002H @@R_INIT i2c_ctr 04F90H 00002H
@@R_INIT main 04F8CH 00000H @@R_INIT main 04F92H 00000H
@@R_INIT magic 04F8CH 00000H @@R_INIT magic 04F92H 00000H
@@R_INIT WDT 04F8CH 00000H @@R_INIT WDT 04F92H 00000H
@@R_INIT i2c_mcu 04F8CH 00000H @@R_INIT i2c_mcu 04F92H 00000H
@@R_INIT i2c_twl 04F8CH 00000H @@R_INIT i2c_twl 04F92H 00000H
@@R_INIT led 04F8CH 00006H @@R_INIT led 04F92H 00006H
@@R_INIT rtc 04F92H 00000H @@R_INIT rtc 04F98H 00000H
@@R_INIT vreg_ctr 04F92H 00000H @@R_INIT vreg_ctr 04F98H 00000H
@@R_INIT vreg_twl 04F92H 00000H @@R_INIT vreg_twl 04F98H 00000H
@@R_INIT adc 04F92H 0000CH @@R_INIT adc 04F98H 0000CH
@@R_INIT renge 04F9EH 00014H @@R_INIT renge 04FA4H 00014H
@@R_INIT accero 04FB2H 00000H @@R_INIT accero 04FB8H 00000H
@@R_INIT self_flash @@R_INIT self_flash
04FB2H 00000H 04FB8H 00000H
@@R_INIT sw 04FB2H 00002H @@R_INIT sw 04FB8H 00002H
@@R_INIT task_debug @@R_INIT task_debug
04FB4H 00000H 04FBAH 00000H
@@R_INIT task_misc @@R_INIT task_misc
04FB4H 00000H 04FBAH 00000H
@@R_INIT task_sys 04FB4H 00002H @@R_INIT task_sys 04FBAH 00002H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
04FB6H 0000AH 04FBCH 0000AH
@@R_INIT ini_VECT 04FC0H 00000H @@R_INIT ini_VECT 04FC6H 00000H
@@R_INIT task_status @@R_INIT task_status
04FC0H 00002H 04FC6H 00002H
@@R_INIT @rom 04FC2H 00000H @@R_INIT @rom 04FC8H 00000H
@@R_INIS 04FC2H 00000H CSEG UNIT64KP @@R_INIS 04FC8H 00000H CSEG UNIT64KP
@@R_INIS @cstart 04FC2H 00000H @@R_INIS @cstart 04FC8H 00000H
@@R_INIS loader 04FC2H 00000H @@R_INIS loader 04FC8H 00000H
@@R_INIS pm 04FC2H 00000H @@R_INIS pm 04FC8H 00000H
@@R_INIS i2c_ctr 04FC2H 00000H @@R_INIS i2c_ctr 04FC8H 00000H
@@R_INIS main 04FC2H 00000H @@R_INIS main 04FC8H 00000H
@@R_INIS magic 04FC2H 00000H @@R_INIS magic 04FC8H 00000H
@@R_INIS WDT 04FC2H 00000H @@R_INIS WDT 04FC8H 00000H
@@R_INIS i2c_mcu 04FC2H 00000H @@R_INIS i2c_mcu 04FC8H 00000H
@@R_INIS i2c_twl 04FC2H 00000H @@R_INIS i2c_twl 04FC8H 00000H
@@R_INIS led 04FC2H 00000H @@R_INIS led 04FC8H 00000H
@@R_INIS rtc 04FC2H 00000H @@R_INIS rtc 04FC8H 00000H
@@R_INIS vreg_ctr 04FC2H 00000H @@R_INIS vreg_ctr 04FC8H 00000H
@@R_INIS vreg_twl 04FC2H 00000H @@R_INIS vreg_twl 04FC8H 00000H
@@R_INIS adc 04FC2H 00000H @@R_INIS adc 04FC8H 00000H
@@R_INIS renge 04FC2H 00000H @@R_INIS renge 04FC8H 00000H
@@R_INIS accero 04FC2H 00000H @@R_INIS accero 04FC8H 00000H
@@R_INIS self_flash @@R_INIS self_flash
04FC2H 00000H 04FC8H 00000H
@@R_INIS sw 04FC2H 00000H @@R_INIS sw 04FC8H 00000H
@@R_INIS task_debug @@R_INIS task_debug
04FC2H 00000H 04FC8H 00000H
@@R_INIS task_misc @@R_INIS task_misc
04FC2H 00000H 04FC8H 00000H
@@R_INIS task_sys 04FC2H 00000H @@R_INIS task_sys 04FC8H 00000H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04FC2H 00000H 04FC8H 00000H
@@R_INIS ini_VECT 04FC2H 00000H @@R_INIS ini_VECT 04FC8H 00000H
@@R_INIS task_status @@R_INIS task_status
04FC2H 00000H 04FC8H 00000H
@@R_INIS @rom 04FC2H 00000H @@R_INIS @rom 04FC8H 00000H
@@CALT 04FC2H 00000H CSEG @@CALT 04FC8H 00000H CSEG
@@CALT @cstart 04FC2H 00000H @@CALT @cstart 04FC8H 00000H
@@CALT loader 04FC2H 00000H @@CALT loader 04FC8H 00000H
@@CALT pm 04FC2H 00000H @@CALT pm 04FC8H 00000H
@@CALT i2c_ctr 04FC2H 00000H @@CALT i2c_ctr 04FC8H 00000H
@@CALT main 04FC2H 00000H @@CALT main 04FC8H 00000H
@@CALT magic 04FC2H 00000H @@CALT magic 04FC8H 00000H
@@CALT WDT 04FC2H 00000H @@CALT WDT 04FC8H 00000H
@@CALT i2c_mcu 04FC2H 00000H @@CALT i2c_mcu 04FC8H 00000H
@@CALT i2c_twl 04FC2H 00000H @@CALT i2c_twl 04FC8H 00000H
@@CALT led 04FC2H 00000H @@CALT led 04FC8H 00000H
@@CALT rtc 04FC2H 00000H @@CALT rtc 04FC8H 00000H
@@CALT vreg_ctr 04FC2H 00000H @@CALT vreg_ctr 04FC8H 00000H
@@CALT vreg_twl 04FC2H 00000H @@CALT vreg_twl 04FC8H 00000H
@@CALT adc 04FC2H 00000H @@CALT adc 04FC8H 00000H
@@CALT renge 04FC2H 00000H @@CALT renge 04FC8H 00000H
@@CALT accero 04FC2H 00000H @@CALT accero 04FC8H 00000H
@@CALT self_flash @@CALT self_flash
04FC2H 00000H 04FC8H 00000H
@@CALT sw 04FC2H 00000H @@CALT sw 04FC8H 00000H
@@CALT task_debug @@CALT task_debug
04FC2H 00000H 04FC8H 00000H
@@CALT task_misc @@CALT task_misc
04FC2H 00000H 04FC8H 00000H
@@CALT task_sys 04FC2H 00000H @@CALT task_sys 04FC8H 00000H
@@CALT pedo_alg_thre_det2 @@CALT pedo_alg_thre_det2
04FC2H 00000H 04FC8H 00000H
@@CALT ini_VECT 04FC2H 00000H @@CALT ini_VECT 04FC8H 00000H
@@CALT task_status @@CALT task_status
04FC2H 00000H 04FC8H 00000H
@@RLINIT 04FC2H 00000H CSEG UNIT64KP @@RLINIT 04FC8H 00000H CSEG UNIT64KP
@@RLINIT loader 04FC2H 00000H @@RLINIT loader 04FC8H 00000H
@@RLINIT pm 04FC2H 00000H @@RLINIT pm 04FC8H 00000H
@@RLINIT i2c_ctr 04FC2H 00000H @@RLINIT i2c_ctr 04FC8H 00000H
@@RLINIT main 04FC2H 00000H @@RLINIT main 04FC8H 00000H
@@RLINIT magic 04FC2H 00000H @@RLINIT magic 04FC8H 00000H
@@RLINIT WDT 04FC2H 00000H @@RLINIT WDT 04FC8H 00000H
@@RLINIT i2c_mcu 04FC2H 00000H @@RLINIT i2c_mcu 04FC8H 00000H
@@RLINIT i2c_twl 04FC2H 00000H @@RLINIT i2c_twl 04FC8H 00000H
@@RLINIT led 04FC2H 00000H @@RLINIT led 04FC8H 00000H
@@RLINIT rtc 04FC2H 00000H @@RLINIT rtc 04FC8H 00000H
@@RLINIT vreg_ctr 04FC2H 00000H @@RLINIT vreg_ctr 04FC8H 00000H
@@RLINIT vreg_twl 04FC2H 00000H @@RLINIT vreg_twl 04FC8H 00000H
@@RLINIT adc 04FC2H 00000H @@RLINIT adc 04FC8H 00000H
@@RLINIT renge 04FC2H 00000H @@RLINIT renge 04FC8H 00000H
@@RLINIT accero 04FC2H 00000H @@RLINIT accero 04FC8H 00000H
@@RLINIT self_flash @@RLINIT self_flash
04FC2H 00000H 04FC8H 00000H
@@RLINIT sw 04FC2H 00000H @@RLINIT sw 04FC8H 00000H
@@RLINIT task_debug @@RLINIT task_debug
04FC2H 00000H 04FC8H 00000H
@@RLINIT task_misc @@RLINIT task_misc
04FC2H 00000H 04FC8H 00000H
@@RLINIT task_sys 04FC2H 00000H @@RLINIT task_sys 04FC8H 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04FC2H 00000H 04FC8H 00000H
@@RLINIT ini_VECT 04FC2H 00000H @@RLINIT ini_VECT 04FC8H 00000H
@@RLINIT task_status @@RLINIT task_status
04FC2H 00000H 04FC8H 00000H
@@RLINIT @rom 04FC2H 00000H @@RLINIT @rom 04FC8H 00000H
@@CODEL 04FC2H 00000H CSEG @@CODEL 04FC8H 00000H CSEG
@@CODEL pm 04FC2H 00000H @@CODEL pm 04FC8H 00000H
@@CODEL i2c_ctr 04FC2H 00000H @@CODEL i2c_ctr 04FC8H 00000H
@@CODEL magic 04FC2H 00000H @@CODEL magic 04FC8H 00000H
@@CODEL i2c_twl 04FC2H 00000H @@CODEL i2c_twl 04FC8H 00000H
@@CODEL led 04FC2H 00000H @@CODEL led 04FC8H 00000H
@@CODEL rtc 04FC2H 00000H @@CODEL rtc 04FC8H 00000H
@@CODEL vreg_ctr 04FC2H 00000H @@CODEL vreg_ctr 04FC8H 00000H
@@CODEL vreg_twl 04FC2H 00000H @@CODEL vreg_twl 04FC8H 00000H
@@CODEL adc 04FC2H 00000H @@CODEL adc 04FC8H 00000H
@@CODEL renge 04FC2H 00000H @@CODEL renge 04FC8H 00000H
@@CODEL accero 04FC2H 00000H @@CODEL accero 04FC8H 00000H
@@CODEL sw 04FC2H 00000H @@CODEL sw 04FC8H 00000H
@@CODEL task_misc @@CODEL task_misc
04FC2H 00000H 04FC8H 00000H
@@CODEL task_sys 04FC2H 00000H @@CODEL task_sys 04FC8H 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04FC2H 00000H 04FC8H 00000H
@@CODEL ini_VECT 04FC2H 00000H @@CODEL ini_VECT 04FC8H 00000H
@@LCODEL 04FC2H 00008H CSEG @@LCODEL 04FC8H 00008H CSEG
@@LCODEL abs 04FC2H 00008H @@LCODEL abs 04FC8H 00008H
* gap * 04FCAH 0002CH * gap * 04FD0H 00026H
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH MGC_TAIL magic 04FF6H 0000AH
@ -436,16 +436,16 @@ Direc-file:bsr_mcu.dr
@@DATA rtc FFBCEH 00008H @@DATA rtc FFBCEH 00008H
@@DATA vreg_ctr FFBD6H 0005EH @@DATA vreg_ctr FFBD6H 0005EH
@@DATA vreg_twl FFC34H 00012H @@DATA vreg_twl FFC34H 00012H
@@DATA adc FFC46H 00018H @@DATA adc FFC46H 0001AH
@@DATA renge FFC5EH 00022H @@DATA renge FFC60H 00022H
@@DATA accero FFC80H 00002H @@DATA accero FFC82H 00002H
@@DATA self_flash @@DATA self_flash
FFC82H 00002H FFC84H 00002H
@@DATA sw FFC84H 00008H @@DATA sw FFC86H 00008H
@@DATA task_debug @@DATA task_debug
FFC8CH 00000H FFC8EH 00000H
@@DATA task_misc @@DATA task_misc
FFC8CH 0000EH FFC8EH 0000CH
@@DATA task_sys FFC9AH 00002H @@DATA task_sys FFC9AH 00002H
@@DATA pedo_alg_thre_det2 @@DATA pedo_alg_thre_det2
FFC9CH 00096H FFC9CH 00096H

5
branches/SDK0.14/bsr_system.h
View File

@ -5,13 +5,13 @@
enum pwr_state_ enum pwr_state_
{ {
OFF_TRIG = 0, OFF_TRIG = 0,
OFF, ON_CHECK,
ON_TRIG, ON_TRIG,
ON, ON,
// SLEEP_TRIG, // SLEEP_TRIG,
SLEEP, SLEEP,
// WAKE, // WAKE,
BT_CHARGE, OFF,
}; };
enum poweron_reason_ enum poweron_reason_
@ -42,6 +42,7 @@ typedef struct _system_status_
unsigned char force_off:1; unsigned char force_off:1;
unsigned char captureBox:1; // キャプチャ箱 SDKには実機と返す unsigned char captureBox:1; // キャプチャ箱 SDKには実機と返す
unsigned char taikendai:1; unsigned char taikendai:1;
unsigned char taikendai_nbd:1;
enum model_ model; enum model_ model;
}system_status_; }system_status_;

4
branches/SDK0.14/config.h
View File

@ -11,9 +11,11 @@
//#define _PMIC_TEST_ //#define _PMIC_TEST_
//#define _ENABLE_WDT_TEST_ //#define _ENABLE_WDT_TEST_
//#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_
//#define _FORCE_TAIKENDAI_NBD_
#define MCU_VER_MAJOR 0x01 #define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x14 #define MCU_VER_MINOR 0x16
#define _firm_format_v3_ #define _firm_format_v3_

BIN
branches/SDK0.14/hoge.bin
View File

Binary file not shown.

7
branches/SDK0.14/i2c_ctr.c
View File

@ -148,14 +148,7 @@ __interrupt void int_iic_ctr( )
reg_adrs = IICA; reg_adrs = IICA;
adrs_access_from = reg_adrs; adrs_access_from = reg_adrs;
tx_buf = vreg_ctr_read( reg_adrs ); // データの準備をしておく tx_buf = vreg_ctr_read( reg_adrs ); // データの準備をしておく
if( reg_adrs != VREG_CX_INFO ) // 特殊なバーストリードを行うため、割り込み駆動から外す
{
state = IIC_TX_OR_RX; state = IIC_TX_OR_RX;
}
else
{
state = IIC_IDLE;
}
WREL = 1; WREL = 1;
break; break;

26
branches/SDK0.14/i2c_mcu.c
View File

@ -94,6 +94,7 @@ static err iic_mcu_wait_free()
if( !iic_mcu_busy ) if( !iic_mcu_busy )
{ {
iic_mcu_busy = true; iic_mcu_busy = true;
EI();
break; break;
} }
EI(); EI();
@ -105,7 +106,6 @@ static err iic_mcu_wait_free()
return( ERR_ERR ); return( ERR_ERR );
} }
} }
EI();
return( ERR_SUCCESS ); return( ERR_SUCCESS );
} }
@ -374,30 +374,30 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src )
======================================================== */ ======================================================== */
__interrupt void int_dma1( ) __interrupt void int_dma1( )
{ {
u16 i = 0;
EI(); EI();
DMAMK1 = 1; DMAMK1 = 1;
DEN1 = 0; DEN1 = 0;
while( ( SSR02L & TSF0 ) != 0 ) while( ( SSR02L & TSF0 ) != 0 )
{ {
u16 i = 0;
if( ++i == 0 ) // タイムアウト？ if( ++i == 0 ) // タイムアウト？
{ {
break; break;
} }
} }
// iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪いので展開 // iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪い（汎用レジスタ待避が発生する）ので展開
{ {
ST0 = 0x0004; ST0 = 0x0004;
SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力)
SO0 = 0x0000 | TAUS_MASK; // SCL SO0 = 0x0000 | TAUS_MASK; // SCL
nop8(); // nop8(); すら呼んじゃだめ
NOP(); NOP(); NOP(); NOP();
NOP(); NOP(); NOP(); NOP();
SO0 = 0x0400 | TAUS_MASK; // SCL SO0 = 0x0400 | TAUS_MASK; // SCL
nop8(); NOP(); NOP(); NOP(); NOP();
NOP(); NOP(); NOP(); NOP();
SO0 = 0x0404 | TAUS_MASK; SO0 = 0x0404 | TAUS_MASK;
} }
IICMK10 = 1; IICMK10 = 1;
@ -425,16 +425,16 @@ __interrupt void int_iic10( )
// 最後のバイト送信完了 // 最後のバイト送信完了
IICMK10 = 1; IICMK10 = 1;
// iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪いので展開 // iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪い（汎用レジスタ待避が発生する）ので展開
{ {
ST0 = 0x0004; ST0 = 0x0004;
SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力)
SO0 = 0x0000 | TAUS_MASK; // SCL SO0 = 0x0000 | TAUS_MASK; // SCL
nop8(); NOP(); NOP(); NOP(); NOP();
NOP(); NOP(); NOP(); NOP();
SO0 = 0x0400 | TAUS_MASK; // SCL SO0 = 0x0400 | TAUS_MASK; // SCL
nop8(); NOP(); NOP(); NOP(); NOP();
NOP(); NOP(); NOP(); NOP();
SO0 = 0x0404 | TAUS_MASK; SO0 = 0x0404 | TAUS_MASK;
} }
iic_mcu_wo_dma = false; iic_mcu_wo_dma = false;

2
branches/SDK0.14/i2c_twl.c
View File

@ -150,7 +150,7 @@ __interrupt void int_iic_twl( )
{ {
// ③W // ③W
// データ書き込まれ // データ書き込まれ
SVA = 0x5A; SVA = 0x5A; // ダミー
LREL = 1; // スタートコンディション待ちへ(連続書き込み未対応のため) LREL = 1; // スタートコンディション待ちへ(連続書き込み未対応のため)
vreg_twl_write( vreg_adrs, rcvd ); vreg_twl_write( vreg_adrs, rcvd );
SVA = IIC_T_SLAVEADDRESS; SVA = IIC_T_SLAVEADDRESS;

26
branches/SDK0.14/led.c
View File

@ -187,6 +187,7 @@ void LED_init( )
LED_duty_notify_grn = 0; LED_duty_notify_grn = 0;
LED_pow_red = 0; LED_pow_red = 0;
LED_CAM = 0; LED_CAM = 0;
LED_old_pow_red = 0;
if( system_status.reboot ) if( system_status.reboot )
{ {
@ -220,7 +221,7 @@ void LED_stop( )
enum pwr_state_{ enum pwr_state_{
OFF_TRIG = 0, OFF_TRIG = 0,
OFF, ON_CHECK,
ON_TRIG, ON_TRIG,
ON, ON,
SLEEP SLEEP
@ -272,6 +273,12 @@ void tsk_led_pow( )
break; break;
} }
if( system_status.pwr_state == OFF || system_status.pwr_state == ON_CHECK )
{
LED_pow_red_Mirror = 0;
info_led_override = false;
}
// 実際にLEDの更新 // 実際にLEDの更新
if( system_status.info_fullcolor ) if( system_status.info_fullcolor )
{ {
@ -308,7 +315,7 @@ static void led_pow_normal( )
frame_sleep = 0; frame_sleep = 0;
LED_dim_status_sleep.now = (sx16)LED_duty_pow_blu * 128; LED_dim_status_sleep.now = (sx16)LED_duty_pow_blu * 128;
if( led_pow_batt_low() != 0 ) if( led_pow_batt_low() != 0 ) // 赤の点灯も←でやっています
{ {
return; return;
// おしまい // おしまい
@ -326,7 +333,7 @@ static void led_pow_normal( )
======================================================== */ ======================================================== */
static void led_pow_sleep( ) static void led_pow_sleep( )
{ {
if( led_pow_batt_low() != 0 ) if( led_pow_batt_low() != 0 ) // 赤の点灯も←でやっています
{ {
time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN; time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN;
frame_sleep = 0; frame_sleep = 0;
@ -558,12 +565,10 @@ void tsk_led_notify( )
// 次のフレームに進める？ // 次のフレームに進める？
if( time_to_next_frame == 0 ) if( time_to_next_frame == 0 )
{ {
DBG_LED_on;
time_to_next_frame = info_LED.info_LED.term; time_to_next_frame = info_LED.info_LED.term;
if( frame >= NOTIFY_LED_TERM -1 ) if( frame >= NOTIFY_LED_TERM -1 )
{ {
DBG_LED2_on;
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP; vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP;
if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ
{ {
@ -591,8 +596,6 @@ void tsk_led_notify( )
LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.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;
} }
DBG_LED_off;
DBG_LED2_off;
time_to_next_frame -= 1; time_to_next_frame -= 1;
} }
} }
@ -632,7 +635,15 @@ void tsk_led_cam( )
} }
} }
cam_led_update = false; // TWL のブリンク設定（一発だけ点灯）のため cam_led_update = false; // TWL のブリンク設定（一発だけ点灯）のため
EI();
if( system_status.pwr_state == SLEEP ) // sleep中、強制消灯
{
LED_CAM_mirror = 0;
state_led_cam = 0;
}
else
{
// ブリンクのように待たせたいとき以外は毎週起動する // ブリンクのように待たせたいとき以外は毎週起動する
// (レジスタの変更にすぐに反応する) // (レジスタの変更にすぐに反応する)
switch ( vreg_ctr[VREG_C_LED_CAM] ) switch ( vreg_ctr[VREG_C_LED_CAM] )
@ -717,6 +728,7 @@ void tsk_led_cam( )
break; break;
} }
} }
} // if( system_status.pwr_state == sleep ) ... else ...
// 輝度更新 // // 輝度更新 //
if( system_status.info_fullcolor ) if( system_status.info_fullcolor )

13
branches/SDK0.14/loader.c
View File

@ -150,6 +150,19 @@ void main( )
system_status.taikendai = 0; system_status.taikendai = 0;
} }
#ifndef _FORCE_TAIKENDAI_NBD_
if( !DIPSW_1 )
#else
if(1)
#endif
{
system_status.taikendai_nbd = 1;
}
else
{
system_status.taikendai_nbd = 0;
}
// ’Ê<E28099>í‰^“] // ’Ê<E28099>í‰^“]
main_loop( ); main_loop( );
} }

22
branches/SDK0.14/pm.c
View File

@ -165,8 +165,8 @@ void tsk_batt( )
// 割り込みはmiscが引き受ける // 割り込みはmiscが引き受ける
// 電池残量 // // 電池残量 //
if(( system_status.pwr_state != OFF )&& if(( system_status.pwr_state != ON_CHECK )&&
( system_status.pwr_state != BT_CHARGE )) ( system_status.pwr_state != OFF ))
{ {
BT_get_left(); BT_get_left();
} }
@ -566,6 +566,7 @@ void BT_get_left(){
else if( system_status.model == MODEL_SHIROBAKO ) else if( system_status.model == MODEL_SHIROBAKO )
{ {
// 白箱 // // 白箱 //
// 電池残量
if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp_fuel ) != ERR_SUCCESS ) if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp_fuel ) != ERR_SUCCESS )
{ {
// エミュレーション機能がおかしい // エミュレーション機能がおかしい
@ -576,8 +577,18 @@ void BT_get_left(){
vreg_ctr[ VREG_C_BT_REMAIN ] = temp_fuel[0]; vreg_ctr[ VREG_C_BT_REMAIN ] = temp_fuel[0];
vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp_fuel[1]; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp_fuel[1];
} }
// 電池電圧
//*
if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL, 2, temp_fuel ) == ERR_SUCCESS )
{
vreg_ctr[ VREG_C_BT_VOLTAGE ] = temp_fuel[0];
}
else
//*/
{
vreg_ctr[ VREG_C_BT_VOLTAGE ] = 200; vreg_ctr[ VREG_C_BT_VOLTAGE ] = 200;
} }
}
else else
{ {
// 実機 // // 実機 //
@ -672,6 +683,10 @@ void BT_get_left(){
} }
} }
} }
if( system_status.taikendai_nbd )
{
vreg_ctr[ VREG_C_BT_REMAIN ] = 100;
}
} }
@ -958,11 +973,12 @@ err PM_sys_pow_on( )
return ( ERR_ERR ); // reset1はほっといて良い return ( ERR_ERR ); // reset1はほっといて良い
} }
// リセット解除など。システム起動！
PM_reset_neg(); PM_reset_neg();
FCRAM_RST_neg; FCRAM_RST_neg;
RESET2_neg; RESET2_neg;
codec_reg_init(); // CODEC 不定レジスタ初期化 codec_reg_init(); // CODEC 不定レジスタ初期化(reset2の後でないといけないので)
reg_shadow = 0; // 　〃　こんなところで... reg_shadow = 0; // 　〃　こんなところで...
return ( ERR_SUCCESS ); return ( ERR_SUCCESS );

2
branches/SDK0.14/sw.c
View File

@ -98,8 +98,8 @@ void tsk_sw( )
{ {
case ( ON ): case ( ON ):
case ( SLEEP ): case ( SLEEP ):
case ( BT_CHARGE ):
case ( OFF ): case ( OFF ):
case ( ON_CHECK ):
// 電源スイッチの監視 // // 電源スイッチの監視 //
if( SW_pow_count == ( TIME_PWSW_CLICK ) ) if( SW_pow_count == ( TIME_PWSW_CLICK ) )
{ {

2
branches/SDK0.14/task_debug.c
View File

@ -95,7 +95,7 @@ task_interval tsk_hina( )
{ {
switch ( system_status.pwr_state ) switch ( system_status.pwr_state )
{ {
case OFF: case ON_CHECK:
case ON_TRIG: case ON_TRIG:
case ON: case ON:
case SLEEP: case SLEEP:

29
branches/SDK0.14/task_misc.c
View File

@ -95,7 +95,6 @@ void tsk_misc( )
set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ );
} }
check_twl_vol_irq(); // TWL の音量変化割り込みチェック
} }
update_LED_tune(); // 3D ランプ更新 update_LED_tune(); // 3D ランプ更新
@ -103,34 +102,6 @@ void tsk_misc( )
/* ========================================================
TWLがVolを書くのと、スライダの操作がバッティングすると
不整合が起こる事があり、それを防ぐ
TWLでは8通常時、押しボタンは8段階だった。それに合わせて割り込みを入れたい
======================================================== */
void check_twl_vol_irq()
{
static u8 mabiki;
if( mabiki != 0 )
{
mabiki--;
}
else
{
mabiki = 6;
if( is_TWL )
{
if( vol_level_twl != vol_level_twl_readed )
{
set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY );
}
}
}
}
// TUNE_LED /////////////////////////////////// // TUNE_LED ///////////////////////////////////
void update_LED_tune() void update_LED_tune()

46
branches/SDK0.14/task_sys.c
View File

@ -50,7 +50,7 @@ void tsk_sys( )
switch ( system_status.pwr_state ) switch ( system_status.pwr_state )
{ {
case OFF: //------------------------------------------------------- case ON_CHECK: //-------------------------------------------------------
// スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。 // スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。
if( system_status.poweron_reason == NONE ) if( system_status.poweron_reason == NONE )
@ -67,7 +67,7 @@ void tsk_sys( )
if( timeout > 100 ) if( timeout > 100 )
{ {
system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 system_status.pwr_state = OFF; // スイッチはノイズだった。寝る。
renge_task_interval_run_force = true; renge_task_interval_run_force = true;
return; return;
} }
@ -288,10 +288,10 @@ void tsk_sys( )
} }
break; break;
case OFF_TRIG: //--------------------------------------- default: //---------------------------------------
default:
system_status.pwr_state = OFF_TRIG; system_status.pwr_state = OFF_TRIG;
// no break //
case OFF_TRIG: //---------------------------------------
// LED消灯を待つ // LED消灯を待つ
vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF;
vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF; vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF;
@ -300,7 +300,6 @@ void tsk_sys( )
if( LED_duty_pow_blu != 0 ) if( LED_duty_pow_blu != 0 )
{ {
return; return;
// フェードアウトしたい
} }
clear_pow_off_countdown(); clear_pow_off_countdown();
@ -364,14 +363,14 @@ void tsk_sys( )
timeout = 0; timeout = 0;
system_status.pwr_state = BT_CHARGE; system_status.pwr_state = OFF;
SW_pow_mask = true; SW_pow_mask = true;
SW_pow_count = 0; SW_pow_count = 0;
// no break // // no break //
case BT_CHARGE: case OFF:
if( !PM_EXTDC_n ) if( !PM_EXTDC_n )
{ {
// アダプタが刺さってるときはこのブロックを繰り返す。 // アダプタが刺さってるときはこのブロックを繰り返す。
@ -383,7 +382,7 @@ void tsk_sys( )
{ {
// 電源投入 // 電源投入
system_status.poweron_reason = PWSW; system_status.poweron_reason = PWSW;
system_status.pwr_state = OFF; system_status.pwr_state = ON_CHECK;
} }
if( system_status.model != MODEL_JIKKI ) if( system_status.model != MODEL_JIKKI )
{ {
@ -395,20 +394,17 @@ void tsk_sys( )
// 電源投入 // 電源投入
wait_ms(46); wait_ms(46);
system_status.poweron_reason = PWSW; system_status.poweron_reason = PWSW;
system_status.pwr_state = OFF; system_status.pwr_state = ON_CHECK;
} }
} }
else else
{ {
// / static bit chg_ena_orig; // アダプタなし
if( chg_led_override != 0 ) // これがゼロになるまで待つ if( chg_led_override != 0 ) // これがゼロになるまで待つ
{ {
return; return;
}; };
// / chg_ena_orig = BT_CHG_Ena_n;
// 省電力へ移行 // 省電力へ移行
system_status.poweron_reason = NONE; system_status.poweron_reason = NONE;
@ -426,30 +422,24 @@ void tsk_sys( )
CKC = 0b00001001; CKC = 0b00001001;
OSMC = 0x00; OSMC = 0x00;
// / BT_CHG_ENABLE(); // リークを減らすため
STOP( ); STOP( );
// 起きる // // 起きる //
// 起きる条件は // 起きる条件は
// ・KeyReturn割り込み（電源ボたん） // ・KeyReturn割り込み（電源ボタン）
// ・RTCアラーム
// ・アダプタ挿抜 // ・アダプタ挿抜
// / BT_CHG_Ena_n = chg_ena_orig;
if( PM_EXTDC_n )
{
// 一度起こしてしまう。ペリフェラルの初期化など流用のため。
// 電源ボタンのタイムアウトで返ってくる
SW_pow_mask = false;
}
OSMC = 0x01; OSMC = 0x01;
CKC = 0b00001000; CKC = 0b00001000;
if( PM_EXTDC_n )
{
// 電源ボタンで起きたとき
SW_pow_mask = false;
system_status.poweron_reason = NONE;
system_status.pwr_state = ON_CHECK;
}
RTCIMK = 0; RTCIMK = 0;
system_status.pwr_state = OFF;
if( system_status.taikendai ) if( system_status.taikendai )
{ {
system_status.pwr_state = OFF_TRIG; system_status.pwr_state = OFF_TRIG;

2
branches/SDK0.14/vreg_twl.c
View File

@ -61,7 +61,7 @@ void vreg_twl_write( u8 adrs, u8 data )
vreg_twl[ REG_TWL_INT_ADRS_CAM ] = ( data & 0x03 ); vreg_twl[ REG_TWL_INT_ADRS_CAM ] = ( data & 0x03 );
if( ( data & 0x03 ) == TWL_CAMLED_BLINK ) if( ( data & 0x03 ) == TWL_CAMLED_BLINK )
{ {
cam_led_update = true; cam_led_update = true; // こうでないと一発消灯時に不具合があるため
} }
tsk_led_cam(); tsk_led_cam();
break; break;

99
branches/SDK0.14/yav_mcu_bsr.plg
View File

@ -1,104 +1,21 @@
C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no pm.c
pm.c(801) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(878) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(886) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1101) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1104) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 5 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no magic.c "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no magic.c
Compilation complete, 0 error(s) and 0 warning(s) found. Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\magic.asm "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\magic.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_twl.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no led.c
led.c(109) : CC78K0R warning W0745: Expected function prototype
led.c(251) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(256) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(318) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(377) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(403) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(579) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 7 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no rtc.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\rtc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no vreg_ctr.c
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(217) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 14 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c
vreg_twl.c(57) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_twl.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no adc.c "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no adc.c
adc.c(103) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(103) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(200) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(201) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(232) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(233) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(344) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(362) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(402) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(462) : CC78K0R warning W0745: Expected function prototype adc.c(480) : CC78K0R warning W0745: Expected function prototype
adc.c(491) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(509) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(496) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(514) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(122) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(122) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 9 warning(s) found. Compilation complete, 0 error(s) and 9 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\adc.asm "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\adc.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no accero.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\accero.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no sw.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\sw.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no task_misc.c
task_misc.c(312) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 1 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_misc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -ms -qvjl2w -sainter_asm -zpb -no task_sys.c
task_sys.c(207) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(527) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_sys.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -irenge -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 (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\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 (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\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 (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\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. Link complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf
@ -109,4 +26,4 @@ intel-HEX to bsr bin converter
file converted! file converted!
Build Total error(s) : 0 Total warning(s) : 44 Build Total error(s) : 0 Total warning(s) : 9

6
branches/SDK0.14/yav_mcu_bsr.prj
View File

@ -1,12 +1,12 @@
[ProjectManager] [ProjectManager]
Version=6.00 Version=6.00
Path=C:\78k_data\yav-mcu-basara\branches\SDK0.14\ Path=C:\78k_data\yav-mcu-basara\branches\0nup\
Title=yav-mcu Title=yav-mcu
Series=78K0R.PM Series=78K0R.PM
Device=uPD79F0104 Device=uPD79F0104
DeviceVer=E1.00b DeviceVer=E1.00b
DebugMode=1 DebugMode=1
Target=C:\78k_data\yav-mcu-basara\branches\SDK0.14\bsr.lmf Target=bsr.lmf
[BuildMode0] [BuildMode0]
BuildModeName=Debug Build BuildModeName=Debug Build
TargetFile=0 TargetFile=0
@ -874,7 +874,7 @@ ZB=
Etcetera0= Etcetera0=
Etcetera1=boot.lmf Etcetera1=boot.lmf
CommandFile=0 CommandFile=0
OFILE=C:\78k_data\yav-mcu-basara\branches\SDK0.14\bsr.lmf OFILE=C:\78k_data\yav-mcu-basara\branches\0nup\bsr.lmf
[Options.LK78K0R 3] [Options.LK78K0R 3]
Version=100 Version=100
O0=bsr_bsr.lmf O0=bsr_bsr.lmf

16
branches/SDK0.14/yav_mcu_bsr.prk
View File

@ -1,9 +1,9 @@
[ProjectManager] [ProjectManager]
FrameMax=0 FrameMax=0
FrameX=444 FrameX=382
FrameY=7 FrameY=75
FrameCX=1465 FrameCX=1435
FrameCY=1081 FrameCY=1045
OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0 OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0
OpenFile2=self_flash.c,0,352,352,1596,1078,0,142,5,0 OpenFile2=self_flash.c,0,352,352,1596,1078,0,142,5,0
OpenFile3=ini_VECT.c,0,330,330,1574,1056,6,93,6,0 OpenFile3=ini_VECT.c,0,330,330,1574,1056,6,93,6,0
@ -15,11 +15,11 @@ OpenFile8=task_misc.c,0,286,286,1530,1012,65,141,69,0
OpenFile9=main.c,0,220,220,1464,946,3,27,1,0 OpenFile9=main.c,0,220,220,1464,946,3,27,1,0
OpenFile10=i2c_mcu.c,0,308,308,1552,1034,10,76,7,0 OpenFile10=i2c_mcu.c,0,308,308,1552,1034,10,76,7,0
OpenFile11=task_sys.c,0,330,330,1574,1056,10,38,7,0 OpenFile11=task_sys.c,0,330,330,1574,1056,10,38,7,0
OpenFile12=pm.c,0,110,110,1078,614,11,677,11,0 OpenFile12=ProjectWindow
OpenFile13=ProjectWindow
PrjPos=0,0,706,0,291 PrjPos=0,0,706,0,291
OpenFile14=sw.c,0,45,368,1050,888,3,103,3,0 OpenFile13=sw.c,0,45,368,1050,888,3,103,3,0
OpenFile15=config.h,0,242,242,1486,968,29,16,29,0 OpenFile14=config.h,0,242,242,1486,968,29,16,29,0
OpenFile15=pm.c,0,110,110,1078,614,0,976,0,0
OpenFile16=OutputWindow OpenFile16=OutputWindow
OutputPos=0,58,764,389,1336 OutputPos=0,58,764,389,1336
ActivePRJ=yav_mcu_bsr.prj ActivePRJ=yav_mcu_bsr.prj

112
branches/SDK0.14/yav_mcu_bsr.sdb
View File

@ -1,7 +1,7 @@
[SdbInfo] [SdbInfo]
Ver=5 Ver=5
[loader.c] [loader.c]
T=4cff438c T=4d4654dc
1=incs_loader.h 1=incs_loader.h
2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
3=fsl_user.h 3=fsl_user.h
@ -12,7 +12,7 @@ T=4cff438c
8=reboot.h 8=reboot.h
9=magic.h 9=magic.h
[pm.c] [pm.c]
T=4d13f6ca T=4d46570e
1=incs.h 1=incs.h
2=adc.h 2=adc.h
3=led.h 3=led.h
@ -22,11 +22,11 @@ T=4d13f6ca
7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
8=fsl_user.h 8=fsl_user.h
[i2c_ctr.c] [i2c_ctr.c]
T=4cff438d T=4d4653fe
1=config.h 1=config.h
2=incs.h 2=incs.h
[main.c] [main.c]
T=4cff438d T=4d465013
1=incs_loader.h 1=incs_loader.h
2=WDT.h 2=WDT.h
3=rtc.h 3=rtc.h
@ -36,31 +36,31 @@ T=4cff438d
7=adc.h 7=adc.h
8=pool.h 8=pool.h
[magic.c] [magic.c]
T=4d1af0ad T=4d466507
1=config.h 1=config.h
2=magic.h 2=magic.h
[WDT.c] [WDT.c]
T=4cff438d T=4d465012
1=incs_loader.h 1=incs_loader.h
[i2c_mcu.c] [i2c_mcu.c]
T=4cff438c T=4d465421
1=incs_loader.h 1=incs_loader.h
2=i2c_mcu.h 2=i2c_mcu.h
[i2c_twl.c] [i2c_twl.c]
T=4cff438c T=4d46542c
1=config.h 1=config.h
2=incs.h 2=incs.h
3=i2c_twl_defs.h 3=i2c_twl_defs.h
4=i2c_twl.h 4=i2c_twl.h
[led.c] [led.c]
T=4cff438d T=4d465474
1=incs.h 1=incs.h
2=led.h 2=led.h
[rtc.c] [rtc.c]
T=4cff438d T=4d465012
1=incs.h 1=incs.h
[vreg_ctr.c] [vreg_ctr.c]
T=4d1aea46 T=4d465013
1=incs.h 1=incs.h
2=vreg_ctr.h 2=vreg_ctr.h
3=rtc.h 3=rtc.h
@ -71,14 +71,14 @@ T=4d1aea46
8=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 8=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
9=fsl_user.h 9=fsl_user.h
[vreg_twl.c] [vreg_twl.c]
T=4cff438c T=4d465626
1=incs.h 1=incs.h
2=jhl_defs.h 2=jhl_defs.h
3=led.h 3=led.h
4=vreg_twl.h 4=vreg_twl.h
5=vreg_ctr.h 5=vreg_ctr.h
[adc.c] [adc.c]
T=4cff438d T=4d4670e8
1=incs.h 1=incs.h
2=adc.h 2=adc.h
3=pm.h 3=pm.h
@ -86,7 +86,7 @@ T=4cff438d
5=vreg_twl.h 5=vreg_twl.h
6=voltable.h 6=voltable.h
[renge\renge.c] [renge\renge.c]
T=4cff438b T=4d465000
1=renge\renge.h 1=renge\renge.h
2=renge\renge_task_intval.h 2=renge\renge_task_intval.h
3=renge\renge_task_immediate.h 3=renge\renge_task_immediate.h
@ -95,12 +95,12 @@ T=4cff438b
6=user_define.h 6=user_define.h
7=bsr_system.h 7=bsr_system.h
[accero.c] [accero.c]
T=4cff438d T=4d4653bf
1=config.h 1=config.h
2=incs.h 2=incs.h
3=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
[self_flash.c] [self_flash.c]
T=4cff438c T=4d465012
1=incs_loader.h 1=incs_loader.h
2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
3=fsl_user.h 3=fsl_user.h
@ -109,7 +109,7 @@ T=4cff438c
6=magic.h 6=magic.h
7=pm.h 7=pm.h
[sw.c] [sw.c]
T=4d15b8e9 T=4d465571
1=incs.h 1=incs.h
2=i2c_twl.h 2=i2c_twl.h
3=i2c_ctr.h 3=i2c_ctr.h
@ -118,13 +118,13 @@ T=4d15b8e9
6=rtc.h 6=rtc.h
7=sw.h 7=sw.h
[task_debug.c] [task_debug.c]
T=4cff438d T=4d46557a
1=incs_loader.h 1=incs_loader.h
2=renge\renge.h 2=renge\renge.h
3=pm.h 3=pm.h
4=accero.h 4=accero.h
[task_misc.c] [task_misc.c]
T=4d1aef15 T=4d466505
1=incs.h 1=incs.h
2=renge\renge.h 2=renge\renge.h
3=pm.h 3=pm.h
@ -134,7 +134,7 @@ T=4d1aef15
7=led.h 7=led.h
8=vreg_twl.h 8=vreg_twl.h
[task_sys.c] [task_sys.c]
T=4cff4676 T=4d4655fc
1=incs.h 1=incs.h
2=i2c_twl.h 2=i2c_twl.h
3=i2c_ctr.h 3=i2c_ctr.h
@ -146,7 +146,7 @@ T=4cff4676
9=adc.h 9=adc.h
10=self_flash.h 10=self_flash.h
[pedo_alg_thre_det2.c] [pedo_alg_thre_det2.c]
T=4cff438d T=4d465012
1=incs.h 1=incs.h
2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
3=accero.h 3=accero.h
@ -154,10 +154,10 @@ T=4cff438d
5=pedo_lpf_coeff.h 5=pedo_lpf_coeff.h
6=pool.h 6=pool.h
[ini_VECT.c] [ini_VECT.c]
T=4cff438d T=4d465012
1=config.h 1=config.h
[task_status.c] [task_status.c]
T=4cff438d T=4d465012
1=incs_loader.h 1=incs_loader.h
2=renge\renge.h 2=renge\renge.h
3=pm.h 3=pm.h
@ -165,7 +165,7 @@ T=4cff438d
5=adc.h 5=adc.h
6=i2c_mcu.h 6=i2c_mcu.h
[incs_loader.h] [incs_loader.h]
T=4cff438d T=4d465013
1=jhl_defs.h 1=jhl_defs.h
2=user_define.h 2=user_define.h
3=bsr_system.h 3=bsr_system.h
@ -176,48 +176,48 @@ T=4cff438d
8=i2c_mcu.h 8=i2c_mcu.h
9=WDT.h 9=WDT.h
[jhl_defs.h] [jhl_defs.h]
T=4cff438c T=4d465012
1=config.h 1=config.h
[config.h] [config.h]
T=4d1aea90 T=4d465652
[user_define.h] [user_define.h]
T=4cff438d T=4d465013
[bsr_system.h] [bsr_system.h]
T=4cff438d T=4d465639
[renge\renge.h] [renge\renge.h]
T=4cff438b T=4d465000
1=renge\renge_defs.h 1=renge\renge_defs.h
2=renge\renge_task_immediate.h 2=renge\renge_task_immediate.h
[renge\renge_defs.h] [renge\renge_defs.h]
T=4cff438b T=4d465000
[renge\renge_task_immediate.h] [renge\renge_task_immediate.h]
T=4cff438b T=4d465000
1=renge\renge_defs.h 1=renge\renge_defs.h
[vreg_ctr.h] [vreg_ctr.h]
T=4cff438d T=4d465013
1=config.h 1=config.h
[vreg_twl.h] [vreg_twl.h]
T=4cff438c T=4d465012
[loader.h] [loader.h]
T=4cff438c T=4d465012
[i2c_mcu.h] [i2c_mcu.h]
T=4cff438d T=4d465012
[WDT.h] [WDT.h]
T=4cff438d T=4d465012
[fsl_user.h] [fsl_user.h]
T=4cff438d T=4d465012
[i2c_ctr.h] [i2c_ctr.h]
T=4cff438d T=4d465012
[pm.h] [pm.h]
T=4cff438d T=4d465013
[rtc.h] [rtc.h]
T=4cff438d T=4d465012
[reboot.h] [reboot.h]
T=4cff438d T=4d465012
[magic.h] [magic.h]
T=4cff438d T=4d465012
[incs.h] [incs.h]
T=4cff438c T=4d465012
1=jhl_defs.h 1=jhl_defs.h
2=user_define.h 2=user_define.h
3=bsr_system.h 3=bsr_system.h
@ -234,37 +234,37 @@ T=4cff438c
14=adc.h 14=adc.h
15=WDT.h 15=WDT.h
[i2c_twl.h] [i2c_twl.h]
T=4cff438c T=4d465012
[accero.h] [accero.h]
T=4cff438d T=4d465012
1=jhl_defs.h 1=jhl_defs.h
2=pedometer.h 2=pedometer.h
[pedometer.h] [pedometer.h]
T=4cff438c T=4d465012
[sw.h] [sw.h]
T=4d19309c T=4d465012
1=config.h 1=config.h
[adc.h] [adc.h]
T=4cff438d T=4d465012
1=jhl_defs.h 1=jhl_defs.h
[led.h] [led.h]
T=4cff438d T=4d465013
[batt_params.h] [batt_params.h]
T=4cff438d T=4d465012
[pool.h] [pool.h]
T=4cff438c T=4d465012
1=pedometer.h 1=pedometer.h
[i2c_twl_defs.h] [i2c_twl_defs.h]
T=4cff438d T=4d465012
[voltable.h] [voltable.h]
T=4cff438d T=4d465012
[renge\renge_task_intval.h] [renge\renge_task_intval.h]
T=4cff438b T=4d465000
1=renge\renge_defs.h 1=renge\renge_defs.h
[self_flash.h] [self_flash.h]
T=4cff438c T=4d465012
[pedo_lpf_coeff.h] [pedo_lpf_coeff.h]
T=4cff438d T=4d465012
[..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h]
T=49a3bd4e T=49a3bd4e
[..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h]