Ensure retro compat

Author: nmaupu

main/gatewayBT.cpp

@@ -1141,13 +1141,22 @@ void launchBTDiscovery(bool overrideDiscovery) {
               p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM2) {
             // Discovery of sensors from which we retrieve data only by connect
             // Use device name if available, otherwise use model name
-            const char* device_name_for_discovery = (p->name[0] != '\0') ? p->name : model.c_str();
+            const char* device_name_for_discovery;
+            #ifdef ForceDeviceNameNoSuffix
+            device_name_for_discovery = (p->name[0] != '\0') ? p->name : model.c_str();
+            #endif
 
             if (p->sensorModel_id == BLEconectable::id::DT24_BLE) {
+              #ifndef ForceDeviceNameNoSuffix
+              device_name_for_discovery = "DT24-BLE";
+              #endif
               DT24Discovery(macWOdots.c_str(), device_name_for_discovery);
             }
             if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::BM2) {
               // Sensor discovery
+              #ifndef ForceDeviceNameNoSuffix
+              device_name_for_discovery = "BM2";
+              #endif
               BM2Discovery(macWOdots.c_str(), device_name_for_discovery);
               // Device tracker discovery
               String tracker_id = macWOdots + "-tracker";
@@ -1160,15 +1169,27 @@ void launchBTDiscovery(bool overrideDiscovery) {
                               stateClassNone);
             }
             if (p->sensorModel_id == BLEconectable::id::LYWSD03MMC) {
+              #ifndef ForceDeviceNameNoSuffix
+              device_name_for_discovery = "LYWSD03MMC";
+              #endif
               LYWSD03MMCDiscovery(macWOdots.c_str(), device_name_for_discovery);
             }
             if (p->sensorModel_id == BLEconectable::id::MHO_C401) {
+              #ifndef ForceDeviceNameNoSuffix
+              device_name_for_discovery = "MHO-C401";
+              #endif
               MHO_C401Discovery(macWOdots.c_str(), device_name_for_discovery);
             }
             if (p->sensorModel_id == BLEconectable::id::XMWSDJ04MMC) {
+              #ifndef ForceDeviceNameNoSuffix
+              device_name_for_discovery = "XMWSDJ04MMC";
+              #endif
               XMWSDJ04MMCDiscovery(macWOdots.c_str(), device_name_for_discovery);
             }
             if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC) {
+              #ifndef ForceDeviceNameNoSuffix
+              device_name_for_discovery = "HHCCJCY01HHCC";
+              #endif
               HHCCJCY01HHCCDiscovery(macWOdots.c_str(), device_name_for_discovery);
             }