Ver 1.1.05

機種判定でキャプチャ箱はキャプチャ箱と返すように変更


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

trunk/bsr_system.h

@@ -29,7 +29,7 @@ enum model_
   MODEL_TS_BOARD,
   MODEL_SHIROBAKO,
   MODEL_JIKKI_NOBATT,
-  MODEL_UNKNOWN,
+  MODEL_CAPTURE_BOX,
   MODEL_RESERVED2,
   MODEL_RESERVED3,
 };
@@ -45,7 +45,7 @@ typedef struct _system_status_
   unsigned char reboot:1;
   unsigned char info_fullcolor:1;
   unsigned char force_off:1;
-  unsigned char fake_jikki:1;         // キャプチャ箱 SDKには実機と返す
+  unsigned char captureBox:1;         // キャプチャ箱 SDKには実機と返す
   enum model_   model;
 }system_status_;
 

trunk/pm.c

@@ -256,7 +256,7 @@ void BT_model_detect()
     temp = get_adc( ADC_SEL_BATT_DET );
     BT_DET_P = 0;
 
-    system_status.fake_jikki = 0;
+    system_status.captureBox = 0;
     // プラットフォーム判定 //
     if( raw_adc_temperature > 0xF0 )
     {
@@ -272,7 +272,7 @@ void BT_model_detect()
         if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) &&
             ( iic_mcu_result == ERR_OK ))
         {
-            system_status.fake_jikki = 1;
+            system_status.captureBox = 1;
         }
     }
     else

trunk/task_misc.c

@@ -280,13 +280,13 @@ task_status_immed tski_mcu_info_read()
 #ifdef _DBG_FORCE_JIKKI_
         IICA = MODEL_JIKKI;
 #else
-        if( !system_status.fake_jikki )
+        if( !system_status.captureBox )
         {
             IICA = (u8)system_status.model;
         }
         else
         {
-            IICA = MODEL_JIKKI;
+            IICA = MODEL_CAPTURE_BOX;
         }
 #endif
         break;

trunk/yav_mcu_bsr.plg

@@ -172,7 +172,7 @@ Assembly complete,     0 error(s) and     0 warning(s) found.
 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"  -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -gb0FEFBFFh -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\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"  -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb0FEFBFFh -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
 Object Conversion Complete,      0 error(s) and     0 warning(s) found.

trunk/yav_mcu_bsr.pri

@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=43, 34, 757, 775
+Geometry=341, 106, 757, 1043
 Window=Normal
-DispStart=358
+DispStart=17
-CaretPos=359,0
+CaretPos=75,0
 Mode=Normal
 DispFile=
 Address1=
@@ -140,18 +140,26 @@ SaveStart=
 SaveEnd=
 Accumulative=ON
 [Source1]
-Geometry=0, 0, 757, 775
+Geometry=25, 25, 757, 775
 Window=Normal
-DispStart=199
+DispStart=88
-CaretPos=241,30
+CaretPos=1,0
 Mode=Normal
-DispFile=task_sys.c
+DispFile=pedo_alg_thre_det2.c
+Accumulative=ON
+[Source2]
+Geometry=50, 50, 757, 1043
+Window=Normal
+DispStart=220
+CaretPos=236,22
+Mode=Normal
+DispFile=vreg_ctr.c
 Accumulative=ON
 [Assemble]
 Geometry=280, 96, 968, 626
 Window=Normal
-DispStart=17647
+DispStart=759
-CaretPos=17647,27
+CaretPos=759,27
 Address1=
 Address2=
 Address3=
@@ -822,7 +830,7 @@ L529=IICWL1
 L530=IICWH1
 L531=SVA1
 [Local Variable]
-Geometry=1151, 707, 353, 199
+Geometry=1181, 725, 353, 373
 Window=Normal
 Boundary=11468964
 Mode=Proper
@@ -968,44 +976,45 @@ Count=0
 Geometry=821, 0, 441, 702
 Window=Normal
 Boundary=18088086
-0=.info_LED,.,N,A,+,1
+0=+acc_norm,P,N,A,-,1
-1=.vreg_ctr,P,N,A,+,1
+1=.info_LED,.,N,A,+,1
-2=.TDR06,P,S,A,+,1
+2=.vreg_ctr,P,N,A,+,1
-3=.LED_dim_status_sleep,.,N,A,+,1
+3=.TDR06,P,S,A,+,1
-4=.pu20,B,S,A,+,1
+4=.LED_dim_status_sleep,.,N,A,+,1
-5=.work_vr_vol,.,N,A,+,1
+5=.pu20,B,S,A,+,1
-6=.vol_data_ctr_tmp,P,N,A,+,1
+6=.work_vr_vol,.,N,A,+,1
-7=.vol_data_ctr,P,N,A,+,1
+7=.vol_data_ctr_tmp,P,N,A,+,1
-8=.last_modifyer,P,N,A,+,1
+8=.vol_data_ctr,P,N,A,+,1
-9=.sent_index,P,N,A,+,1
+9=.last_modifyer,P,N,A,+,1
-10=.vreg_ctr,P,N,A,+,1
+10=.sent_index,P,N,A,+,1
-11=.P1.5,P,S,A,+,1
+11=.vreg_ctr,P,N,A,+,1
-12=.TDR07,P,S,A,+,1
+12=.P1.5,P,S,A,+,1
-13=.info_led_override,P,N,A,+,1
+13=.TDR07,P,S,A,+,1
-14=.P12.0,P,S,A,+,1
+14=.info_led_override,P,N,A,+,1
-15=.going_to_sleep,P,N,A,+,1
+15=.P12.0,P,S,A,+,1
-16=+system_status,.,N,A,-,1
+16=.going_to_sleep,P,N,A,+,1
-17=.battery_manufacturer,P,N,A,+,1
+17=.system_status,.,N,A,+,1
-Line=18
+18=.battery_manufacturer,P,N,A,+,1
+Line=19
 [Quick Watch]
