0.13(sdk0.9_plus_E3)

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

branches/0.13(sdk0.9_plus_E3)/accero.c

@@ -177,9 +177,13 @@ task_status_immed acc_hosu_set(  )
                                 ///       IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...)
                                 ///          1         : auto clear after read,      conf: data ready
 #else
+# ifdef _MODEL_CTR_JIKKI_
+    str_send_buf[2] = 0x10;
+# else
     str_send_buf[2] = 0x02;     //     3  IRQ pol :Active HI, Drive:Pushpull,
                                 ///       IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...)
                                 ///          1         : auto clear after read,      conf: data ready
+# endif
 #endif
 
     str_send_buf[3] = 0x80;     // ctrl3  block update:enable, MSB first, scale: +-2G(default), selftest: dis

branches/0.13(sdk0.9_plus_E3)/adc.c

@@ -281,7 +281,11 @@ case ( ADC_SEL_AMB_BRIT ):
 
     case ( ADC_SEL_VOL ):
         hist_snd_vol[index] = ADCRH;
+#ifdef _MODEL_CTR_JIKKI_
+        adc_raw_vol = ( 255 - getmean3( hist_snd_vol ));
+#else
         adc_raw_vol = getmean3( hist_snd_vol );
+#endif
         // TWL用レジスタ(32段)の更新。アトミックな処理として扱わないと不都合が。
         /// 割り込みはHorizonを通してコマンドを発行されるのを待てばよい
         break;

branches/0.13(sdk0.9_plus_E3)/config.h

@@ -6,7 +6,7 @@
 
 
 #define MCU_VER_MAJOR    0x00
-#define MCU_VER_MINOR    0x10
+#define MCU_VER_MINOR    0x13
 
 #define _OVERCLOCK_
 
@@ -19,11 +19,12 @@
 //#define _MODEL_TEG2_
       // <20>ªTEG2 CPU <20>{ Type-T
 //#define _MODEL_WM0_
-#define _MODEL_TS0_
+//#define _MODEL_WM0_TEG2_CTRC_
+//#define _MODEL_TS0_
       // <20>ªTEG2 CPU <20>{ Type-C
 //#define _MODEL_CTR_TS_
       // <20>ªFINAL SoC <20>{ Type-C
-//#define _MODEL_CTR_JIKKI_
+#define _MODEL_CTR_JIKKI_
 
 
 //#define _SW_HOME_ENABLE_

branches/0.13(sdk0.9_plus_E3)/pm.h

@@ -5,6 +5,8 @@
 #define IIC_SLA_PMIC              0x84
 #define IIC_SLA_BT_GAUGE          0x6C
 
+#define VCOM_DEFAULT_T  92
+#define VCOM_DEFAULT_B  95
 
 //=========================================================
 enum PMIC_REG_ADRS

branches/0.13(sdk0.9_plus_E3)/sw.c

@@ -110,7 +110,7 @@ void tsk_sw(  )
             set_irq( VREG_C_IRQ0, REG_BIT_SW_HOME_HOLD );
 #endif
         }
-        else if( SW_pow_count == ( HOLD_THREASHOLD * 4 ) )
+        else if( SW_pow_count == (u8)( 1000 / INTERVAL_TSK_SW ))
         {                       // todo
             vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_ONLY_RED;
             system_status.pwr_state = OFF_TRIG;

branches/0.13(sdk0.9_plus_E3)/task_sys.c

@@ -322,6 +322,8 @@ void tsk_sys(  )
  **********************************************************/
 static void chk_emergencyExit(){
 #ifndef _PARRADIUM_
+    static state;
+
     if( !RESET1_n )
     {
         if( PM_chk_LDSW(  ) == 0 )
@@ -332,12 +334,20 @@ static void chk_emergencyExit(){
         }
         else
         {
+            if( state == 0 )
+            {
+                state = 1;
             // デバッガなりがリセットをかけた
             iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, 0 );
             vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & 0b10011111 );
             vreg_ctr[VREG_C_COMMAND0] |= REG_BIT_RESET1_REQ;
             renge_task_immed_add( do_command0 );
         }
+        }
+    }
+    else
+    {
+        state = 0;
     }
 #endif
 }

