パラディウム対応（PMICの通信エラー無視・他）

I2C_mを使用前にしっかり初期化するように変更（電池残量ICの動作不良解消か？）
CODECのPMIC互換レジスタ対応修正。要求仕様と実際の仕様が異なっていた


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

trunk/config.h

@@ -8,7 +8,7 @@
 #define MCU_VER_MINOR    6;
 
 
-
+//#define _PARRADIUM_
 //#define _MODEL_TEG2_
 //#define _MODEL_WM0_
 #define _MODEL_TS0_

trunk/i2c_mcu.c

@@ -167,7 +167,7 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest )
     if( iic_mcu_call_slave( slave ) != 0 )
     {
         iic_mcu_busy = 0;
-        return ( ERR_NAK );
+        return ( ERR_NOSLAVE );
     }
 
     // レジスタアドレスの送信
@@ -545,31 +545,6 @@ static void iic_mcu_send_sp(  )
 
 
 
-/* ========================================================
-  バスのリセット
-  (ストップコンディションが出せそうだったらすかさず出す。
- ======================================================== */
-void iic2m_bus_reset(  )
-{
-/*
-  u8 count;
-  for( count = 19; count != 0; count-- ){
-    iics_sda_H;
-    iics_scl_H;
-    PM1.1 = 1;                  // SDA
-    if( iics_sda != 0 ){
-      PM1.1 = 0;
-      iic_mcu_send_sp;
-      return;
-    }
-    PM1.1 = 0;
-    iics_scl_L;
-  }
-  return;
-  */
-}
-
-
 
 /* ========================================================
   ペリフェラルモジュールの初期化
@@ -591,8 +566,21 @@ void iic_mcu_start(  )
     SO0 = 0x0404 | TAUS_MASK;   // 最初はHH
     iic_mcu_busy = 0;
     iic_mcu_wo_dma = 0;
-    iic_mcu_initialized = 1;
 
+    // バスのリセット
+    IICIF10 = 0;
+    IICMK10 = 1;
+
+    iic_mcu_send_st();
+
+    SIO10 = 0xFF;
+    while( IICIF10 == 0 )
+    {
+        NOP(  );
+    }                           // 通信中
+    iic_mcu_send_sp();
+
+    iic_mcu_initialized = 1;
 }
 
 

trunk/i2c_mcu.h

@@ -27,8 +27,6 @@ err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat );
 // ↓その通信が完了したら解除されます。
 #define iic_mcu_set_wo_dma()           { while( iic_mcu_busy ){;} iic_mcu_wo_dma = 1; }
 
-void iic2m_bus_reset(  );
-
 void iic_mcu_start(  );
 void iic_mcu_stop(  );
 

trunk/main.c

@@ -58,6 +58,9 @@ void main_loop( void )
         PM_reset_neg(  );
 
     }
+#ifdef _PARRADIUM_
+        system_status.pwr_state = ON_TRIG;
+#endif
     vreg_ctr_init(  );
     vreg_twl_init(  );
 

trunk/pm.c

@@ -132,15 +132,6 @@ void PM_init(  )
     //    case( BT_VENDER_PANA ):
         default:
         iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 64, BT_BT_PARAM_PANA );
-/*
-            iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 16, BT_BT_PARAM_PANA );
-        iic_mcu_set_wo_dma(  );
-            iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM+16, 16, &BT_BT_PARAM_PANA[16] );
-        iic_mcu_set_wo_dma(  );
-            iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM+16*2, 16, &BT_BT_PARAM_PANA[32] );
-        iic_mcu_set_wo_dma(  );
-            iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM+16*3, 16, &BT_BT_PARAM_PANA[48] );
-*/
             rcomp = BT_PANA_RCOMP;
             temp_co_up = BT_PANA_TEMPCOUP;
             temp_co_dn = BT_PANA_TEMPCODN;