-0=TDR01,P,A,1
+0=TDR07,P,A,1
-1=TDR07,P,A,1
+1=TDR05,P,A,1
-2=TDR05,P,A,1
+2=TDR02,P,A,1
-3=TDR02,P,A,1
+3=P4.,P,A,1
-4=P4.,P,A,1
+4=P4.2,P,A,1
-5=P4.2,P,A,1
+5=P7.5,P,A,1
-6=P7.5,P,A,1
+6=PM4.2,P,A,1
-7=PM4.2,P,A,1
+7=vreg_twl,P,A,1
-8=vreg_twl,P,A,1
+8=vreg_ctr[35],P,A,1
-9=vreg_ctr[35],P,A,1
+9=vreg_ctr[11],P,A,1
-10=vreg_ctr[11],P,A,1
+10=vreg_ctr[5],P,A,1
-11=vreg_ctr[5],P,A,1
+11=info_LED,P,A,1
-12=info_LED,P,A,1
+12=going_to_sleep,P,A,1
-13=going_to_sleep,P,A,1
+13=P12.0,P,A,1
-14=P12.0,P,A,1
+14=vreg_ctr,P,A,1
-15=vreg_ctr,P,A,1
+15=acc_norm,P,A,1
 [Software Break]
-Geometry=1049, 744, 445, 260
+Geometry=709, 826, 445, 260
 Window=Normal
 Width=150 30 200 100
 Name0=Swb00001
@@ -1016,7 +1025,15 @@ Name1=Swb00002
 Address1=task_sys.c#_tsk_sys+0x150
 Window1=ASM
 Status1=ON
-Count=2
+Name2=Swb00003
+Address2=pedo_alg_thre_det2.c#_pedometer+0x156
+Window2=ASM
+Status2=ON
+Name3=Swb00004
+Address3=vreg_ctr.c#_vreg_ctr_write+0x27e
+Window3=ASM
+Status3=ON
+Count=4
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prj

@@ -838,12 +838,12 @@ G=1
 E=0
 E0=flash.elk
 E1=a.elk
-GO=1
+GO=0
 GOValue=85
 GOStart=FC00
 GOSizeValue=1024
 GI=1
-GIValue=FFFFFFFFFFFFFFFFFFFF
+GIValue=1B339499E033F240BFAA
 CCZA=0
 MemInfoCheck=1
 P=1

trunk/yav_mcu_bsr.sdb

@@ -12,7 +12,7 @@ T=4c59543c
 8=reboot.h
 9=magic.h
 [pm.c]
-T=4c5a5f20
+T=4c6b7f45
 1=incs.h
 2=adc.h
 3=led.h
@@ -36,7 +36,7 @@ T=4c5a5ef2
 7=adc.h
 8=pool.h
 [magic.c]
-T=4c5bc334
+T=4c6a68c8
 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=4c5957d5
+T=4c6a65d3
 1=incs.h
 2=led.h
 [rtc.c]
-T=4c58bce4
+T=4c6a678e
 1=incs.h
 [vreg_ctr.c]
-T=4c5a5f7c
+T=4c6a63de
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -107,7 +107,7 @@ T=4c59540f
 6=magic.h
 7=pm.h
 [sw.c]
-T=4c5bc365
+T=4c6a6942
 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=4c525842
+T=4c6b7f45
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -131,7 +131,7 @@ T=4c525842
 6=i2c_mcu.h
 7=led.h
 [task_sys.c]
-T=4c5a5f61
+T=4c6a65d3
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -143,7 +143,7 @@ T=4c5a5f61
 9=adc.h
 10=self_flash.h
 [pedo_alg_thre_det2.c]
-T=4c595b41
+T=4c6a6818
 1=incs.h
 2=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 3=accero.h
@@ -176,11 +176,11 @@ T=4c119cde
 T=4c075832
 1=config.h
 [config.h]
-T=4c5a5eda
+T=4c6a68bd
 [user_define.h]
 T=4c5a5ee5
 [bsr_system.h]
-T=4c4fc515
+T=4c6b7f45
 [renge\renge.h]
 T=4c318e0f
 1=renge\renge_defs.h