branches/0.13(sdk0.9_plus_E3)/vreg_ctr.c

@@ -42,15 +42,15 @@ void vreg_ctr_init(  )
 {
     vreg_ctr[VREG_C_LED_BRIGHT] = 0xFF;
 
-#ifdef _MODEL_TEG2_
+#ifdef _PMIC_TWL_
     vreg_ctr[VREG_C_MCU_VER_MAJOR] = MCU_VER_MAJOR;
 #else
     vreg_ctr[VREG_C_MCU_VER_MAJOR] = MCU_VER_MAJOR | 0x10;
 #endif
     vreg_ctr[VREG_C_MCU_VER_MINOR] = MCU_VER_MINOR;
 
-    vreg_ctr[VREG_C_VCOM_T] = 92;
+    vreg_ctr[VREG_C_VCOM_T] = VCOM_DEFAULT_T;
-    vreg_ctr[VREG_C_VCOM_B] = 95;
+    vreg_ctr[VREG_C_VCOM_B] = VCOM_DEFAULT_B;
 }
 
 

branches/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.pri

@@ -4,10 +4,10 @@ Target=IDK0R32G
 [Configuration]
 Chip=uPD79F0104
 Internal Rom=32KB
-Internal Ram=1536KB
+Internal Ram=1536B
 Clock=Target
 Sub Clock=Target
-Peripheral Break=0x1
+Peripheral Break=0x3
 Firm Clock=System
 Flash Programming=Permit
 Low-voltage Flash Rewriting=On
@@ -22,8 +22,8 @@ SubClock=None
 [Mapping]
 Count=0
 [Main]
-Geometry=-1211, 40, 1200, 882
+Geometry=-1174, 31, 1219, 1099
-Window=Max
+Window=Normal
 MDI_MAX=OFF
 Button=ON
 Mode=Auto
@@ -33,10 +33,10 @@ Coverage=OFF
 Timer=OFF
 Tracer=OFF
 [Load File]
-Dir=.
+Dir=..\yav-mcu-basara\
 SaveFilter=0
-Start=0
+Start=0xffF00
-End=0
+End=0xfffff
 LoadFilter=5
 Offset=0
 Object=ON
@@ -55,7 +55,7 @@ HighSpeed1=OFF
 CPU Reset1=ON
 Symbol Reset1=ON
 [View File]
-Dir=.
+Dir=..\yav-mcu-basara\
 Filter=Source
 [Debugger Option]
 Source Path=".;renge"
@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=4, 9, 871, 684
+Geometry=376, 104, 707, 899
 Window=Normal
-DispStart=387
+DispStart=41
-CaretPos=388,0
+CaretPos=88,0
 Mode=Normal
 DispFile=
 Address1=
@@ -100,7 +100,7 @@ Address13=
 Address14=
 Address15=
 Address16=
-Data1=
+Data1=iic_mcu_initialized
 Data2=
 Data3=
 Data4=
@@ -140,10 +140,10 @@ SaveStart=
 SaveEnd=
 Accumulative=ON
 [Assemble]
-Geometry=19, 497, 600, 400
+Geometry=674, 20, 600, 400
 Window=Normal
-DispStart=18910
+DispStart=689
-CaretPos=18910,27
+CaretPos=689,27
 Address1=
 Address2=
 Address3=
@@ -185,18 +185,18 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 [Memory]
-Geometry=373, 24, 550, 682
+Geometry=632, 59, 578, 791
-Window=Normal
+Window=Hide
-Boundary=163
+Boundary=0
 Format=Hex
 Mode=Byte
-Endian=Little
+Endian=
 Ascii=OFF
 Idtag=OFF
 Address=
-DispStart=00004F70
+DispStart=FFFFFFFF
-CaretPosData=20, 255
+CaretPosData=0, 0
-CaretPosAscii=53248, 256
+CaretPosAscii=0, 0
 Address1=
 Address2=
 Address3=
@@ -251,12 +251,12 @@ Destination=0
 [I/O Port]
 Line=0
 [Stack]
-Geometry=0, 0, 0, 0
+Geometry=525, 527, 400, 399
 Window=Hide
-Boundary=0
+Boundary=13762687
 Mode=Proper
 [Sfr]