@@ -201,8 +192,10 @@ void PM_init(  )
 task_status_immed PM_bt_temp_update(  )
 {
     s8        newrcomp;
-    static u8 temp_old = 0;
+    static s8 temp_old;
     static u8 count = 0;        // たまにしか書きに行かない
+    static s16 temperature;
+
 
 /*
 	サーミスタ - 10kΩ分圧点の時、
@@ -210,13 +203,8 @@ task_status_immed PM_bt_temp_update(  )
 	村田 T[℃] = 81.48  - 111.97 x ratio
 	TDK  T     = 81.406 - 111.81 x ratio
 */
-    volatile u16 t1 = 63 * 256;
+    temperature = (s16)(( 163 * 256 ) - ( 224 * raw_adc_temperature )) / 2 ;
-    volatile u16 t2 = 224 * raw_adc_temperature;
+    vreg_ctr[VREG_C_BT_TEMP] = (u8)( temperature / 256 );
-    volatile s16 t3 = ( t1 - t2 ) / 2;
-
-    vreg_ctr[VREG_C_BT_TEMP] = ((
-        ( s16 )( ( u16 )( 163 * 256 ) - ( u16 )( 224 * raw_adc_temperature ) ) / 2 )
-            / 256 );
 
     // 時々／大きく変化があったら書きにゆく
     if( ( abs( vreg_ctr[VREG_C_BT_TEMP] - temp_old ) > 3 ) || ( count == 0 ) )
@@ -231,13 +219,14 @@ task_status_immed PM_bt_temp_update(  )
         }
         newrcomp += rcomp;
 
+        newrcomp = swap_endian_16( newrcomp );
         if( iic_mcu_write
             ( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &newrcomp ) == ERR_SUCCESS )
         {
             temp_old = vreg_ctr[VREG_C_BT_TEMP];
         }
-        count += 1;
     }
+    count += 1;
 
     return ( ERR_SUCCESS );
 }
@@ -287,26 +276,52 @@ err PM_LCD_vcom_set(  )
     return ( ERR_SUCCESS );
 }
 
-task_status_immed tski_vcom_set(  )
+
-{
-    PM_LCD_vcom_set(  );
-    return ( ERR_FINISED );
-}
 
 #else
-
+# ifdef _PARRADIUM_
-
+// パラディウム上のSoCでチェックしたいとき、PMICも液晶もつながってないので
-/* ========================================================
+// 異常終了しないようにダミー関数にする
-  ↑で、レジスタ書き込みから呼び出される時のため
+err PM_LCD_on(  )
-  　I2Cの取り合いの関係でここから呼ぶ
- ======================================================== */
-task_status_immed tski_vcom_set(  )
 {
-    PM_LCD_vcom_set(  );
+    vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
-    return ( ERR_FINISED );
+    SND_DEPOP = 0;   // 1でミュート
+    return ( ERR_SUCCESS );
 }
 
 
+err PM_LCD_off(  )
+{
+    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
+    SND_DEPOP = 1;
+    return ( ERR_SUCCESS );
+}
+
+
+err PM_BL_on(  )
+{
+    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
+    return ( ERR_SUCCESS );
+}
+
+
+err PM_BL_off(  )
+{
+    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
+    return ( ERR_SUCCESS );
+}
+
+
+err PM_LCD_vcom_set(  )
+{
+    return ( ERR_SUCCESS );
+}
+
+
+# else
+// PMIC CTR
+
+
 
 /* ========================================================
   液晶系の電源制御
@@ -333,6 +348,8 @@ err PM_LCD_on(  )
     return ( PM_chk_LDSW(  ) );
 }
 
+
+
 err PM_LCD_off(  )
 {
     PM_TCOM_VCS_off(  );
@@ -347,6 +364,7 @@ err PM_LCD_off(  )
 }
 
 
+
 err PM_BL_on(  )
 {
     PM_set_BL( 0x03 );
@@ -357,6 +375,7 @@ err PM_BL_on(  )
 }
 
 
+
 err PM_BL_off(  )
 {
     PM_set_BL( 0x00 );
@@ -378,10 +397,23 @@ err PM_LCD_vcom_set(  )
     return ( rv );
 }
 
-
+# endif
-
-
 #endif
+
+
+
+/* ========================================================
+  ↑で、レジスタ書き込みから呼び出される時のため
+  　I2Cの取り合いの関係でここから呼ぶ
+ ======================================================== */
+task_status_immed tski_vcom_set(  )
+{
+    PM_LCD_vcom_set(  );
+    return ( ERR_FINISED );
+}
+
+
+
 /* ========================================================
   ↑の、I2Cコマンドでの実行の場合の為の、ラッパー的な物
   実仕様上は大丈夫だろうけど、同じ関数がキューに2つ以上
@@ -677,21 +709,28 @@ __interrupt void intp6_PM_irq(  )
 }
 
 
+
+extern u8 temp_debug_3;
+
 /* ========================================================
- PMICからの割り込みを受けて、NTRPMIC互換レジスタからリード
+ PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード
  ======================================================== */
 task_status_immed ntr_pmic_comm(  )
 {
 #ifdef _CODEC_CTR_
-    static u8 reg_shadow;
+    static u8 reg_shadow[2];
-    u8      reg_old;
+    u8      reg1_old;
+
+    reg1_old = reg_shadow[1];
+    if( iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 2, reg_shadow ) != ERR_SUCCESS )
+    {
+        return ( ERR_FINISED );
+    }
 
