Merge pull request #510 from hello/integration

RC4
hello · Sep 19, 2016 · 4db52d5 · 4db52d5
2 parents adc8064 + 0527ce0
commit 4db52d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/common/app_info.h b/common/app_info.h
@@ -3,10 +3,10 @@
  * A place to put all common defines
  */
 //make sure the FW_VERSION_STRING fits in MorpheusCommand.top_version (16 bytes)
-#define FW_VERSION_STRING "1.5.7"
+#define FW_VERSION_STRING "1.5.8"
 
 //pill only
-#define FIRMWARE_VERSION_8BIT (57)
+#define FIRMWARE_VERSION_8BIT (58)
 
 #define BLE_SIG_COMPANY_ID 1002
 

diff --git a/pill/app.h b/pill/app.h
@@ -33,12 +33,12 @@ enum {
 
 #ifdef IMU_ENABLE_LOW_POWER
 	#define IMU_INACTIVE_FREQ    (IMU_HZ_10)
-	#define IMU_INACTIVE_WOM     (75)
+	#define IMU_INACTIVE_WOM     (60)
 	#define IMU_ACTIVE_WOM       (100)
 #else
 	#define IMU_INACTIVE_FREQ    (IMU_HZ_1)
 	//TODO arbitrarily set, may need to be changed if using this mode
-	#define IMU_INACTIVE_WOM     (75)
+	#define IMU_INACTIVE_WOM     (60)
 	#define IMU_ACTIVE_WOM       (100)
 #endif