-Geometry=613, 51, 596, 915
+Geometry=0, 0, 396, 1089
 Window=Hide
 Address1=
 Address2=
@@ -280,7 +280,7 @@ Attribute=Show
 Sort=Unsort
 Pickup=OFF
 SelectSort=Address
-Last Name=IF0
+Last Name=P0
 Line=531
 L1=P0
 L2=P1
@@ -814,8 +814,8 @@ L529=IICWL1
 L530=IICWH1
 L531=SVA1
 [Local Variable]
-Geometry=697, 793, 400, 300
+Geometry=864, 668, 400, 259
-Window=Normal
+Window=Hide
 Boundary=13041851
 Mode=Proper
 [Trace View]
@@ -866,22 +866,22 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 [Register]
-Geometry=1338, 10, 250, 519
+Geometry=0, 0, 250, 400
-Window=Normal
+Window=Hide
 Mode=Hex
-Boundary=174
+Boundary=62
 Pickup=OFF
 Name=Functional
 Register Bank=0
-RP0=3
+RP0=1
-RP1=3
+RP1=1
-RP2=3
+RP2=1
-RP3=3
+RP3=1
-PC=3
+PC=1
-SP=3
+SP=1
-PSW=7
+PSW=1
-ES=3
+ES=1
-CS=3
+CS=1
 [Event Manager]
 Geometry=0, 0, 0, 0
 Window=Hide
@@ -957,75 +957,36 @@ Detail=OFF
 Last Name=
 Count=0
 [Variable]
-Geometry=884, 10, 440, 793
+Geometry=1104, 23, 463, 624
-Window=Normal
+Window=Hide
-Boundary=13762700
+Boundary=17629364
-0=.list_id,P,N,A,+,1
+Line=0
-1=.psw,P,R,A,+,1
-2=.tasks_immed,P,N,A,+,1
-Line=3
 [Quick Watch]
-0=IICA1,P,A,1
+0=
-1=TRC1,P,A,1
+1=
-2=P7.5,P,A,1
+2=
-3=PM7.6,P,A,1
+3=
-4=PM7.5,P,A,1
+4=
-5=PM12.0,P,A,1
+5=
-6=P12.0,P,A,1
+6=
-7=iic_mcu_bus_status,P,A,1
+7=
-8=temp,P,A,1
+8=
-9=adc_raw_vol,P,A,1
+9=
-10=force_update_adc,P,A,1
+10=
-11=DMAMK1,P,A,1
+11=
-12=DMAIF1,P,A,1
+12=
-13=tasks_immed,P,A,1
+13=
-14=list_id,P,A,1
+14=
-15=psw,P,A,1
+15=
 [Software Break]
-Geometry=1085, 803, 500, 296
+Geometry=857, 296, 391, 360
-Window=Normal
+Window=Hide
 Width=150 30 200 100
 Name0=Swb00001
-Address0=task_misc.c#_tski_mcu_info_read+0x3d
+Address0=accero.c#es_F0038+0x6
 Window0=ASM
 Status0=ON
-Name1=Swb00002
+Count=1
-Address1=task_misc.c#_tski_mcu_info_read+0x56
-Window1=ASM
-Status1=ON
-Name2=Swb00003
-Address2=task_misc.c#_tski_mcu_info_read+0x56
-Window2=ASM
-Status2=ON
-Name3=Swb00005
-Address3=task_misc.c#_tski_mcu_info_read+0x56
-Window3=ASM
-Status3=ON
-Name4=Swb00004
-Address4=task_misc.c#_tski_mcu_info_read+0x21
-Window4=ASM
-Status4=ON
-Name5=Swb00015
-Address5=pm.c#_ntr_pmic_comm+0x32
-Window5=ASM
-Status5=ON
-Name6=Swb00011
-Address6=loader.c#_main+0x1b
-Window6=ASM
-Status6=ON
-Name7=Swb00008
-Address7=rtc.c#_RTC_init+0x1
-Window7=ASM
-Status7=ON
-Name8=Swb00006
-Address8=loader.c#_main+0x74
-Window8=ASM
-Status8=ON
-Name9=Swb00007
-Address9=loader.c#_main+0x71
-Window9=ASM
-Status9=ON
-Count=10
 [Reset]
 Debugger=ON
 Symbol=OFF