-    reg_old = reg_shadow;       // BL関係
-    reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PMCOMP );
     DI(  );
 
     // offリクエスト
-    if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 )
+    if( ( reg_shadow[0] & REG_BIT_TWL_REQ_OFF_REQ ) != 0 )
     {
         set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ );
         vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_OFF_REQ;
@@ -702,7 +741,7 @@ task_status_immed ntr_pmic_comm(  )
     }
 
     // リセットリクエスト
-    if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 )
+    if( ( reg_shadow[0] & REG_BIT_TWL_REQ_RST_REQ ) != 0 )
     {
         vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_RESET_REQ;
         if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_RESET_REQ ) == 0 )
@@ -712,9 +751,9 @@ task_status_immed ntr_pmic_comm(  )
     }
 
     // バックライトが...
-    if( ( ( reg_old ^ reg_shadow ) & ~( REG_BIT_TWL_REQ_BL ) ) != 0 )
+    if( ( ( reg1_old ^ reg_shadow[1] ) & REG_BIT_TWL_REQ_BL ) != 0 )  // バックライトの2ビットが何らか変化して、
     {
-        if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL ) ) == 0x00 )
+        if( ( reg_shadow[1] & REG_BIT_TWL_REQ_BL ) == 0x00 )          // 00になった
         {
             // 両方消された
             vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_BL_OFF;
@@ -723,7 +762,7 @@ task_status_immed ntr_pmic_comm(  )
                 IRQ0_ast;
             }
         }
-        else if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL ) ) == ( REG_BIT_TWL_REQ_BL ) )
+        else if( ( reg_shadow[1] & REG_BIT_TWL_REQ_BL ) == REG_BIT_TWL_REQ_BL )
         {
             // 両方ついた
             vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_BL_ON;
@@ -734,8 +773,8 @@ task_status_immed ntr_pmic_comm(  )
         }
     }
     EI(  );
-    reg_shadow &= ~( REG_BIT_TWL_REQ_BL );      // BLだけマスクして、クリアの準備
+    reg_shadow[0] &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ );
-    iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PMCOMP, reg_shadow );
+    iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PM, reg_shadow[0] );
 #endif
     return ( ERR_FINISED );
 }

trunk/pm.h

@@ -32,12 +32,23 @@ enum PMIC_REG_ADRS
   PM_REG_ADRS_POW_DAC2
 };
 
-// CODEC上のPMIC互換レジスタ
-#define CODEC_REG_PMCOMP 0x10
 
 
 
 //=========================================================
+// CODEC上のPMIC互換レジスタ
+#define CODEC_REG_PM 0x10
+#define CODEC_REG_BL 0x11
+#define CODEC_REG_BT 0x12
+
+// TWLがSPIでPMICに投げたコマンド
+#define REG_BIT_TWL_REQ_OFF_REQ  ( 1 << 6 )
+#define REG_BIT_TWL_REQ_RST_REQ  ( 1 << 0 )
+#define REG_BIT_TWL_REQ_BL       ( 3 << 2 )
+
+
+
+
 #define PM_REG_BIT_LDSW      ( 1 << 0 )
 #define PM_REG_BIT_nRST1     ( 1 << 1 )
 #define PM_REG_BIT_VDD        0x0F

