Merge pull request #531 from hello/integration

Integration
hello · Nov 18, 2016 · 32aee86 · 32aee86
2 parents 09b0cb6 + b090be9
commit 32aee86
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.7.4"
+#define FW_VERSION_STRING "1.8.0"
 
 //pill only
-#define FIRMWARE_VERSION_8BIT (0x49)
+#define FIRMWARE_VERSION_8BIT (0x50)
 
 #define BLE_SIG_COMPANY_ID 1002
 

diff --git a/morpheusx_EVT1/platform.h b/morpheusx_EVT1/platform.h
@@ -38,7 +38,7 @@ enum {
 
     SSPI_INT = 24,
 };
-
+/*  Removed for MP
 #define PLATFORM_HAS_ACCEL_SPI
 
 enum{
@@ -48,7 +48,7 @@ enum{
 	ACCEL_MISO = 10,
 	ACCEL_INT = 29,
 };
-
+*/
 #define PLATFORM_HAS_SERIAL_CROSS_CONNECT
 
 enum {