branches/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prj

@@ -1,12 +1,12 @@
 [ProjectManager]
 Version=6.00
-Path=C:\78k_data\yav-mcu-basara_sdk0.9\
+Path=C:\78k_data\yav-mcu-basara_0.13(0.10_plus_E3)\
 Title=yav-mcu
 Series=78K0R.PM
 Device=uPD79F0104
 DeviceVer=E1.00b
 DebugMode=1
-Target=C:\78k_data\yav-mcu-basara_sdk0.9\bsr.lmf
+Target=bsr.lmf
 [BuildMode0]
 BuildModeName=Debug Build
 TargetFile=0
@@ -754,7 +754,7 @@ ZB=
 Etcetera0=
 Etcetera1=boot.lmf
 CommandFile=0
-OFILE=C:\78k_data\yav-mcu-basara_sdk0.9\bsr.lmf
+OFILE=C:\78k_data\yav-mcu-basara_0.13(0.10_plus_E3)\bsr.lmf
 [Options.LK78K0R 3]
 Version=100
 O0=bsr_bsr.lmf

branches/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prk

@@ -1,26 +1,18 @@
 [ProjectManager]
-FrameMax=1
+FrameMax=0
 FrameX=255
 FrameY=34
 FrameCX=1299
 FrameCY=1044
-OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0
+OpenFile1=renge\renge.h,0,502,637,1746,1394,0,31,0,0
-OpenFile2=jhl_defs.h,0,250,539,1494,1265,0,10,8,0
+OpenFile2=pm.c,0,260,57,1261,685,2,844,18,0
-OpenFile3=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0
+OpenFile3=ProjectWindow
-OpenFile4=renge\renge_defs.h,0,667,22,1514,748,0,16,0,0
-OpenFile5=task_sys.c,0,330,330,1574,1056,0,172,37,0
-OpenFile6=loader.c,0,296,307,1286,923,20,214,20,0
-OpenFile7=pm.h,0,254,446,1244,1062,0,115,0,0
-OpenFile8=sw.c,0,574,367,1818,1093,43,36,43,0
-OpenFile9=vreg_ctr.h,0,632,184,1876,910,8,40,25,0
-OpenFile10=pedo_alg_thre_det2.c,0,132,132,1376,858,0,12,0,0
-OpenFile11=adc.c,0,286,286,1530,1012,0,145,0,0
-OpenFile12=self_flash.c,0,154,154,1398,880,7,365,7,0
-OpenFile13=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile14=magic.c,0,323,248,1567,974,0,17,0,0
+OpenFile4=accero.c,0,44,44,1045,672,0,250,0,0
-OpenFile15=config.h,0,288,71,1532,797,18,2,21,0
+OpenFile5=led.c,0,66,66,1067,694,0,1,0,0
-OpenFile16=OutputWindow
+OpenFile6=config.h,0,88,88,1089,716,0,27,0,0
+OpenFile7=sw.h,0,264,264,1265,892,9,4,9,0
+OpenFile8=OutputWindow
 OutputPos=0,572,1038,46,1104
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]

branches/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.sdb

@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4bb93708
+T=4bebac1d
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -11,7 +11,7 @@ T=4bb93708
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=adc.h
 3=led.h
