From 7b71a2533cbe8a4597d34be9d1d36243c4588daf Mon Sep 17 00:00:00 2001
From: fujita_ryohei <fujita_ryohei@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Thu, 25 Mar 2010 06:04:35 +0000
Subject: [PATCH] git-svn-id:
 file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@101
 013db118-44a6-b54f-8bf7-843cb86687b1

---
 trunk/adc.c           |  28 +++++--
 trunk/adc.h           |   1 -
 trunk/pm.c            |  55 ++++++++++----
 trunk/task_debug.c    |   2 +
 trunk/task_misc.c     |   6 +-
 trunk/task_sys.c      |   3 -
 trunk/user_define.h   |  10 ++-
 trunk/vreg_ctr.c      |  10 +--
 trunk/yav_mcu_bsr.plg |   2 +-
 trunk/yav_mcu_bsr.pri | 166 ++++++++++++++++++++++++------------------
 trunk/yav_mcu_bsr.prj |   4 +-
 trunk/yav_mcu_bsr.prk |  25 +++----
 trunk/yav_mcu_bsr.sdb |  26 +++----
 13 files changed, 202 insertions(+), 136 deletions(-)

diff --git a/trunk/adc.c b/trunk/adc.c
index 869146b..7ef2996 100644
--- a/trunk/adc.c
+++ b/trunk/adc.c
@@ -14,9 +14,6 @@ bit     adc_updated;
 u8 adc_raw_vol;
 u8 adc_raw_dep;
 
-u8 vol_old;
-
-
 #define INTERVAL_TSK_ADC  3
 /* ========================================================
  ADC設定と、開始
@@ -126,11 +123,13 @@ void tsk_adc(  )
             {
                 // 似非ヒステリシスを付けて64段
                 u8        temp;
+                static u8 vol_old;
+                static u8 force_update_vol;
 
+                temp = slider_to_codec[ adc_raw_vol / 4 ];
                 if( abs( adc_raw_vol - vol_old ) >= 2 )
                 {
-                    temp = slider_to_codec[ adc_raw_vol / 4 ];
-
+//                    temp = slider_to_codec[ adc_raw_vol / 4 ];
                     if( vreg_ctr[ VREG_C_SND_VOL ] != temp )
                     {
                         vol_old = adc_raw_vol;
@@ -140,11 +139,27 @@ void tsk_adc(  )
 
                         // codecに伝える
                         iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, temp );
+#ifndef _MODEL_CTR_JIKKI_
                         iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - adc_raw_vol ) / 4 ] );  // todo
-
+#endif
                         set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE );
+                        force_update_vol = 100;
                     }
                 }
+
+                {
+                    // ポーリング
+                    if( --force_update_vol == 0 )
+                    {
+                        vol_old = adc_raw_vol;
+                        // レジスタ更新
+                        vreg_ctr[ VREG_C_SND_VOL ] = temp;
+                        vreg_twl[ REG_TWL_INT_ADRS_VOL ] = adc_raw_vol / ( 256 / 32 );  // ←adc値でよい
+                    }
+                    // codecに伝える
+                    iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, temp );
+                    force_update_vol = 100;
+                }
             }
 
 
@@ -167,7 +182,6 @@ void tsk_adc(  )
                     break;
                 }
             }
-
             adc_updated = 0;
         }
     }
diff --git a/trunk/adc.h b/trunk/adc.h
index 9a1b40a..e18bf83 100644
--- a/trunk/adc.h
+++ b/trunk/adc.h
@@ -34,7 +34,6 @@
 
 
 ///////////////////////////////////////
-extern u8 vol_old;
 
 
 ///////////////////////////////////////
diff --git a/trunk/pm.c b/trunk/pm.c
index 95fc999..bb61e2a 100644
--- a/trunk/pm.c
+++ b/trunk/pm.c
@@ -134,7 +134,7 @@ void PM_init(  )
     // PMIC バージョン読み出し
 //    temp = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VER );
 //  vreg_ctr[ VREG_C_PM_INFO ] = temp;
-// デバッグ用INFOレジスタリード時に逐次
+// デバッグ用
 }
 
 
@@ -238,7 +238,7 @@ err PM_LCD_on(  )
         vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
         set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
 
-        SND_DEPOP = 0;   // 1でミュート
+        SND_DEPOP_DEACT;   // 1でミュート
     }
 
 #ifdef _PMIC_TWL_
@@ -251,7 +251,7 @@ err PM_LCD_on(  )
 
 void PM_LCD_off()
 {
-    SND_DEPOP = 1;
+    SND_DEPOP_ACT;
 
     // BLついてたら消す
 #ifdef _PMIC_TWL_
@@ -397,14 +397,14 @@ err PM_LCD_on(  )
 {
     vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
     set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
-    SND_DEPOP = 0;   // 1でミュート
+    SND_DEPOP_DEACT;   // 1でミュート
     return ( ERR_SUCCESS );
 }
 
 
 void PM_LCD_off(  )
 {
-    SND_DEPOP = 1;
+    SND_DEPOP_ACT;
     vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
     set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
 }
@@ -501,16 +501,18 @@ err PM_sys_pow_on(  )
     {
         return ( ERR_ERR );
     }
+    FCRAM_RST_neg;
     PM_reset_neg();
     RESET2_neg;
-    FCRAM_RST_neg;
 /*
     wait_ms( 100 );
-    {  // CODEC 不定レジスタ初期化
+    {
+        // CODEC 不定レジスタ初期化
         u8 codec_reg_init[3] = { 0,0,0 };
         iic_mcu_write( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init );
     }
 */
