From bf03aa5087a51aa2f9a2ed44b8c701750e89893e Mon Sep 17 00:00:00 2001
From: n2232 <n2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Thu, 24 Nov 2011 00:59:15 +0000
Subject: [PATCH] =?UTF-8?q?=E2=96=A02.13=202.10(2nup=E7=94=A8)=E3=81=8C?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E9=80=9F=E5=BA=A6=E3=82=BB=E3=83=B3=E3=82=B5?=
 =?UTF-8?q?=E3=82=92on=E3=81=AB=E3=81=99=E3=82=8B=E3=81=A0=E3=81=91?=
 =?UTF-8?q?=E3=81=A7=E6=AD=A9=E6=95=B0=E8=A8=88=E3=81=8Con=E3=81=AB?=
 =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3(=E3=82=A8=E3=83=B3?=
 =?UTF-8?q?=E3=83=90=E3=82=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@425 013db118-44a6-b54f-8bf7-843cb86687b1
---
 branches/sdk_3/accero.c | 5 +++--
 branches/sdk_3/config.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/branches/sdk_3/accero.c b/branches/sdk_3/accero.c
index 652cfd7..0ec0307 100644
--- a/branches/sdk_3/accero.c
+++ b/branches/sdk_3/accero.c
@@ -135,8 +135,9 @@ task_status_immed tski_cbk_accero(  )
                 iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, temp );
             }
         }
-        if(( system_status.pwr_state == ON )
-			||( system_status.pwr_state == SLEEP )
+        if( (( system_status.pwr_state == ON )
+			 ||( system_status.pwr_state == SLEEP ))
+            &&( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0 )
             )
         {
             pedometer();    // 歩数計
diff --git a/branches/sdk_3/config.h b/branches/sdk_3/config.h
index 1922eb6..ea3cc6f 100644
--- a/branches/sdk_3/config.h
+++ b/branches/sdk_3/config.h
@@ -3,7 +3,7 @@
 
 
 #define MCU_VER_MAJOR    0x02
-#define MCU_VER_MINOR    0x10
+#define MCU_VER_MINOR    0x13
 
 
 // デバッグ向けスイッチ