Ver 0.F (SDK 0.9向け) テスト

メジャーバージョンの表記変更
改修版CODEC対応


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

trunk/config.h

@@ -6,7 +6,7 @@
 
 
 #define MCU_VER_MAJOR    0x00
-#define MCU_VER_MINOR    0x0E
+#define MCU_VER_MINOR    0x0F
 
 #define _OVERCLOCK_
 
@@ -17,9 +17,12 @@
 
 //#define _PARRADIUM_
 //#define _MODEL_TEG2_
+ // <20>ªTEG2 CPU <20>{ Type-T
 //#define _MODEL_WM0_
 //#define _MODEL_TS0_
+ // <20>ªTEG2 CPU <20>{ Type-C
 #define _MODEL_CTR_TS_
+ // <20>ªFINAL SoC <20>{ Type-C
 //#define _MODEL_CTR_JIKKI_
 
 

trunk/pm.c

@@ -764,13 +764,13 @@ task_status_immed ntr_pmic_comm(  )
     {
         if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 )             // 消えた
         {
-            irq_work = REG_BIT_TWL_BL_U_OFF;
+//            irq_work = REG_BIT_TWL_BL_U_OFF;
-//            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_OFF );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_OFF );
         }
         else
         {
-            irq_work = REG_BIT_TWL_BL_U_ON;
+//            irq_work = REG_BIT_TWL_BL_U_ON;
-//            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_ON );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_ON );
         }
     }
 
@@ -779,16 +779,17 @@ task_status_immed ntr_pmic_comm(  )
     {
         if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 )             // 消えた
         {
-            irq_work = REG_BIT_TWL_BL_L_OFF;
+//            irq_work = REG_BIT_TWL_BL_L_OFF;
-//            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_OFF );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_OFF );
         }
         else
         {
-            irq_work = REG_BIT_TWL_BL_L_ON;
+//            irq_work = REG_BIT_TWL_BL_L_ON;
-//            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_ON );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_ON );
         }
     }
 
+#if 0 
     irq_work &= ~VREG_C_IRQ_MASK2;
     // set_irq 相当品
     if( irq_work != 0 )
@@ -803,17 +804,18 @@ task_status_immed ntr_pmic_comm(  )
         while( !IRQ0 && ( ++tot != 0 ) ){;}  // O.Dなのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良)
         IRQ0_ast;
     }
+#endif
 
-
+#if 0
-    // テストコード ↓ //
+    // バックライト設定
-        // バックライト設定
+    // 勝手に消しておく
-        /// 今のところさらに細かくは分けないけど…
+    /// 今のところさらに細かくは分けないけど…
-        if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL_U | REG_BIT_TWL_REQ_BL_U ) ) == 0 )
+    if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL_U | REG_BIT_TWL_REQ_BL_U ) ) == 0 )
-        {
+    {
-//            vreg_ctr[ VREG_C_COMMAND2 ] = ( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_U_OFF );
+        vreg_ctr[ VREG_C_COMMAND2 ] = ( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_U_OFF );
-//            renge_task_immed_add( tski_PM_BL_set );
+        renge_task_immed_add( tski_PM_BL_set );
-        }
+    }
-
+#endif
 
     // offリクエスト //////////////////////////////////////
     if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 )

trunk/vreg_ctr.c

@@ -43,16 +43,24 @@ void vreg_ctr_init(  )
     vreg_ctr[VREG_C_LED_BRIGHT] = 0xFF;
 
     vreg_ctr[VREG_C_MCU_VER_MAJOR] = MCU_VER_MAJOR;
+#ifdef _MODEL_TEG2_
+    vreg_ctr[VREG_C_MCU_VER_MAJOR] |= 0x00;
+#endif
 #ifdef _MODEL_WM0_
-    vreg_ctr[VREG_C_MCU_VER_MAJOR] |= 0x20;
+    vreg_ctr[VREG_C_MCU_VER_MAJOR] |= 0x08;
 #endif
 #ifdef _MODEL_TS0_
     vreg_ctr[VREG_C_MCU_VER_MAJOR] |= 0x10;
 #endif
+#ifdef _MODEL_CTR_TS_
+    vreg_ctr[VREG_C_MCU_VER_MAJOR] |= 0x18;
+#endif
+#ifdef _MODEL_CTR_JIKKI_
+    vreg_ctr[VREG_C_MCU_VER_MAJOR] |= 0x1C;
+#endif
 
     vreg_ctr[VREG_C_MCU_VER_MINOR] = MCU_VER_MINOR;
 
-
     vreg_ctr[VREG_C_VCOM_T] = 92;
     vreg_ctr[VREG_C_VCOM_B] = 95;
 }

trunk/yav_mcu_bsr.pri

@@ -78,7 +78,7 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=281, 161, 871, 684
+Geometry=164, 95, 871, 684
 Window=Normal
 DispStart=277
 CaretPos=278,0
@@ -142,8 +142,8 @@ Accumulative=ON
 [Assemble]
 Geometry=24, 657, 600, 400
 Window=Normal