+
 #else
     // TWL PMIC
     u8      temp;
@@ -532,9 +534,9 @@ err PM_sys_pow_on(  )
         return ( ERR_ERR );
     }
     vreg_ctr[VREG_C_BT_REMAIN] = temp;
+    FCRAM_RST_neg;
     PM_reset_neg();
     RESET2_neg;
-    FCRAM_RST_neg;
     wait_ms( 100 );
     if( !RESET1_n )
     {
@@ -617,7 +619,7 @@ err PM_sys_pow_off(  )
 
   PM_EXTDCは割り込みメインにするかも
  ======================================================== */
-#define INTERVAL_TSK_BATT  100
+#define INTERVAL_TSK_BATT  250
 
 void tsk_batt(  )
 {
@@ -746,9 +748,11 @@ task_status_immed ntr_pmic_comm(  )
 {
     static u8 reg_shadow;
     u8        reg1_old;
+    u8        irq_work = 0;
 
     reg1_old = reg_shadow;
-    if( iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 1, &reg_shadow ) != ERR_SUCCESS )
+    reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PM );
+    if( iic_mcu_bus_status != ERR_SUCCESS )
     {
         return ( ERR_FINISED );
     }
@@ -760,11 +764,13 @@ task_status_immed ntr_pmic_comm(  )
     {
         if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 )             // 消えた
         {
-            set_irq( VREG_C_IRQ2, 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 );
         }
         else
         {
-            set_irq( VREG_C_IRQ2, 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 );
         }
     }
 
@@ -773,14 +779,32 @@ task_status_immed ntr_pmic_comm(  )
     {
         if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 )             // 消えた
         {
-            set_irq( VREG_C_IRQ2, 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 );
         }
         else
         {
-            set_irq( VREG_C_IRQ2, 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 );
         }
     }
 
+    irq_work &= ~VREG_C_IRQ_MASK2;
+    // set_irq 相当品
+    if( irq_work != 0 )
+    {
+        u8 tot;
+
+        DI();
+        vreg_ctr[ VREG_C_IRQ2 ] |= irq_work;
+        EI();
+        IRQ0_neg;  // 一瞬上げてパルスを送り直す
+        tot = 0;
+        while( !IRQ0 && ( ++tot != 0 ) ){;}  // O.Dなのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良)
+        IRQ0_ast;
+    }
+
+
     // テストコード ↓ //
         // バックライト設定
         /// 今のところさらに細かくは分けないけど…
@@ -849,8 +873,7 @@ static void PM_get_batt_left(){
     }
 
     // PMIC-NTRに電池残量を教えてあげる
-    iic_mcu_write_a_byte( IIC_SLA_CODEC,
-                          CODEC_REG_BT,
+    iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT,
                           ( vreg_ctr[ VREG_C_BT_REMAIN ] < 5 )? 1 : 0 );  // 1で電池切れ
 
 }
diff --git a/trunk/task_debug.c b/trunk/task_debug.c
index f58c2fc..fe91426 100644
--- a/trunk/task_debug.c
+++ b/trunk/task_debug.c
@@ -23,7 +23,9 @@ void tsk_debug(  )
 #ifdef _MODEL_WM0_
         PM_CHG_TIMEOUT_DISABLE();                            // /WL_RST に配線されています
 #endif
+#ifndef _MODEL_CTR_JIKKI_
         iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 );     // ACR←0x80 揮発モードへ
