歩数カウントの誤り

メモリマップの変更　mainがブートセクタへ（実害はないはず


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

trunk/accero.c

@@ -230,13 +230,16 @@ static void hosu_increment()
             // 知らない…
         }
 
+        last_year = now_year;
+        last_hour = now_hour;
+
         // 実際にインクリメント
         *( hyst_pedometer + p_record ) += 1;
-        if( *( hyst_pedometer + p_record ) < MAGIC_PEDO_MAX )
+        if( *( hyst_pedometer + p_record ) > MAGIC_PEDO_MAX )
         {
             *( hyst_pedometer + p_record ) = MAGIC_PEDO_MAX;
         }
-    
+
     }
 }
 
@@ -460,7 +463,7 @@ __interrupt void intp23_ACC_ready(  )
   引数  無し
   返値  u16 long_hour
 ======================================================== */
-static const u16 DAYS_FROM_HNY[] = { 
+static const u16 DAYS_FROM_HNY[] = {
     0,
     0, 31, 31+28, 59+31, 90+30,
     120+31, 151+30, 181+31, 212+31, 243+30,

trunk/adc.c

@@ -131,7 +131,7 @@ void tsk_adc(  )
         ADM =  0b00011011;      // セレクトモード、章圧、fCLK/6 ///ここから ↓
 
         ADPC = 0x02;            // ADCポートのセレクト
-        ADS = ADC_SEL_AMB_BRIT;
+        ADS = ADC_SEL_TUNE;
 //    NOP();
         ADCS = 1;               // AD開始。                     /// ここまで　↑　までに1us以上開ける
 
@@ -187,21 +187,11 @@ __interrupt void int_adc(  )
     EI(  );
     switch ( ADS )
     {
-    case ( ADC_SEL_AMB_BRIT ):
+/*
+case ( ADC_SEL_AMB_BRIT ):
         vreg_ctr[ VREG_C_AMBIENT_BRIGHTNESS ] = ADCRH;
         break;
-
+*/
-    case ( ADC_SEL_GYRO_YAW ):
-        vreg_ctr[ VREG_C_GYRO_YAW ] = ADCRH;
-        break;
-
-    case ( ADC_SEL_GYRO_PITCH ):
-        vreg_ctr[ VREG_C_GYRO_PITCH ] = ADCRH;
-        break;
-
-    case ( ADC_SEL_GYRO_ROLL ):
-        vreg_ctr[ VREG_C_GYRO_ROLL ] = ADCRH;
-        break;
 
     case ( ADC_SEL_TUNE ):
         hist_tune[index] = ADCRH;
@@ -236,7 +226,6 @@ __interrupt void int_adc(  )
     {                           // 電池判別は電源投入の一回のみ
         ADS += 1;               // 次のチャンネル
         BT_TEMP_P = 1;              // 電池温度監視スタート
-
     }
     else
     {

trunk/adc.h

@@ -7,12 +7,14 @@
 // ANI2 P22
 #define ADC_SEL_AMB_BRIT  0x02
 
+/*
 // ANI3 P23
 #define ADC_SEL_GYRO_YAW  0x03
 // ANI4 P24
 #define ADC_SEL_GYRO_PITCH 0x04
 // ANI5 P25
 #define ADC_SEL_GYRO_ROLL 0x05
+*/
 
 // ANI6 P26
 #define ADC_SEL_TUNE      0x06

trunk/incs_loader.h

@@ -23,6 +23,8 @@
 #include "renge.h"
 
 #include "vreg_ctr.h"
+#include "vreg_twl.h"
+
 #include "loader.h"
 
 #include "i2c_mcu.h"

trunk/main.c

@@ -6,7 +6,7 @@
 
 
 // ========================================================
-#include "incs.h"
+#include "incs_loader.h"
 
 #include "WDT.h"
 #include "rtc.h"

trunk/vreg_ctr.h

@@ -248,13 +248,7 @@ enum VREG_C
   VREG_C_ACC_HOSU_LENGTH = 0x4E,
   VREG_C_ACC_HOSU_HIST,
 
-  VREG_C_GYRO_CONFIG0 = 0x50,
+//  VREG_C_AMBIENT_BRIGHTNESS = 0x60,
-  VREG_C_GYRO_CONFIG1,
-  VREG_C_GYRO_YAW,
-  VREG_C_GYRO_PITCH,
-  VREG_C_GYRO_ROLL,
-
-  VREG_C_AMBIENT_BRIGHTNESS = 0x60,
 
   VREG_C_ENDMARK_
 };

trunk/yav_mcu_bsr.plg

@@ -3,6 +3,12 @@ C:\WINDOWS\system32\cmd.exe /c touch 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 -quvjl3wt -sainter_asm -zp -no accero.c
+accero.c(113) : CC78K0R warning W0745: Expected function prototype
+accero.c(122) : 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\accero.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 -kp -gb6EFBFFh -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 ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.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
@@ -54,4 +60,4 @@ Conversion complete.
 C:\WINDOWS\system32\cmd.exe /c ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex
 C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored
 
-Build Total error(s) : 0  Total warning(s) : 0 
+Build Total error(s) : 0  Total warning(s) : 2 

trunk/yav_mcu_bsr.prj

@@ -39,114 +39,6 @@ TargetFile=0
 [BuildBefore-AfterCmd]
 Before1=touch magic.c
 After1=ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex
-[Options.RA78K0R 0]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 1]
-Version=100
-G=0
-GA=0
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 2]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 3]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 4]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 5]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
 [Options.OC78K0R 0]
 Version=100
 O0=.\bsr.hex
