・歩数ログクリア時に書き込み位置を初期化忘れていた

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@185 013db118-44a6-b54f-8bf7-843cb86687b1

trunk/config.h

@@ -7,7 +7,7 @@
 //#define _FORCE_INFO_LED_FULLCOLOR_
 
 #define MCU_VER_MAJOR    0x00
-#define MCU_VER_MINOR    0x18
+#define MCU_VER_MINOR    0x19
 
 //#define PM_CCIC_TIM
 

trunk/pedo_alg_thre_det2.c

@@ -328,6 +328,7 @@ void clear_hosu_hist()
     vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0;
     vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0;
     vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0;
+    p_record = 0;
 }
 
 

trunk/user_define.h

@@ -55,7 +55,8 @@
 #endif
 #ifdef _MODEL_CTR_
 #define IRQ0_ast            { P7.6 = 0; PM7.6 = 0; }
-#define IRQ0_neg            { PM7.6 = 1; }
+//#define IRQ0_neg            { PM7.6 = 1; }
+#define IRQ0_neg            { P7.6 = 1; }
 #define IRQ0              ( P7.6 )
 #endif
 

trunk/yav_mcu_bsr.plg

@@ -1,29 +1,8 @@
 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 -qvjl2wt -sainter_asm -zpb -no pm.c
-pm.c(63) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(100) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(184) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(192) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(479) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(482) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(908) : CC78K0R warning W0401: Conversion may lose significant digits
-pm.c(1025) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.h(117) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.h(117) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.h(122) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and   11 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 -qvjl2wt -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\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 -qvjl2wt -sainter_asm -zpb -no task_sys.c
-task_sys.c(179) : CC78K0R warning W0401: Conversion may lose significant digits
-task_sys.c(421) : 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\task_sys.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 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -gb7EFBFFh -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 -nu -ki  bsr.lmf
@@ -34,4 +13,4 @@ intel-HEX to bsr bin converter
  file converted!
 
 
-Build Total error(s) : 0  Total warning(s) : 13 
+Build Total error(s) : 0  Total warning(s) : 0 

trunk/yav_mcu_bsr.pri

@@ -80,8 +80,8 @@ Kanji=SJIS
 [Source]
 Geometry=155, 86, 844, 790
 Window=Normal
-DispStart=44
+DispStart=67
-CaretPos=83,0
+CaretPos=68,0
 Mode=Normal
 DispFile=
 Address1=
@@ -139,14 +139,6 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
-[Source1]
-Geometry=0, 0, 844, 790
-Window=Normal
-DispStart=811
-CaretPos=749,0
-Mode=Normal
-DispFile=pm.c
-Accumulative=ON
 [Assemble]
 Geometry=282, 92, 968, 626
 Window=Hide
@@ -202,7 +194,7 @@ Endian=
 Ascii=OFF
 Idtag=OFF
 Address=
-DispStart=00004F70
+DispStart=FFFFFFFF
 CaretPosData=0, 0
 CaretPosAscii=0, 0
 Address1=
@@ -968,38 +960,39 @@ Count=0
 Geometry=929, 17, 320, 595
 Window=Normal
 Boundary=18088086
