Revert "Add model name extension for 1p5"

This reverts commit 8ebc5b2.
hello · Nov 3, 2016 · 09b0cb6 · 09b0cb6
1 parent 627513d
commit 09b0cb6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/morpheus/hble.c b/morpheus/hble.c
@@ -730,11 +730,8 @@ void hble_params_init(const char* device_name, uint64_t device_id, uint32_t _cc3
         memset(&dis_init, 0, sizeof(dis_init));
 
         char mod_num[20] = {0};
-#ifdef EXT_MODEL_NUM
-        const char* ble_mode_num = EXT_MODEL_NUM BLE_MODEL_NUM;
-#else
+
         const char* ble_mode_num = BLE_MODEL_NUM;
-#endif
         memcpy(mod_num, ble_mode_num, strlen(ble_mode_num));
         uint8_t mod_num_len = strlen(ble_mode_num);
 		if(mod_num_len >= sizeof(mod_num) - 1){

diff --git a/morpheusx_EVT1/platform.h b/morpheusx_EVT1/platform.h
@@ -14,7 +14,6 @@
 
 #define DEVICE_ID_SIZE        8
 
-#define EXT_MODEL_NUM "1p5 "
 
 #define configTOTAL_HEAP_SIZE 1152
 #define configLOW_MEM 128

diff --git a/pill/hble.c b/pill/hble.c
@@ -311,11 +311,7 @@ void hble_params_init(char* device_name)
         memset(&dis_init, 0, sizeof(dis_init));
 
         ble_srv_ascii_to_utf8(&dis_init.manufact_name_str, BLE_MANUFACTURER_NAME);
-#ifdef EXT_MODEL_NUM
-        ble_srv_ascii_to_utf8(&dis_init.model_num_str, EXT_MODEL_NUM BLE_MODEL_NUM);
-#else
         ble_srv_ascii_to_utf8(&dis_init.model_num_str, BLE_MODEL_NUM);
-#endif
 
         size_t device_id_len = sizeof(NRF_FICR->DEVICEID); 
 

diff --git a/pillx_DVT1/platform.h b/pillx_DVT1/platform.h
@@ -16,8 +16,6 @@
 #define PILL_ANT_TYPE HLO_ANT_DEVICE_TYPE_PILL
 #define PILL_HW_TYPE  HLO_ANT_DEVICE_TYPE_PILL1_5
 
-#define EXT_MODEL_NUM "1p5 "
-
 #define configTOTAL_HEAP_SIZE 1024
 
 /*