@@ -563,6 +455,114 @@ Version=100
 LCNV_GO=0
 E=0
 CommandFile=0
+[Options.RA78K0R 0]
+Version=100
+G=1
+GA=1
+E=0
+COMMON=0
+COMPATI=0
+P=1
+KA=1
+KS=0
+KX=0
+LF=0
+LW=132
+LL=0
+LT=8
+Z=0
+CommandFile=0
+RA_OPT=
+[Options.RA78K0R 1]
+Version=100
+G=0
+GA=0
+E=0
+COMMON=0
+COMPATI=0
+P=1
+KA=1
+KS=0
+KX=0
+LF=0
+LW=132
+LL=0
+LT=8
+Z=0
+CommandFile=0
+RA_OPT=
+[Options.RA78K0R 2]
+Version=100
+G=1
+GA=1
+E=0
+COMMON=0
+COMPATI=0
+P=1
+KA=1
+KS=0
+KX=0
+LF=0
+LW=132
+LL=0
+LT=8
+Z=0
+CommandFile=0
+RA_OPT=
+[Options.RA78K0R 3]
+Version=100
+G=1
+GA=1
+E=0
+COMMON=0
+COMPATI=0
+P=1
+KA=1
+KS=0
+KX=0
+LF=0
+LW=132
+LL=0
+LT=8
+Z=0
+CommandFile=0
+RA_OPT=
+[Options.RA78K0R 4]
+Version=100
+G=1
+GA=1
+E=0
+COMMON=0
+COMPATI=0
+P=1
+KA=1
+KS=0
+KX=0
+LF=0
+LW=132
+LL=0
+LT=8
+Z=0
+CommandFile=0
+RA_OPT=
+[Options.RA78K0R 5]
+Version=100
+G=1
+GA=1
+E=0
+COMMON=0
+COMPATI=0
+P=1
+KA=1
+KS=0
+KX=0
+LF=0
+LW=132
+LL=0
+LT=8
+Z=0
+CommandFile=0
+RA_OPT=
 [Options.78K0R]
 BuildMode=2
 BuildMode2=K0R_dbg
@@ -800,89 +800,6 @@ VfiFileBoot0=
 VfiFileBoot1=boot.vfi
 VF78K0Rchk=0
 VF78K0Rvs=
-[Options.CC78K0R 2 i2c_twl.c]
-Version=210
-Define0=
-Define1=_debug_,_TEG_,proc_is_ke3
-Define2=_debug_,_TEG_,proc_is_ke3,%time%
-Undefine0=
-Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include2=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include3=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include4=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=0
-Saddrglobal=1066
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=1
-Maxoptimize=1103
-Charunexpandchk=1
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=0
-Librarycall=1132
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=1
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=0
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=0
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rm.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
 [Options.CC78K0R 3]
 Version=210
 Define0=_debug_,proc_is_bsr,_TEG_