trunk/tasks.c

@@ -172,6 +172,7 @@ void tsk_debug(  )
     return;
 }
 
+u8 temp_debug_3;
 
 void tsk_debug2(  )
 {
@@ -188,7 +189,8 @@ void tsk_debug2(  )
         str[3] = vreg_ctr[ VREG_C_IRQ1 ];
         str[2] = vreg_ctr[ VREG_C_IRQ2 ];
         str[1] = vreg_ctr[ VREG_C_IRQ3 ];
-        str[0] = vreg_ctr[ VREG_C_STATUS ];
+//        str[0] = vreg_ctr[ VREG_C_STATUS ];
+        str[0] = temp_debug_3;
 
 //    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_IRQ1 ] );
 //    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, boot_ura );

trunk/vreg_ctr.h

@@ -116,14 +116,6 @@ enum
 #define REG_BIT_TWL_IRQ_VOL_CHANGE 0x40
 
 
-
-// TWLがSPIでPMICに投げたコマンド
-#define REG_BIT_TWL_REQ_OFF_REQ  ( 1 << 6 )
-#define REG_BIT_TWL_REQ_RST_REQ  ( 1 << 0 )
-#define REG_BIT_TWL_REQ_BL       ( 3 << 2 )
-
-
-
 /*
   テンプレ
 #define REG_BIT_                    ( 1 << 7 )

trunk/yav_mcu_bsr.plg

@@ -1,6 +1,19 @@
 C:\WINDOWS\system32\cmd.exe /c echo touch magic.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 -qvjl1wt -sainter_asm -zp -no pm.c
+pm.c(210) : CC78K0R warning W0745: Expected function prototype
+pm.c(214) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(218) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(223) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_write'
+pm.c(617) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    5 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\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 -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 ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel tasks.rel adc.rel renge.rel tasks_sys.rel accero.rel self_flash.rel reboot.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.
 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) : 5 

trunk/yav_mcu_bsr.pri

@@ -45,6 +45,15 @@ Erase=OFF
 HighSpeed=OFF
 Symbol Reset=ON
 CPU Reset=ON
+File1=bsr.lmf
+LoadFilter1=5
+Offset1=0
+Object1=ON
+Symbol1=ON
+Erase1=ON
+HighSpeed1=OFF
+CPU Reset1=ON
+Symbol Reset1=ON
 [View File]
 Dir=.
 Filter=Source
@@ -69,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=64, 33, 1090, 857
+Geometry=104, 38, 981, 857
-Window=Hide
+Window=Normal
-DispStart=1
+DispStart=264
-CaretPos=0,0
+CaretPos=265,0
 Mode=Normal
 DispFile=
 Address1=
@@ -131,10 +140,10 @@ SaveStart=
 SaveEnd=
 Accumulative=ON
 [Assemble]
-Geometry=118, 275, 600, 738
+Geometry=59, 244, 600, 738
 Window=Normal
-DispStart=8803
+DispStart=14961
-CaretPos=8803,27
+CaretPos=14961,27
 Address1=
 Address2=
 Address3=
@@ -185,7 +194,7 @@ Endian=
 Ascii=OFF
 Idtag=OFF
 Address=
-DispStart=00000000
+DispStart=FFFFFFFF
 CaretPosData=0, 0
 CaretPosAscii=0, 0
 Address1=
@@ -242,7 +251,7 @@ Destination=0
 [I/O Port]
 Line=0
 [Stack]
-Geometry=803, 784, 400, 300
+Geometry=839, 787, 400, 300
 Window=Normal
 Boundary=13762687
 Mode=Proper
@@ -951,71 +960,41 @@ Count=0
 Geometry=1138, 6, 440, 688
 Window=Normal
 Boundary=13762700
-0=.t1,P,N,A,+,1
+0=.hist_bt_temp,D,N,A,+,1
-1=.t2,P,N,A,+,1
+1=.ADCRH,P,S,A,+,1
-2=.t3,D,N,A,+,1
+2=.vreg_ctr,P,N,A,+,1
-3=.hist_bt_temp,D,N,A,+,1
+3=.vreg_ctr[11],D,N,A,+,1
-4=.ADCRH,P,S,A,+,1
+4=.skip,P,N,A,+,1
-5=.raw_adc_temperature,H,N,A,+,1
+5=.temperature,P,N,A,+,1
-6=.vreg_ctr,P,N,A,+,1
+6=.raw_adc_temperature,P,N,A,+,1
-7=.vreg_ctr[11],D,N,A,+,1
+7=.system_status.pwr_state,P,N,A,+,1
-8=.skip,P,N,A,+,1
+Line=8
-9=.system_status.pwr_state,P,N,A,+,1
-Line=10
 [Quick Watch]
-0=system_status.pwr_state,P,A,1
+0=pm12,P,A,1
-1=pm12,P,A,1
+1=vreg_twl,P,A,1
-2=vreg_twl,P,A,1
+2=PMK21,P,A,1
-3=PMK21,P,A,1
+3=IFP21,P,A,1
-4=IFP21,P,A,1
+4=PIF21,P,A,1
-5=PIF21,P,A,1
+5=skip,P,A,1
-6=skip,P,A,1
+6=vreg_ctr[11],P,A,1
-7=vreg_ctr[11],P,A,1
+7=ADCRH,P,A,1
-8=raw_adc_temperature,P,A,1
+8=hist_tune,P,A,1
-9=ADCRH,P,A,1
+9=hist_bt_temp,P,A,1
-10=hist_tune,P,A,1
+10=vreg_ctr,P,A,1
-11=hist_bt_temp,P,A,1
+11=t1,P,A,1
-12=vreg_ctr,P,A,1
+12=t2,P,A,1
-13=t1,P,A,1
+13=t3,P,A,1
-14=t2,P,A,1
+14=raw_adc_temperature,P,A,1
-15=t3,P,A,1
+15=temperature,P,A,1
 [Software Break]
 Geometry=51, 459, 500, 200
 Window=Normal
 Width=150 30 200 100
 Name0=Swb00001
-Address0=0x46D
+Address0=pm.c#_PM_bt_temp_update+0x3d
 Window0=ASM
 Status0=ON
-Name1=Swb00004
+Count=1
-Address1=0x3288
-Window1=ASM
-Status1=ON
-Name2=Swb00002
-Address2=0x324A
-Window2=ASM
-Status2=ON
-Name3=Swb00003
-Address3=0x3516
-Window3=ASM
-Status3=ON
-Name4=Swb00005
-Address4=0x3B7D
-Window4=ASM
-Status4=ON
-Name5=Swb00006
-Address5=0x3B84
-Window5=ASM
-Status5=ON
-Name6=Swb00008
-Address6=0x2270
-Window6=ASM
-Status6=ON
-Name7=Swb00007
-Address7=0x2263
-Window7=ASM
-Status7=ON
-Count=8
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prj

@@ -474,6 +474,101 @@ ZB=
 Etcetera0=
 Etcetera1=boot.lmf
 CommandFile=0
+[Options.LCNV78K0R 0]
+Version=100
+LCNV_GO=0
+E=0
+CommandFile=0
+[Options.LCNV78K0R 1]
+Version=100
+LCNV_GO=0
+E=0
+CommandFile=0
+[Options.LCNV78K0R 2]
+Version=100
+LCNV_GO=0
+E=0
+CommandFile=0
+[Options.LCNV78K0R 3]
+Version=100
+LCNV_GO=0
+E=0
+CommandFile=0
+[Options.LCNV78K0R 4]
+Version=100
+LCNV_GO=0
+E=0
+CommandFile=0
+[Options.LCNV78K0R 5]
+Version=100
+LCNV_GO=0
+E=0
+CommandFile=0
+[Options.78K0R]
+BuildMode=2
+BuildMode2=K0R_dbg
+BuildMode3=BSR_dbg
+BuildMode4=BSR_rel
+BuildMode5=BSR_WM0
+DefaultMode2=1
+DefaultMode3=1
+DefaultMode4=1
+DefaultMode5=1
+[SrcFile]
+Source1=loader.c
+Source2=pm.c
+Source3=i2c_ctr.c
+Source4=main.c
+Source5=magic.c
+Source6=WDT.c
+Source7=i2c_mcu.c
+Source8=i2c_twl.c
+Source9=ini_VECT.c
+Source10=led.c
+Source11=rtc.c
+Source12=vreg_ctr.c
+Source13=vreg_twl.c
+Source14=tasks.c
+Source15=adc.c
+Source16=renge\renge.c
+Source17=tasks_sys.c
+Source18=accero.c
+Source19=self_flash.c
+Source20=reboot.c
+[IncFile]
+Include1=incs_loader.h
+Include2=jhl_defs.h
+Include3=user_define.h
+Include4=config.h
+Include5=bsr_system.h
+Include6=renge\renge.h
+Include7=renge\renge_defs.h
+Include8=renge\renge_task_immediate.h
+Include9=vreg_ctr.h
+Include10=loader.h
+Include11=i2c_mcu.h
+Include12=WDT.h
+Include13=fsl.h
+Include14=fsl_user.h
+Include15=i2c_ctr.h
+Include16=pm.h
+Include17=rtc.h
+Include18=adc.h
+Include19=led.h
+Include20=incs.h
+Include21=vreg_twl.h
+Include22=accero.h
+Include23=i2c_twl_defs.h
+Include24=renge\renge_task_intval.h
+Include25=i2c_twl.h
+Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
+Include27=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
+Include28=reboot.h
+[ToolSet]
+ToolSetName=(•Ï<E280A2>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
@@ -645,7 +740,7 @@ AssignROMchk=0
 AssignROM=0
 Maxoptimizechk=0
 Maxoptimize=1104
-Charunexpandchk=1
+Charunexpandchk=0
 Unsignedchar=0
 Usesaddrchk=0
 Autoallocationchk=1
@@ -940,98 +1035,3 @@ VfiFileBoot0=
 VfiFileBoot1=boot.vfi
 VF78K0Rchk=0
 VF78K0Rvs=
-[Options.LCNV78K0R 0]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 1]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 2]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 3]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 4]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 5]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.78K0R]
-BuildMode=2
-BuildMode2=K0R_dbg
-BuildMode3=BSR_dbg
-BuildMode4=BSR_rel
-BuildMode5=BSR_WM0
-DefaultMode2=1
-DefaultMode3=1
-DefaultMode4=1
-DefaultMode5=1
-[SrcFile]
-Source1=loader.c
-Source2=pm.c
-Source3=i2c_ctr.c
-Source4=main.c
-Source5=magic.c
-Source6=WDT.c
-Source7=i2c_mcu.c
-Source8=i2c_twl.c
-Source9=ini_VECT.c
-Source10=led.c
-Source11=rtc.c
-Source12=vreg_ctr.c
-Source13=vreg_twl.c
-Source14=tasks.c
-Source15=adc.c
-Source16=renge\renge.c
-Source17=tasks_sys.c
-Source18=accero.c
-Source19=self_flash.c
-Source20=reboot.c
-[IncFile]
-Include1=incs_loader.h
-Include2=jhl_defs.h
-Include3=user_define.h
-Include4=config.h
-Include5=bsr_system.h
-Include6=renge\renge.h
-Include7=renge\renge_defs.h
-Include8=renge\renge_task_immediate.h
-Include9=vreg_ctr.h
-Include10=loader.h
-Include11=i2c_mcu.h
-Include12=WDT.h
-Include13=fsl.h
-Include14=fsl_user.h
-Include15=i2c_ctr.h
-Include16=pm.h
-Include17=rtc.h
-Include18=adc.h
-Include19=led.h
-Include20=incs.h
-Include21=vreg_twl.h
-Include22=accero.h
-Include23=i2c_twl_defs.h
-Include24=renge\renge_task_intval.h
-Include25=i2c_twl.h
-Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
-Include27=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
-Include28=reboot.h
-[ToolSet]
-ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
-Tool1=CC78K0R|W2.10
-Tool2=RA78K0R|W1.31
-Tool3=ID78K0R-QB|V3.60

trunk/yav_mcu_bsr.prk

@@ -14,16 +14,17 @@ OpenFile7=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0
 OpenFile8=loader.c,0,255,224,1438,850,14,85,0,0
 OpenFile9=main.c,0,124,87,1368,844,0,45,0,0
 OpenFile10=vreg_ctr.c,0,345,273,1060,932,14,23,0,0
-OpenFile11=i2c_ctr.c,0,242,242,1425,868,14,108,0,0
+OpenFile11=reboot.c,0,110,110,1354,867,5,14,14,0
-OpenFile12=reboot.c,0,110,110,1354,867,5,14,14,0
+OpenFile12=config.h,0,374,323,1618,1080,15,18,22,0
-OpenFile13=config.h,0,374,323,1618,1080,15,18,22,0
+OpenFile13=vreg_twl.c,0,314,110,1558,867,74,90,75,0
-OpenFile14=vreg_twl.c,0,314,110,1558,867,74,90,75,0
+OpenFile14=renge\renge.c,0,154,154,1398,911,0,264,0,0
-OpenFile15=renge\renge.c,0,154,154,1398,911,0,264,0,0
+OpenFile15=adc.c,0,275,163,1065,610,0,145,0,0
-OpenFile16=adc.c,0,275,163,1065,610,0,145,0,0
+OpenFile16=led.c,0,286,286,1469,912,12,323,0,0
 OpenFile17=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile18=led.c,0,286,286,1469,912,12,323,0,0
+OpenFile18=i2c_ctr.c,0,329,42,1171,976,9,101,9,0
-OpenFile19=OutputWindow
+OpenFile19=pm.c,0,457,302,1701,1059,0,216,0,0
+OpenFile20=OutputWindow
 OutputPos=0,360,1128,478,1503
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]

trunk/yav_mcu_bsr.sdb

@@ -11,7 +11,7 @@ T=4ae7c536
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4ae8edfa
+T=4aee97ce
 1=incs.h
 2=adc.h
 3=led.h
@@ -20,7 +20,7 @@ T=4ae8edfa
 T=4ae78e76
 1=incs.h
 [main.c]
-T=4ae8dfa1
+T=4aee391d
 1=incs.h
 2=WDT.h
 3=rtc.h
@@ -34,7 +34,7 @@ T=4ad3e9ff
 T=4aca8ef0
 1=incs_loader.h
 [i2c_mcu.c]
-T=4ae66d1d
+T=4aee94fe
 1=incs.h
 2=i2c_mcu.h
 [i2c_twl.c]
@@ -66,13 +66,13 @@ T=4ae916d9
 3=vreg_twl.h
 4=vreg_ctr.h
 [tasks.c]
-T=4ae9424d
+T=4aee6c62
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [adc.c]
-T=4ae955ff
+T=4aea78e3
 1=incs.h
 2=adc.h
 3=pm.h
@@ -85,7 +85,7 @@ T=4ae94be1
 4=WDT.h
 5=bsr_system.h
 [tasks_sys.c]
-T=4ae8e00c
+T=4aea41aa
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -122,7 +122,7 @@ T=4ae647cd
 T=4ae8dfa1
 1=config.h
 [config.h]
-T=4ae8dd2a
+T=4aee58b4
 [bsr_system.h]
 T=4aca8c17
 [renge\renge.h]
@@ -135,13 +135,13 @@ T=4ac96e5c
 T=4ad68780
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4ae7c500
+T=4aee86c8
 1=config.h
 [loader.h]
 T=4aca8c17
 1=jhl_defs.h
 [i2c_mcu.h]
-T=4aca8c17
+T=4aee9168
 [WDT.h]
 T=4aca8c17
 [fsl.h]
@@ -151,7 +151,7 @@ T=4aca8c17
 [i2c_ctr.h]
 T=4aca8c17
 [pm.h]
-T=4ae80b79
+T=4aee8ed6
 [rtc.h]
 T=4aca8c17
 [adc.h]