-0=.battery_manufacturer,P,N,A,+,1
+0=.system_status,.,N,A,+,1
-1=.bt_comp,.,N,A,+,1
+1=.battery_manufacturer,P,N,A,+,1
-2=.raw_adc_temperature,P,N,A,+,1
+2=.bt_comp,.,N,A,+,1
-3=.PM1.7,P,S,A,+,1
+3=.raw_adc_temperature,P,N,A,+,1
-4=.P1.7,P,S,A,+,1
+4=.PM1.7,P,S,A,+,1
-5=.bt_comp,.,N,A,+,1
+5=.P1.7,P,S,A,+,1
-6=.tasks_immed,P,N,A,+,1
+6=.bt_comp,.,N,A,+,1
-7=.vreg_ctr[2],P,N,A,+,1
+7=.tasks_immed,P,N,A,+,1
-8=.vreg_twl[3],P,N,A,+,1
+8=.vreg_ctr[2],P,N,A,+,1
-9=.cnt_force_off,P,N,A,+,1
+9=.vreg_twl[3],P,N,A,+,1
-10=.pool.vreg_c_ext,.,N,A,+,1
+10=.cnt_force_off,P,N,A,+,1
-11=.p_record,P,N,A,+,1
+11=.pool.vreg_c_ext,.,N,A,+,1
-12=.temp_hours,P,N,A,+,1
+12=.p_record,P,N,A,+,1
-13=.temp,D,N,A,+,1
+13=.temp_hours,P,N,A,+,1
-Line=14
+14=.temp,D,N,A,+,1
+Line=15
 [Quick Watch]
-0=p_record,P,A,1
+0=temp_hours,P,A,1
-1=pool.vreg_c_ext,P,A,1
+1=cnt_force_off,P,A,1
-2=temp_hours,P,A,1
+2=vreg_ctr[36],P,A,1
-3=cnt_force_off,P,A,1
+3=vreg_ctr[0x24],P,A,1
-4=vreg_ctr[36],P,A,1
+4=vreg_twl[3],P,A,1
-5=vreg_ctr[0x24],P,A,1
+5=vreg_ctr[2],P,A,1
-6=vreg_twl[3],P,A,1
+6=tasks_immed,P,A,1
-7=vreg_ctr[2],P,A,1
+7=temp,P,A,1
-8=tasks_immed,P,A,1
+8=BT_TEMP_P,P,A,1
-9=temp,P,A,1
+9=P1.7,P,A,1
-10=BT_TEMP_P,P,A,1
+10=PM1.7,P,A,1
-11=P1.7,P,A,1
+11=raw_adc_temperature,P,A,1
-12=PM1.7,P,A,1
+12=battery_manufacturer,P,A,1
-13=raw_adc_temperature,P,A,1
+13=bt_comp,P,A,1
-14=battery_manufacturer,P,A,1
+14=systemstatus,P,A,1
-15=bt_comp,P,A,1
+15=system_status,P,A,1
 [Software Break]
 Geometry=408, 387, 756, 532
 Window=Normal
@@ -1020,39 +1013,63 @@ Name3=Swb00004
 Address3=vreg_ctr.c#_vreg_ctr_write+0x2be
 Window3=ASM
 Status3=ON
-Name4=Swb00003
+Name4=Swb00010
-Address4=task_sys.c#_tsk_sys+0x13c
+Address4=loader.c#_main+0x12
 Window4=ASM
 Status4=ON
-Name5=Swb00010
+Name5=Swb00002
-Address5=loader.c#_main+0x12
+Address5=i2c_mcu.c#_iic_mcu_is_ready+0x1a
 Window5=ASM
 Status5=ON
-Name6=Swb00002
+Name6=Swb00007
-Address6=i2c_mcu.c#_iic_mcu_is_ready+0x1a
+Address6=loader.c#_main+0x2a
 Window6=ASM
 Status6=ON
-Name7=Swb00007
+Name7=Swb00001
-Address7=loader.c#_main+0x2a
+Address7=i2c_twl.c#_int_iic_twl+0x43
 Window7=ASM
 Status7=ON
-Name8=Swb00001
+Name8=Swb00006
-Address8=i2c_twl.c#_int_iic_twl+0x43
+Address8=pm.c#_BT_get_left+0x81
 Window8=ASM
 Status8=ON
-Name9=Swb00006
+Name9=Swb00011
-Address9=pm.c#_BT_get_left+0x82
+Address9=pm.c#_BT_init+0xa1
 Window9=ASM
 Status9=ON
-Name10=Swb00009
+Name10=Swb00003
-Address10=pm.c#_BT_chk+0x7d
+Address10=task_sys.c#_tsk_sys+0x25a
 Window10=ASM
 Status10=ON