+#endif
 
     /*
        temp = iic_mcu_read_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO );
diff --git a/trunk/task_misc.c b/trunk/task_misc.c
index 00349a7..22c8779 100644
--- a/trunk/task_misc.c
+++ b/trunk/task_misc.c
@@ -136,8 +136,8 @@ void tsk_misc_stat(  )
 
         // 割り込みの取りこぼし？
         if( !PM_IRQ_n ){
-                renge_task_immed_add( ntr_pmic_comm );
-                NOP();
+            renge_task_immed_add( ntr_pmic_comm );
+            NOP();
         }
     }
     return;
@@ -182,8 +182,8 @@ task_status_immed do_command0(  )
             }
             wait_ms( 5 );
             FCRAM_RST_neg;
-            RESET2_neg;
             PM_reset_neg();
+            RESET2_neg;
 /*
              // CODEC 不定レジスタ初期化
             wait_ms( 100 );
diff --git a/trunk/task_sys.c b/trunk/task_sys.c
index 04de660..e7e1605 100644
--- a/trunk/task_sys.c
+++ b/trunk/task_sys.c
@@ -132,9 +132,6 @@ void tsk_sys(  )
         system_status.poweron_reason = NONE;
         renge_task_interval_run_force = 1;
 
-        vreg_ctr[ VREG_C_SND_VOL ] = 0xFF;
-        vol_old = 0xFF;  // volの値を書く。CODECは忘れてしまうため。
-
         MK0 = INT_MSK0_RSV;
         MK1 = INT_MSK1_RSV;
 #ifdef _MCU_BSR_
diff --git a/trunk/user_define.h b/trunk/user_define.h
index f69f77d..1740ebf 100644
--- a/trunk/user_define.h
+++ b/trunk/user_define.h
@@ -39,7 +39,7 @@
 
 #else
 
-#define SLP_ACK         P7.5
+#define SLP_ACK         P7.7
 #endif
 
 
@@ -118,7 +118,13 @@
 #define PM_IRQ_n             P7.2
 // INTP6
 
-#define SND_DEPOP            P7.7
+#ifndef _MODEL_CTR_
+#define SND_DEPOP_ACT            P7.5 = 1
+#define SND_DEPOP_DEACT          P7.5 = 0
+#else
+#define SND_DEPOP_ACT            ;
+#define SND_DEPOP_DEACT          ;
+#endif
 
 // PM
 #define PM_EXTDC_n           P7.0
diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c
index 9ececdb..ace263f 100644
--- a/trunk/vreg_ctr.c
+++ b/trunk/vreg_ctr.c
@@ -393,15 +393,15 @@ void vreg_ctr_after_read( u8 adrs )
 // マスクされてたら、フラグも立てず、割り込みも入れない。
 void set_irq( u8 irqreg, u8 irq_flg )
 {
-    u8 tot;   // IRQ_mcu がLに縛られてると困る(基板不良)
+    u8 tot;
 
-  DI();
+    DI();
     if( ( vreg_ctr[ irqreg + 8 ] & irq_flg ) == 0 ){
         vreg_ctr[ irqreg ] |= irq_flg;
-        IRQ0_neg;
+        IRQ0_neg;   // 一瞬上げて落とし直す。
+        EI();
         tot = 0;
-        while( !IRQ0 && ( ++tot != 0 ) ){;}
+        while( !IRQ0 && ( ++tot != 0 ) ){;}   // O.D.なのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良)
         IRQ0_ast;
     }
-    EI();
 }
diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg
index b71ea2f..5348c75 100644
--- a/trunk/yav_mcu_bsr.plg
+++ b/trunk/yav_mcu_bsr.plg
@@ -1,5 +1,5 @@
 C:\WINDOWS\system32\cmd.exe /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 -qvjl2wtg -sainter_asm -zp -no 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 -qvjl3wt -sainter_asm -zp -no 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.
diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri
index a47618c..c8ea8dc 100644
--- a/trunk/yav_mcu_bsr.pri
+++ b/trunk/yav_mcu_bsr.pri
@@ -22,7 +22,7 @@ SubClock=None
 [Mapping]
 Count=0
 [Main]
-Geometry=110, 110, 1200, 882
+Geometry=-707, 91, 1200, 882
 Window=Max
 MDI_MAX=OFF
 Button=ON
@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=438, 5, 678, 804
+Geometry=281, 161, 871, 684
 Window=Normal
-DispStart=68
-CaretPos=69,0
+DispStart=277
+CaretPos=278,0
 Mode=Normal
 DispFile=
 Address1=
@@ -139,19 +139,11 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
-[Source1]
-Geometry=0, 0, 678, 804
-Window=Normal
-DispStart=773
-CaretPos=819,1
-Mode=Normal
-DispFile=pm.c
-Accumulative=ON
 [Assemble]
 Geometry=24, 657, 600, 400
 Window=Normal
-DispStart=1208
-CaretPos=1208,27
+DispStart=17419
+CaretPos=17419,27
 Address1=
 Address2=
 Address3=
@@ -822,7 +814,7 @@ L529=IICWL1
 L530=IICWH1
 L531=SVA1
 [Local Variable]
-Geometry=850, 793, 400, 300
+Geometry=697, 793, 400, 300
 Window=Normal
 Boundary=13041851
 Mode=Proper
@@ -874,8 +866,8 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 [Register]
-Geometry=25, 25, 250, 400
-Window=Hide
+Geometry=884, 10, 250, 400
+Window=Normal
 Mode=Hex
 Boundary=62
 Pickup=OFF
@@ -902,7 +894,17 @@ Manager=ON
 Sort by=Unsort
 Detail=OFF
 Last Name=
-Count=0
+Name0=force001
+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
@@ -918,7 +920,10 @@ Manager=ON
 Sort by=Unsort
 Detail=OFF
 Last Name=
-Count=0
+Name0=force002
+Element0=force001
+Set0=ON
+Count=1
 [Trace]
 Geometry=0, 0, 0, 0
 Window=Hide
@@ -968,79 +973,102 @@ Count=0
 Geometry=1146, 11, 440, 793
 Window=Normal
 Boundary=13762700
-0=.p12.0,P,S,A,+,1
-1=.pm12.0,P,S,A,+,1
-2=.SPD1,P,S,A,+,1
-3=.STD1,P,S,A,+,1
-4=.pr10,B,S,A,+,1
-5=.pr00,B,S,A,+,1
-6=.pr11,B,S,A,+,1
-7=.pr01,B,S,A,+,1
-8=.iics1,P,S,A,+,1
-9=.iicf1,P,S,A,+,1
-10=.P3.3,P,S,A,+,1
-11=.PU3.3,P,S,A,+,1
-12=.PM3.3,P,S,A,+,1
-13=.SW_home_mask,P,N,A,+,1
-14=.SW_home_mask,P,N,A,+,1
-15=.SW_home_count,P,N,A,+,1
-16=.PU20,B,S,A,+,1
-17=.P2.0,P,S,A,+,1
-18=.PM2.0,P,S,A,+,1
-19=.P20.4,B,S,A,+,1
-20=.PM20.4,B,S,A,+,1
-21=.PM3,B,S,A,+,1
-22=.P3,B,S,A,+,1
-23=.adc_raw_vol,P,N,A,+,1
-24=.vol_old,P,N,A,+,1
-25=.iic_burst_state,P,N,A,+,1
-Line=26
+0=.force_update_adc,P,N,A,+,1
+1=.temp,P,N,A,+,1
+2=.iic_mcu_bus_status,P,N,A,+,1
+3=.adc_raw_vol,P,N,A,+,1
+4=.P12.0,P,S,A,+,1
+5=.PM12.0,P,S,A,+,1
+6=.PM7.5,P,S,A,+,1
+7=.P7.5,P,S,A,+,1
+8=.TRC1,P,S,A,+,1
+9=.IICA1,P,S,A,+,1
+10=.temp,P,N,A,+,1
+11=.p12.0,P,S,A,+,1
+12=.pm12.0,P,S,A,+,1
+13=.SPD1,P,S,A,+,1
+14=.STD1,P,S,A,+,1
+15=.pr10,B,S,A,+,1
+16=.pr00,B,S,A,+,1
+17=.pr11,B,S,A,+,1
+18=.pr01,B,S,A,+,1
+19=.iics1,P,S,A,+,1
+20=.iicf1,P,S,A,+,1
+21=.P3.3,P,S,A,+,1
+22=.PU3.3,P,S,A,+,1
+23=.PM3.3,P,S,A,+,1
+24=.SW_home_mask,P,N,A,+,1
+25=.SW_home_mask,P,N,A,+,1
+26=.SW_home_count,P,N,A,+,1
+27=.PU20,B,S,A,+,1
+28=.P2.0,P,S,A,+,1
+29=.PM2.0,P,S,A,+,1
+30=.P20.4,B,S,A,+,1
+31=.PM20.4,B,S,A,+,1
+32=.PM3,B,S,A,+,1
+33=.P3,B,S,A,+,1
+34=.adc_raw_vol,P,N,A,+,1
+35=.vol_old,P,N,A,+,1
+36=.iic_burst_state,P,N,A,+,1
+Line=37
 [Quick Watch]
-0=SW_home_mask,P,A,1
-1=iicf1,P,A,1
-2=iics1,P,A,1
-3=pr010,P,A,1
-4=pr01,P,A,1
-5=pr00,P,A,1
-6=pr11,P,A,1
-7=pr10,B,A,1
-8=iic_burst_state,P,A,1
-9=STD1,P,A,1
-10=SPD1,P,A,1
-11=IICA,P,A,1
-12=IICA1,P,A,1
+0=STD1,P,A,1
+1=SPD1,P,A,1
+2=IICA,P,A,1
+3=pm12.0,P,A,1
+4=p12.0,P,A,1
+5=IICA1,P,A,1
+6=TRC1,P,A,1
+7=P7.5,P,A,1
+8=PM7.6,P,A,1
+9=PM7.5,P,A,1
+10=PM12.0,P,A,1
+11=P12.0,P,A,1
+12=iic_mcu_bus_status,P,A,1
 13=temp,P,A,1
-14=pm12.0,P,A,1
-15=p12.0,P,A,1
+14=adc_raw_vol,P,A,1
+15=force_update_adc,P,A,1
 [Software Break]
 Geometry=1085, 803, 500, 296
 Window=Normal
 Width=150 30 200 100
 Name0=Swb00001
-Address0=task_misc.c#_tski_mcu_info_read+0x4a
+Address0=task_misc.c#_tski_mcu_info_read+0x48
 Window0=ASM
 Status0=ON
 Name1=Swb00002
-Address1=task_misc.c#_tski_mcu_info_read+0x5e
+Address1=task_misc.c#_tski_mcu_info_read+0x5c
 Window1=ASM
 Status1=ON
 Name2=Swb00003
-Address2=task_misc.c#_tski_mcu_info_read+0x66
+Address2=task_misc.c#_tski_mcu_info_read+0x5c
 Window2=ASM
 Status2=ON
 Name3=Swb00005
-Address3=task_misc.c#_tski_mcu_info_read+0x6b
+Address3=task_misc.c#_tski_mcu_info_read+0x5c
 Window3=ASM
 Status3=ON
 Name4=Swb00004
-Address4=task_misc.c#_tski_mcu_info_read+0x3e
+Address4=task_misc.c#_tski_mcu_info_read+0x3a
 Window4=ASM
 Status4=ON
-Name5=Swb00006
-Address5=pm.c#_ntr_pmic_comm+0x8c
+Name5=Swb00007
+Address5=task_sys.c#es_F0052+0xc3
 Window5=ASM
 Status5=ON
-Count=6
+Name6=Swb00006
+Address6=task_sys.c#es_F0052+0xe9
+Window6=ASM
+Status6=ON
+Name7=Swb00008
+Address7=task_sys.c#es_F0052+0xcd
+Window7=ASM
+Status7=ON
+Name8=Swb00011
+Address8=adc.c#_tsk_adc+0xe0
+Window8=ASM
+Status8=ON
+Count=9
 [Reset]
 Debugger=ON
 Symbol=OFF
diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj
index 2a1ba74..1e4fb38 100644
--- a/trunk/yav_mcu_bsr.prj
+++ b/trunk/yav_mcu_bsr.prj
@@ -753,10 +753,10 @@ Usesaddrchk=0
 Autoallocationchk=1
 Jumpoptimize=1
 Librarycallchk=1
-Librarycall=1129
+Librarycall=1132
 Aggressivechk=1
 Relativebranchchk=1
-Debugoptchk=1
+Debugoptchk=0
 Outdebugchk=1
 Outdebug=1153
 Outasmsrccmb0=inter_asm
diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk
index 1721b56..dd17098 100644
--- a/trunk/yav_mcu_bsr.prk
+++ b/trunk/yav_mcu_bsr.prk
@@ -1,26 +1,23 @@
 [ProjectManager]
 FrameMax=1
-FrameX=0
-FrameY=43
+FrameX=75
+FrameY=122
 FrameCX=1299
 FrameCY=1044
 OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0
 OpenFile2=jhl_defs.h,0,250,539,1494,1265,0,10,8,0
 OpenFile3=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0
 OpenFile4=renge\renge_defs.h,0,667,22,1514,748,0,16,0,0
-OpenFile5=pedometer.h,0,586,125,1830,851,11,74,11,0
-OpenFile6=sw.c,0,264,264,1508,990,0,105,0,0
-OpenFile7=pedo_alg_thre_det2.c,0,347,41,1231,551,26,76,19,0
-OpenFile8=adc.c,0,286,286,1530,1012,24,134,50,0
-OpenFile9=task_misc.c,0,308,308,1552,1034,16,137,29,0
-OpenFile10=ProjectWindow
+OpenFile5=sw.c,0,264,264,1508,990,0,105,0,0
+OpenFile6=adc.c,0,286,286,1530,1012,24,134,50,0
+OpenFile7=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile11=task_sys.c,0,330,330,1574,1056,0,172,37,0
-OpenFile12=loader.c,0,296,307,1286,923,20,214,20,0
-OpenFile13=pm.h,0,254,446,1244,1062,0,115,0,0
-OpenFile14=config.h,0,257,193,1501,919,0,22,21,0
-OpenFile15=OutputWindow
-OutputPos=0,390,856,19,1077
+OpenFile8=task_sys.c,0,330,330,1574,1056,0,172,37,0
+OpenFile9=loader.c,0,296,307,1286,923,20,214,20,0
+OpenFile10=pm.h,0,254,446,1244,1062,0,115,0,0
+OpenFile11=config.h,0,257,193,1501,919,0,22,21,0
+OpenFile12=OutputWindow
+OutputPos=0,544,1010,68,1126
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0
diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb
index b608239..aba7e5f 100644
--- a/trunk/yav_mcu_bsr.sdb
+++ b/trunk/yav_mcu_bsr.sdb
@@ -11,7 +11,7 @@ T=4ba2fdb7
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4ba33e23
+T=4ba9e8b6
 1=incs.h
 2=adc.h
 3=led.h
@@ -19,7 +19,7 @@ T=4ba33e23
 5=renge\renge.h
 6=batt_params.h
 [i2c_ctr.c]
-T=4ba33e23
+T=4ba9a43e
 1=incs.h
 2=accero.h
 [main.c]
@@ -32,13 +32,13 @@ T=4b999c7e
 6=led.h
 7=adc.h
 [magic.c]
-T=4ba3494f
+T=4ba9ee08
 1=config.h
 [WDT.c]
 T=4afd21ca
 1=incs_loader.h
 [i2c_mcu.c]
-T=4b0bae4b
+T=4ba9c16c
 1=incs.h
 2=i2c_mcu.h
 [i2c_twl.c]
@@ -56,7 +56,7 @@ T=4b4438bb
 T=4b6a6fa4
 1=incs.h
 [vreg_ctr.c]
-T=4ba33e84
+T=4ba9a2e8
 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=4b96108e
+T=4ba9efb9
 1=incs.h
 2=adc.h
 3=pm.h
@@ -92,7 +92,7 @@ T=4b8f1c98
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
-T=4b6fb909
+T=4ba9a066
 1=incs_loader.h
 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 3=fsl_user.h
@@ -116,7 +116,7 @@ T=4b95d5a4
 3=pm.h
 4=accero.h
 [task_misc.c]
-T=4ba33f3a
+T=4ba9e8b6
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -124,7 +124,7 @@ T=4ba33f3a
 5=adc.h
 6=i2c_mcu.h
 [task_sys.c]
-T=4b9dbbcc
+T=4ba9e3a5
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -155,7 +155,7 @@ T=4b25f1a9
 T=4b90c1b8
 1=config.h
 [user_define.h]
-T=4ba3126b
+T=4ba9e8b6
 [config.h]
 T=4ba3494e
 [bsr_system.h]
@@ -167,7 +167,7 @@ T=4b32c168
 [renge\renge_defs.h]
 T=4b90c2bc
 [renge\renge_task_immediate.h]
-T=4b42ee65
+T=4ba9a2e8
 1=renge\renge_defs.h
 [vreg_ctr.h]
 T=4ba3395f
@@ -184,13 +184,13 @@ T=4afd21cb
 [fsl_user.h]
 T=4afd21cb
 [i2c_ctr.h]
-T=4afd21cb
+T=4ba9a39e
 [pm.h]
 T=4ba1e3ed
 [rtc.h]
 T=4b6a6fa4
 [adc.h]
-T=4b96108e
+T=4ba9e8b6
 1=jhl_defs.h
 [led.h]
 T=4b4438a1