@@ -21,11 +21,11 @@ T=4bb92f33
 7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 8=fsl_user.h
 [i2c_ctr.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=accero.h
 [main.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs_loader.h
 2=WDT.h
 3=rtc.h
@@ -34,31 +34,31 @@ T=4bb92f33
 6=led.h
 7=adc.h
 [magic.c]
-T=4bb94d0f
+T=4bebafab
 1=config.h
 [WDT.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs_loader.h
 [i2c_mcu.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=i2c_mcu.h
 [i2c_twl.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=i2c_twl_defs.h
 [ini_VECT.c]
-T=4bb92f33
+T=4beb9bf9
 1=config.h
 [led.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=led.h
 [rtc.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 [vreg_ctr.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -68,20 +68,20 @@ T=4bb92f33
 7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 8=fsl_user.h
 [vreg_twl.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=jhl_defs.h
 3=vreg_twl.h
 4=vreg_ctr.h
 5=renge\renge_task_intval.h
 [adc.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=adc.h
 3=pm.h
 4=led.h
 [renge\renge.c]
-T=4bb92f32
+T=4beb9bf7
 1=renge\renge.h
 2=renge\renge_task_intval.h
 3=renge\renge_task_immediate.h
@@ -90,20 +90,20 @@ T=4bb92f32
 6=user_define.h
 7=bsr_system.h
 [accero.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs_loader.h
 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 3=fsl_user.h
 4=i2c_ctr.h
 [reboot.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs_loader.h
 [sw.c]
-T=4bb92f33
+T=4bebafa0
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -112,13 +112,13 @@ T=4bb92f33
 6=pm.h
 7=rtc.h
 [task_debug.c]
-T=4bb92f33
+T=4bebaa50
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [task_misc.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -126,7 +126,7 @@ T=4bb92f33
 5=adc.h
 6=i2c_mcu.h
 [task_sys.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -137,13 +137,13 @@ T=4bb92f33
 8=sw.h
 9=adc.h
 [pedo_alg_thre_det2.c]
-T=4bb92f33
+T=4beb9bf9
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 3=accero.h
 4=pedometer.h
 [incs_loader.h]
-T=4bb92f33
+T=4beb9bf9
 1=jhl_defs.h
 2=user_define.h
 3=bsr_system.h
@@ -154,49 +154,49 @@ T=4bb92f33
 8=i2c_mcu.h
 9=WDT.h
 [jhl_defs.h]
-T=4bb92f33
+T=4beb9bf9
 1=config.h
 [config.h]
-T=4bb9687f
+T=4bebac3c
 [user_define.h]
-T=4bb92f33
+T=4beb9bf9
 [bsr_system.h]
-T=4bb92f33
+T=4beb9bf9
 [renge\renge.h]
-T=4bb92f32
+T=4beb9bf7
 1=renge\renge_defs.h
 2=renge\renge_task_immediate.h
 [renge\renge_defs.h]
-T=4bb92f32
+T=4beb9bf7
 [renge\renge_task_immediate.h]
-T=4bb92f32
+T=4beb9bf7
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4bb92f33
+T=4beb9bf9
 1=config.h
 [vreg_twl.h]
-T=4bb92f33
+T=4beb9bf9
 [loader.h]
-T=4bb92f33
+T=4beb9bf9
 1=jhl_defs.h
 [i2c_mcu.h]
-T=4bb92f33
+T=4beb9bf9
 [WDT.h]
-T=4bb92f33
+T=4beb9bf9
 [fsl.h]
-T=4bb92f33
+T=4beb9bf9
 [fsl_user.h]
-T=4bb92f33
+T=4beb9bf9
 [i2c_ctr.h]
-T=4bb92f33
+T=4beb9bf9
 [pm.h]
-T=4bb92f33
+T=4beb9bf9
 [rtc.h]
-T=4bb92f33
+T=4beb9bf9
 [reboot.h]
-T=4bb92f33
+T=4beb9bf9
 [incs.h]
-T=4bb92f33
+T=4beb9bf9
 1=jhl_defs.h
 2=user_define.h
 3=bsr_system.h
@@ -207,28 +207,28 @@ T=4bb92f33
 8=rtc.h
 9=accero.h
 [accero.h]
-T=4bb92f33
+T=4beb9bf9
 1=jhl_defs.h
 2=pedometer.h
 [pedometer.h]
-T=4bb92f33
+T=4beb9bf9
 [adc.h]
-T=4bb92f33
+T=4beb9bf9
 1=jhl_defs.h
 [led.h]
-T=4bb92f33
+T=4beb9bf9
 [batt_params.h]
-T=4bb92f33
+T=4beb9bf9
 [..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h]
 T=49a3bd4e
 [i2c_twl_defs.h]
-T=4bb92f33
+T=4beb9bf9
 [renge\renge_task_intval.h]
-T=4bb92f32
+T=4beb9bf7
 1=renge\renge_defs.h
 [..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h]
 T=45f12258
 [i2c_twl.h]
-T=4bb92f33
+T=4beb9bf9
 [sw.h]
-T=4bb92f33
+T=4bebafb5