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カウントしていたのを修正

Browse Source 
HorizonリポジトリにMCUファーム1.4更新版としてコミット(r23379)

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@222 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
N2614 2010-08-12 04:29:00 +00:00
parent 0dbdfcfeba
commit 6fa6476b6c
6 changed files with 552 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

129
trunk/bsr_k0r.map
View File

@ -1,19 +1,20 @@
78K0R Linker W1.31 Date: 5 Aug 2010 Page: 1
78K0R Linker W1.33 Date:12 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 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -n
kd -gb0FEFBFFh -bC:\Program Files\NEC Electronics Tools\FSL78
K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib
-bcl0rmf.lib -iC:\Program Files\NEC Electronics Tools\CC78K0R
\W2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr
.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.r
el 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
Command: -yd:\program files\nec electronics tools\dev -_msgoff -obsr.l
mf ..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2
.12\lib78k0r\s0rm.rel -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map
-nkd -gb0FEFBFFh -bC:\Program Files\NEC Electronics Tools\FS
L78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.l
ib -bcl0rmf.lib -iD:\Program Files\NEC Electronics Tools\CC78
K0R\W2.12\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 le
d.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel acc
ero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel ta
sk_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.re
l
Para-file:
Out-file: bsr.lmf
Map-file: bsr_k0r.map
@ -23,8 +24,8 @@ Direc-file:bsr_mcu.dr
*** Link information ***
64 output segment(s)
3E13H byte(s) real data
5487 symbol(s) defined
3E20H byte(s) real data
5492 symbol(s) defined
*** Memory map ***
@ -367,53 +368,53 @@ Direc-file:bsr_mcu.dr
@@CNST ini_VECT 023C4H 00000H
@@CNST task_status
023C4H 00000H
ROM_CODE 023C4H 026D2H CSEG
ROM_CODE 023C4H 026DFH CSEG
ROM_CODE pm 023C4H 00A1EH
ROM_CODE i2c_ctr 02DE2H 00060H
ROM_CODE i2c_twl 02E42H 0005EH
ROM_CODE led 02EA0H 00503H
ROM_CODE rtc 033A3H 000E0H
ROM_CODE vreg_ctr 03483H 00457H
ROM_CODE vreg_twl 038DAH 00122H
ROM_CODE adc 039FCH 002B9H
ROM_CODE renge 03CB5H 001C3H
ROM_CODE accero 03E78H 0013DH
ROM_CODE sw 03FB5H 00117H
ROM_CODE rtc 033A3H 000E3H
ROM_CODE vreg_ctr 03486H 00457H
ROM_CODE vreg_twl 038DDH 00122H
ROM_CODE adc 039FFH 002B9H
ROM_CODE renge 03CB8H 001C3H
ROM_CODE accero 03E7BH 0013DH
ROM_CODE sw 03FB8H 00117H
ROM_CODE task_misc
040CCH 001C1H
ROM_CODE task_sys 0428DH 0030BH
040CFH 001C1H
ROM_CODE task_sys 04290H 0030BH
ROM_CODE pedo_alg_thre_det2
04598H 004FEH
@@BASE 04A96H 00507H CSEG BASE
@@BASE loader 04A96H 00000H
@@BASE pm 04A96H 0003FH
@@BASE i2c_ctr 04AD5H 00198H
@@BASE main 04C6DH 00000H
@@BASE magic 04C6DH 00000H
@@BASE WDT 04C6DH 00000H
@@BASE i2c_mcu 04C6DH 000D9H
@@BASE i2c_twl 04D46H 000CDH
@@BASE led 04E13H 00000H
@@BASE rtc 04E13H 00052H
@@BASE vreg_ctr 04E65H 00000H
@@BASE vreg_twl 04E65H 00000H
@@BASE adc 04E65H 000B3H
@@BASE renge 04F18H 00000H
@@BASE accero 04F18H 0004AH
0459BH 00508H
@@BASE 04AA3H 00507H CSEG BASE
@@BASE loader 04AA3H 00000H
@@BASE pm 04AA3H 0003FH
@@BASE i2c_ctr 04AE2H 00198H
@@BASE main 04C7AH 00000H
@@BASE magic 04C7AH 00000H
@@BASE WDT 04C7AH 00000H
@@BASE i2c_mcu 04C7AH 000D9H
@@BASE i2c_twl 04D53H 000CDH
@@BASE led 04E20H 00000H
@@BASE rtc 04E20H 00052H
@@BASE vreg_ctr 04E72H 00000H
@@BASE vreg_twl 04E72H 00000H
@@BASE adc 04E72H 000B3H
@@BASE renge 04F25H 00000H
@@BASE accero 04F25H 0004AH
@@BASE self_flash
04F62H 00000H
@@BASE sw 04F62H 00000H
04F6FH 00000H
@@BASE sw 04F6FH 00000H
@@BASE task_debug
04F62H 00000H
04F6FH 00000H
@@BASE task_misc
04F62H 00000H
@@BASE task_sys 04F62H 00000H
04F6FH 00000H
@@BASE task_sys 04F6FH 00000H
@@BASE pedo_alg_thre_det2
04F62H 00000H
@@BASE ini_VECT 04F62H 0003BH
04F6FH 00000H
@@BASE ini_VECT 04F6FH 0003BH
@@BASE task_status
04F9DH 00000H
* gap * 04F9DH 00059H
04FAAH 00000H
* gap * 04FAAH 0004CH
MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH
@ -625,25 +626,25 @@ Direc-file:bsr_mcu.dr
@@BITS i2c_mcu FFE20H.3 00000H.3
@@BITS i2c_twl FFE20H.6 00000H.0
@@BITS led FFE20H.6 00000H.5
@@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 rtc FFE21H.3 00000H.4
@@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

BIN
trunk/hoge.bin
View File

Binary file not shown.

9
trunk/pedo_alg_thre_det2.c
View File

@ -24,6 +24,7 @@ static void hosu_increment();
// ========================================================
u16 get_long_hour();
extern uni_pool pool;
extern bit is_first_hosu_inc_after_boot;
@ -201,6 +202,14 @@ static void hosu_increment()
{
static u16 last_hour_fny;
//起動後1回目の歩数カウントは余分なのでカウントしない
//TODO:アルゴリズムを修正
if(is_first_hosu_inc_after_boot)
{
is_first_hosu_inc_after_boot = 0;
return;
}
// 累積の更新 //
// いろいろ失敗した...
if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 )

4
trunk/rtc.c
View File

@ -15,6 +15,9 @@ bit rtc_lock;
bit rtc_dirty;
bit rtc_alarm_dirty;
//起動後初めての歩数カウントかどうか
bit is_first_hosu_inc_after_boot;
/* ========================================================
ペリフェラルの初期化
レジスタの電池交換ビットのセット
@ -60,6 +63,7 @@ void RTC_init( void )
rtc_lock = 0;
rtc_dirty = 0;
rtc_alarm_dirty = 0;
is_first_hosu_inc_after_boot = 1;
}