-DispStart=17419
+DispStart=17413
-CaretPos=17419,27
+CaretPos=17413,27
 Address1=
 Address2=
 Address3=
@@ -894,17 +894,7 @@ Manager=ON
 Sort by=Unsort
 Detail=OFF
 Last Name=
-Name0=force001
+Count=0
-Status0=W
-Access Size0=B
-Address Range0=EQ
-Address0=<force_update_adc> - <>
-Mask Address0=00000000
-Data Range0=NC
-Data0=<00000000> - <00000000>
-Mask Data0=FFFFFFFF
-Pass0=0001
-Count=1
 [Event Link]
 Geometry=0, 0, 0, 0
 Window=Hide
@@ -920,10 +910,7 @@ Manager=ON
 Sort by=Unsort
 Detail=OFF
 Last Name=
-Name0=force002
+Count=0
-Element0=force001
-Set0=ON
-Count=1
 [Trace]
 Geometry=0, 0, 0, 0
 Window=Hide
@@ -1052,23 +1039,31 @@ Name4=Swb00004
 Address4=task_misc.c#_tski_mcu_info_read+0x3a
 Window4=ASM
 Status4=ON
-Name5=Swb00007
+Name5=Swb00015
-Address5=task_sys.c#es_F0052+0xc3
+Address5=pm.c#_ntr_pmic_comm+0x32
 Window5=ASM
 Status5=ON
 Name6=Swb00006
-Address6=task_sys.c#es_F0052+0xe9
+Address6=task_misc.c#es_F0059+0xa4
 Window6=ASM
 Status6=ON
 Name7=Swb00008
-Address7=task_sys.c#es_F0052+0xcd
+Address7=pm.c#_ntr_pmic_comm+0x3e
 Window7=ASM
 Status7=ON
-Name8=Swb00011
+Name8=Swb00012
-Address8=adc.c#_tsk_adc+0xe0
+Address8=pm.c#_ntr_pmic_comm+0x51
 Window8=ASM
 Status8=ON
-Count=9
+Name9=Swb00013
+Address9=pm.c#_ntr_pmic_comm+0x59
+Window9=ASM
+Status9=ON
+Name10=Swb00014
+Address10=pm.c#_ntr_pmic_comm+0x65
+Window10=ASM
+Status10=ON
+Count=11
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prj

@@ -571,11 +571,6 @@ Include28=sw.h
 Include29=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 Include30=batt_params.h
 Include31=pedometer.h
-[ToolSet]
-ToolSetName=(•ĎŤX)78K0R Software Package V1.10
-Tool1=CC78K0R|W2.10
-Tool2=RA78K0R|W1.31
-Tool3=ID78K0R-QB|V3.60
 [Options.CC78K0R 0]
 Version=210
 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
@@ -1042,3 +1037,8 @@ VfiFileBoot0=
 VfiFileBoot1=boot.vfi
 VF78K0Rchk=0
 VF78K0Rvs=
+[ToolSet]
+ToolSetName=(•ĎŤX)78K0R Software Package V1.10
+Tool1=CC78K0R|W2.10
+Tool2=RA78K0R|W1.31
+Tool3=ID78K0R-QB|V3.60

trunk/yav_mcu_bsr.sdb

@@ -11,7 +11,7 @@ T=4ba2fdb7
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4ba9e8b6
+T=4bab0231
 1=incs.h
 2=adc.h
 3=led.h
@@ -32,7 +32,7 @@ T=4b999c7e
 6=led.h
 7=adc.h
 [magic.c]
-T=4ba9ee08
+T=4bab04b9
 1=config.h
 [WDT.c]
 T=4afd21ca
@@ -56,7 +56,7 @@ T=4b4438bb
 T=4b6a6fa4
 1=incs.h
 [vreg_ctr.c]
-T=4ba9a2e8
+T=4bab04a3
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -73,7 +73,7 @@ T=4b8b5f7f
 4=vreg_ctr.h
 5=renge\renge_task_intval.h
 [adc.c]
-T=4ba9efb9
+T=4baaefdd
 1=incs.h
 2=adc.h
 3=pm.h
@@ -110,13 +110,13 @@ T=4b95fcac
 6=pm.h
 7=rtc.h
 [task_debug.c]
-T=4b95d5a4
+T=4baaef6c
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [task_misc.c]
-T=4ba9e8b6
+T=4baafb81
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -157,7 +157,7 @@ T=4b90c1b8
 [user_define.h]
 T=4ba9e8b6
 [config.h]
-T=4ba3494e
+T=4bab04b9
 [bsr_system.h]
 T=4b3064de
 [renge\renge.h]
@@ -190,7 +190,7 @@ T=4ba1e3ed
 [rtc.h]
 T=4b6a6fa4
 [adc.h]
-T=4ba9e8b6
+T=4baae7c3
 1=jhl_defs.h
 [led.h]
 T=4b4438a1