-Name11=Swb00011
+Name11=Swb00012
-Address11=pm.c#_BT_init+0xa1
+Address11=task_sys.c#_tsk_sys+0x88
 Window11=ASM
 Status11=ON
-Count=12
+Name12=Swb00013
+Address12=task_sys.c#_tsk_sys+0x99
+Window12=ASM
+Status12=ON
+Name13=Swb00014
+Address13=task_sys.c#_tsk_sys+0xa8
+Window13=ASM
+Status13=ON
+Name14=Swb00016
+Address14=task_sys.c#_tsk_sys+0x79
+Window14=ASM
+Status14=ON
+Name15=Swb00017
+Address15=task_sys.c#_tsk_sys+0xbe
+Window15=ASM
+Status15=ON
+Name16=Swb00018
+Address16=task_sys.c#_tsk_sys+0x8b
+Window16=ASM
+Status16=ON
+Name17=Swb00009
+Address17=pm.c#_BT_get_left+0x0
+Window17=ASM
+Status17=ON
+Count=18
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prk

@@ -4,7 +4,7 @@ FrameX=0
 FrameY=54
 FrameCX=1299
 FrameCY=1044
-OpenFile1=vreg_ctr.h,2,132,132,1376,889,15,156,15,0
+OpenFile1=vreg_ctr.h,0,132,132,1376,889,15,156,15,0
 OpenFile2=magic.c,0,154,154,1398,911,20,16,28,0
 OpenFile3=led.c,0,289,306,1533,1063,57,620,57,0
 OpenFile4=loader.c,0,169,287,1413,1044,0,37,25,0
@@ -14,9 +14,14 @@ OpenFile7=ProjectWindow
 PrjPos=0,2,754,3,253
 OpenFile8=i2c_twl.c,0,308,308,1552,1065,13,130,0,0
 OpenFile9=renge\renge.c,0,352,352,1596,1109,6,191,16,0
-OpenFile10=OutputWindow
+OpenFile10=config.h,0,286,37,1530,794,40,30,40,0
+OpenFile11=..\branches\0.15(sdk0.9_E3_fix_vol_core1.20V)\pm.h,0,193,138,1437,895,5,156,107,0
+OpenFile12=task_sys.c,0,198,198,1442,955,0,83,0,0
+OpenFile13=OutputWindow
 OutputPos=0,44,989,1000,1587
-OpenFile11=config.h,0,220,220,1464,977,29,19,29,0
+OpenFile14=pm.h,0,44,44,1288,801,43,74,43,0
+OpenFile15=user_define.h,0,22,22,1266,779,0,1,0,0
+OpenFile16=config.h,0,44,44,1288,801,0,1,0,0
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0

trunk/yav_mcu_bsr.sdb

@@ -11,7 +11,7 @@ T=4bff42bc
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4bff4570
+T=4c0336e4
 1=incs.h
 2=adc.h
 3=led.h
@@ -35,7 +35,7 @@ T=4bfe231f
 7=adc.h
 8=pool.h
 [magic.c]
-T=4bff42ea
+T=4c0343a1
 1=config.h
 [WDT.c]
 T=4bf0d1e1
@@ -76,7 +76,7 @@ T=4bfcc957
 4=vreg_twl.h
 5=vreg_ctr.h
 [adc.c]
-T=4bff22ec
+T=4bff5669
 1=incs.h
 2=adc.h
 3=pm.h
@@ -171,7 +171,7 @@ T=4bf0d1e1
 T=4bf0d1e0
 1=config.h
 [config.h]
-T=4bfe1c85
+T=4c031fb9
 [user_define.h]
 T=4bfdd9ff
 [bsr_system.h]
@@ -203,7 +203,7 @@ T=4bf0d1e0
 [i2c_ctr.h]
 T=4bf0d1e1
 [pm.h]
-T=4bfe231f
+T=4c031ee9
 [rtc.h]
 T=4bf0d1e1
 [reboot.h]