[SYS] Shorten gateway names (#1601)

To avoid being outside of AP name max length

environments.ini

@@ -17,7 +17,7 @@ build_flags =
   '-DZgatewaySRFB="SRFB"'
   '-DLED_INFO=13'
   '-DLED_INFO_ON=0'
-  '-DGateway_Name="OpenMQTTGateway_SRFB"'
+  '-DGateway_Name="OMG_SRFB"'
   '-UMQTTsetMQTT' ;We remove this function to have sufficient FLASH available for OTA, you should also use ESPWifiManualSetup to save flash memory and have OTA working
 board_build.flash_mode = dout
 board_build.ldscript = eagle.flash.1m64.ld ;this frees more space for firmware uplad via OTA.
@@ -41,7 +41,7 @@ build_flags =
   '-DLED_INFO_ON=0'
   '-DZsensorGPIOInput="GPIOInput"'
   '-DINPUT_GPIO=0'
-  '-DGateway_Name="OpenMQTTGateway_SRFB_Direct"'
+  '-DGateway_Name="OMG_SRFB_Direct"'
 board_build.flash_mode = dout
 board_build.ldscript = eagle.flash.1m64.ld ;this frees more space for firmware uplad via OTA.
 ;extra_scripts = scripts/compressFirmware.py ;uncomment this to compress the firmware. This helps updating e.g. Sonoff RF Bridge via OTA flash by saving space for the uploaded firmware.
@@ -124,7 +124,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF="RF"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_RF"'
+  '-DGateway_Name="OMG_ESP32_RF"'
 custom_description = RF gateway using RCSwitch library
 
 [env:esp32dev-pilight]
@@ -137,7 +137,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayPilight="Pilight"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_Pilight"'
+  '-DGateway_Name="OMG_ESP32_Pilight"'
 custom_description = RF gateway using ESPilight library
 
 [env:esp32dev-pilight-cc1101]
@@ -152,7 +152,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayPilight="Pilight"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_Pilight-CC1101"'
+  '-DGateway_Name="OMG_ESP32_Pilight-CC1101"'
 custom_description = Gateway using ESPilight library only, need CC1101
 
 [env:esp32dev-somfy-cc1101]
@@ -167,7 +167,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZactuatorSomfy="Somfy"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_Somfy-CC1101"'
+  '-DGateway_Name="OMG_ESP32_Somfy-CC1101"'
 custom_description = Gateway using Somfy Remote library, need CC1101
 
 [env:esp32dev-pilight-somfy-cc1101]
@@ -184,7 +184,7 @@ build_flags =
   '-DZgatewayPilight="Pilight"'
   '-DZactuatorSomfy="Somfy"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_Pilight-Somfy-CC1101"'
+  '-DGateway_Name="OMG_ESP32_Pilight-Somfy-CC1101"'
 custom_description = Gateway using Somfy Remote and ESPilight library, need CC1101
 
 [env:esp32dev-weatherstation]
@@ -197,7 +197,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayWeatherStation="WeatherStation"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_WeatherStation"'
+  '-DGateway_Name="OMG_ESP32_WeatherStation"'
 custom_description = Gateway to retrieve weather station data Ventus W174/W132 (tested), Auriol H13726, Hama EWS 1500, Meteoscan W155/W160 using WeatherStationDataRx
 
 [env:esp32dev-gf-sun-inverter]
@@ -211,7 +211,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayGFSunInverter="GFSunInverter"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_GFSunInverter"'
+  '-DGateway_Name="OMG_ESP32_GFSunInverter"'
 custom_description = RS232 reading of GridFree Sun Inverter
 
 [env:esp32dev-ir]
@@ -224,7 +224,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayIR="IR"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_IR"'
+  '-DGateway_Name="OMG_ESP32_IR"'
 custom_description = Infrared (Emitting and receiving) using IRremoteESP8266
 
 [env:esp32dev-ble]
@@ -241,7 +241,7 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DLED_SEND_RECEIVE=2'
   '-DLED_SEND_RECEIVE_ON=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
+  '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = Regular BLE gateway with adaptive scanning activated, automatically adapts the scan parameters depending on your devices
 
 [env:esp32dev-ble-openhab]
@@ -259,7 +259,7 @@ build_flags =
   '-DLED_SEND_RECEIVE=2'
   '-DLED_SEND_RECEIVE_ON=0'
   '-DOpenHABDiscovery=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE_OH"'
+  '-DGateway_Name="OMG_ESP32_BLE_OH"'
 custom_description = BLE gateway with OpenHAB discovery and adaptive scanning activated, automatically adapts the scan parameters depending on your devices
 
 [env:esp32dev-ble-mqtt-undecoded]
@@ -276,7 +276,7 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DLED_SEND_RECEIVE=2'
   '-DLED_SEND_RECEIVE_ON=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
+  '-DGateway_Name="OMG_ESP32_BLE"'
   '-DMQTTDecodeTopic="undecoded"'
 custom_description = BLE gateway with the decoding offloaded to Theengs Gateway
 
@@ -319,7 +319,7 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DLED_SEND_RECEIVE=13'
   '-DLED_SEND_RECEIVE_ON=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_FTH_BLE"'
+  '-DGateway_Name="OMG_ESP32_FTH_BLE"'
 custom_description =  BLE Gateway
 custom_hardware = ESP32 Feather Adafruit
 
@@ -337,7 +337,7 @@ build_flags =
   '-DZgatewayBT="BT"'
   '-DLED_SEND_RECEIVE=22'
   '-DLED_SEND_RECEIVE_ON=0'
-  '-DGateway_Name="OpenMQTTGateway_LOLIN32LITE_BLE"'
+  '-DGateway_Name="OMG_LOLIN32LITE_BLE"'
 ;; Low power parameters, uncomment and fill credentials
   '-DDEFAULT_LOW_POWER_MODE=2'
 ;  '-DTimeBtwRead=155000'
@@ -368,7 +368,7 @@ build_flags =
   '-DLED_INFO=33'
   '-DLED_INFO_ON=1'
   '-DESP32_ETHERNET=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_OLM_GTWE"'
+  '-DGateway_Name="OMG_ESP32_OLM_GTWE"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = OLIMEX ESP32 Gateway
 
@@ -385,7 +385,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayBT="BT"'
   '-DESP32_ETHERNET=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_OLM_POE"'
+  '-DGateway_Name="OMG_ESP32_OLM_POE"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = OLIMEX ESP32 Gateway with POE
 
@@ -402,7 +402,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayBT="BT"'
   '-DESP32_ETHERNET=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_OLM_POE"'
+  '-DGateway_Name="OMG_ESP32_OLM_POE"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = OLIMEX ESP32 Gateway with POE and ISO
 
@@ -422,7 +422,7 @@ build_flags =
   '-DETH_PHY_ADDR=1'
   '-DETH_PHY_POWER=16'
   '-DETH_CLK_MODE=ETH_CLOCK_GPIO0_IN'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_WT32-ETH01"'
+  '-DGateway_Name="OMG_ESP32_WT32-ETH01"'
 custom_description = BLE gateway using ethernet, need to be configured through PIO
 custom_hardware = WT32
 
@@ -441,7 +441,7 @@ build_flags =
   '-DLED_INFO=33'
   '-DLED_INFO_ON=1'
   '-DTRIGGER_GPIO=34'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_OLM_GTWW"'
+  '-DGateway_Name="OMG_ESP32_OLM_GTWW"'
 custom_description = BLE gateway using wifi
 custom_hardware = OLIMEX ESP32 Gateway
 
@@ -464,7 +464,7 @@ build_flags =
   '-DTRIGGER_GPIO=35'
   '-DIR_EMITTER_GPIO=17'
   '-DDEFAULT_LOW_POWER_MODE=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_M5STICK_BLE_IR"'
+  '-DGateway_Name="OMG_ESP32_M5STICK_BLE_IR"'
 board_upload.speed = 921600
 custom_description = Expandable module with BLE gateway, display, and little IR emitter
 custom_hardware = M5Stick Grey
@@ -489,7 +489,7 @@ build_flags =
   '-DSLEEP_BUTTON=38'
   '-DINPUT_GPIO=39'
   '-DDEFAULT_LOW_POWER_MODE=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_M5STACK_BLE"'
+  '-DGateway_Name="OMG_ESP32_M5STACK_BLE"'
 board_upload.speed = 921600
 custom_description = Expandable module with BLE gateway and display
 custom_hardware = M5Stack Core
@@ -508,7 +508,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayBT="BT"'
   '-DZboardM5TOUGH="M5Tough"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_M5TOUGH_BLE"'
+  '-DGateway_Name="OMG_ESP32_M5TOUGH_BLE"'
 board_upload.speed = 921600
 custom_description = Expandable module with BLE gateway and display, suitable for outdoor
 custom_hardware = M5Tough rugged
@@ -539,7 +539,7 @@ build_flags =
   '-DIR_EMITTER_INVERTED=true'
   '-DIR_EMITTER_GPIO=9'
   '-DDEFAULT_LOW_POWER_MODE=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_M5STICK_C_BLE_IR"'
+  '-DGateway_Name="OMG_ESP32_M5STICK_C_BLE_IR"'
 board_upload.speed = 1500000
 custom_description = Expandable module with BLE gateway, display, and little IR emitter
 custom_hardware = M5Stick C
@@ -570,7 +570,7 @@ build_flags =
   '-DIR_EMITTER_INVERTED=true'
   '-DIR_EMITTER_GPIO=9'
   '-DDEFAULT_LOW_POWER_MODE=0'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_M5STICK_CP_BLE_IR"'
+  '-DGateway_Name="OMG_ESP32_M5STICK_CP_BLE_IR"'
 board_upload.speed = 1500000
 custom_description = Expandable module with BLE gateway, display, and little IR emitter
 custom_hardware = M5Stick CP
@@ -596,7 +596,7 @@ build_flags =
   '-DANEOPIX_IND_DATA_GPIO=27'
   '-DANEOPIX_IND_NUM_LEDS=25'
   '-DRGB_INDICATORS=true'
-  '-DGateway_Name="OpenMQTTGateway_ATOM_M"'
+  '-DGateway_Name="OMG_ATOM_M"'
 board_upload.speed = 1500000
 custom_description = Compact enclosure ESP32 with BLE gateway
 custom_hardware = M5 ATOM Matrix
@@ -622,7 +622,7 @@ build_flags =
   '-DANEOPIX_IND_DATA_GPIO=27'
   '-DANEOPIX_IND_NUM_LEDS=1'
   '-DRGB_INDICATORS=true'
-  '-DGateway_Name="OpenMQTTGateway_ATOM_L"'
+  '-DGateway_Name="OMG_ATOM_L"'
 board_upload.speed = 1500000
 custom_description = Compact enclosure ESP32 with BLE gateway
 custom_hardware = M5 ATOM Lite
@@ -641,7 +641,7 @@ build_flags =
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
   '-DLOG_LEVEL=LOG_LEVEL_TRACE'
-  '-DGateway_Name="OpenMQTTGateway_rtl_433_ESP"'
+  '-DGateway_Name="OMG_rtl_433_ESP"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -722,7 +722,7 @@ build_flags =
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
   '-DLOG_LEVEL=LOG_LEVEL_TRACE'
-  '-DGateway_Name="OpenMQTTGateway_rtl_433_ESP"'
+  '-DGateway_Name="OMG_rtl_433_ESP"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioCC1101="CC1101"'
@@ -763,7 +763,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
-  '-DGateway_Name="OpenMQTTGateway_heltec_rtl_433_ESP"'
+  '-DGateway_Name="OMG_heltec_rtl_433_ESP"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -793,7 +793,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DZgatewayBT="BT"'
-  '-DGateway_Name="OpenMQTTGateway_heltec_ble"'
+  '-DGateway_Name="OMG_heltec_ble"'
 ; *** ssd1306 Display Options ***
   '-DZdisplaySSD1306="HELTEC_SSD1306"'
 ;  '-DDISPLAY_IDLE_LOGO=false'
@@ -816,7 +816,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'    ; MQTT topic includes model and device
-  '-DGateway_Name="OpenMQTTGateway_lilygo_rtl_433_ESP"'
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -847,7 +847,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
 ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DZgatewayBT="BT"'
-  '-DGateway_Name="OpenMQTTGateway_lilygo_ble"'
+  '-DGateway_Name="OMG_lilygo_ble"'
 ; *** ssd1306 Display Options ***
   '-DZdisplaySSD1306="LilyGo_SSD1306"'
 ;  '-DDISPLAY_IDLE_LOGO=false'
@@ -875,7 +875,7 @@ build_flags =
   '-DZgatewayRTL_433="RTL_433"'
   '-DZgatewayPilight="Pilight"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_multi_receiver"'
+  '-DGateway_Name="OMG_multi_receiver"'
   '-DvalueAsATopic=true'  ; MQTT topic includes model and device (rtl_433) or protocol and id (RF and PiLight)
 ;  '-DDEFAULT_RECEIVER=1'  ; Default receiver to enable on startup
 ; *** RF Module Options ***
@@ -898,7 +898,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayBT="BT"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_TINYPICO_BLE"'
+  '-DGateway_Name="OMG_ESP32_TINYPICO_BLE"'
 board_build.flash_mode = dio
 custom_description = BLE gateway
 custom_hardware = ESP32 TinyPICO
@@ -914,7 +914,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayLORA="LORA"'
   '-DLORA_BAND=868E6'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_LORA"'
+  '-DGateway_Name="OMG_ESP32_LORA"'
 custom_description = LORA communication 868Mhz using arduino-LoRA
 custom_hardware= ESP32 TTGO LORA V1
 
@@ -929,7 +929,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayLORA="LORA"'
   '-DLORA_BAND=915E6'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_LORA"'
+  '-DGateway_Name="OMG_ESP32_LORA"'
 custom_description = LORA communication 915Mhz using arduino-LoRA
 custom_hardware= ESP32 TTGO LORA V1
 
@@ -949,7 +949,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayLORA="LORA"'
   '-DZgatewayBT="BT"'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE_LORA"'
+  '-DGateway_Name="OMG_ESP32_BLE_LORA"'
   '-DLED_SEND_RECEIVE=21' # T-BEAM board V0.5
 #  '-DLED_SEND_RECEIVE=14' # T-BEAM board  V0.7
 #  '-DLED_SEND_RECEIVE=4' # T-BEAM board  V1.0+
@@ -978,7 +978,7 @@ build_flags =
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayLORA="LORA"'
   '-DLORA_BAND=868E6'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_LORA"'
+  '-DGateway_Name="OMG_ESP32_LORA"'
   '-DLED_SEND_RECEIVE=25'
   '-DTimeLedON=0.1'
   '-DLED_SEND_RECEIVE_ON=1'
@@ -1006,7 +1006,7 @@ build_flags =
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayLORA="LORA"'
   '-DLORA_BAND=915E6'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_LORA"'
+  '-DGateway_Name="OMG_ESP32_LORA"'
   '-DLED_SEND_RECEIVE=25'
   '-DTimeLedON=0.1'
   '-DLED_SEND_RECEIVE_ON=1'
@@ -1110,7 +1110,7 @@ build_flags =
   '-DZsensorGPIOKeyCode="GPIOKeyCode"'
   ;'-DZgatewayWeatherStation="WeatherStation"'
   '-DsimplePublishing=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_ALL"'
+  '-DGateway_Name="OMG_ESP8266_ALL"'
   '-DESP8266_DEEP_SLEEP_IN_US=120000000'
 board_build.flash_mode = dout
 
@@ -1125,7 +1125,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZactuatorFASTLED="FASTLED"'
   '-DsimplePublishing=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_FASTLED"'
+  '-DGateway_Name="OMG_ESP8266_FASTLED"'
 board_build.flash_mode = dout
 
 [env:nodemcuv2-2g]
@@ -1138,7 +1138,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgateway2G="2G"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_2G"'
+  '-DGateway_Name="OMG_ESP8266_2G"'
 board_build.flash_mode = dout
 custom_description = SMS gateway, need A6/A7 GSM module
 
@@ -1153,7 +1153,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayIR="IR"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_IR"'
+  '-DGateway_Name="OMG_ESP8266_IR"'
 board_build.flash_mode = dout
 custom_description = Infrared gateway using IRremoteESP8266
 
@@ -1167,7 +1167,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRS232="RS232"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RS232"'
+  '-DGateway_Name="OMG_ESP8266_RS232"'
 board_build.flash_mode = dout
 custom_description = RS232 gateway
 
@@ -1189,7 +1189,7 @@ build_flags =
   '-DIR_RECEIVER_GPIO=5'
   '-UMQTTsetMQTT' ;We remove this function to have sufficient FLASH available for OTA, you should also use ESPWifiManualSetup and 'board_build.ldscript = eagle.flash.1m64.ld' to save flash memory and have OTA working
   '-UMQTT_HTTPS_FW_UPDATE' ;We remove this function to have sufficient FLASH available for OTA, you should also use ESPWifiManualSetup and 'board_build.ldscript = eagle.flash.1m64.ld' to save flash memory and have OTA working
-  '-DGateway_Name="OpenMQTTGateway_AVATTO_IR"'
+  '-DGateway_Name="OMG_AVATTO_IR"'
 board_build.flash_mode = dout
 custom_description = IR gateway bi directional
 custom_hardware = Avatto Bakey IR first version, [tutorial](https://1technophile.blogspot.com/2020/07/avatto-s06-ir-gateway-compatible-with.html)
@@ -1205,7 +1205,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF="RF"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF"'
+  '-DGateway_Name="OMG_ESP8266_RF"'
 board_build.flash_mode = dout
 custom_description = The historic RF gateway using RCSwitch library
 
@@ -1222,7 +1222,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF="RF"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF-CC1101"'
+  '-DGateway_Name="OMG_ESP8266_RF-CC1101"'
 board_build.flash_mode = dout
 custom_description = RF gateway using RCSwitch library with CC1101
 
@@ -1239,7 +1239,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZactuatorSomfy="Somfy"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_Somfy-CC1101"'
+  '-DGateway_Name="OMG_ESP8266_Somfy-CC1101"'
 board_build.flash_mode = dout
 custom_description = Somfy RF gateway using Somfy Remote library, need CC1101
 
@@ -1255,7 +1255,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF="RF"'
   '-DESPWifiManualSetup=true'
-  '-DGateway_Name="OpenMQTTGateway_TEST_MANUAL_WIFI"'
+  '-DGateway_Name="OMG_TEST_MANUAL_WIFI"'
 board_build.flash_mode = dout
 
 [env:openhab-test]
@@ -1267,7 +1267,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DOpenHABDiscovery=true'
-  '-DGateway_Name="OpenMQTTGateway_TEST_OPENHAB"'
+  '-DGateway_Name="OMG_TEST_OPENHAB"'
 board_build.flash_mode = dout
 
 [env:nodemcuv2-mqtt-fw-test]
@@ -1279,7 +1279,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DMQTT_SECURE_SELF_SIGNED'
-  '-DGateway_Name="OpenMQTTGateway_TEST_MQTT_FW"'
+  '-DGateway_Name="OMG_TEST_MQTT_FW"'
 board_build.flash_mode = dout
 
 [env:rf-wifi-gateway]
@@ -1293,7 +1293,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF="RF"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF_WIFI_GW"'
+  '-DGateway_Name="OMG_ESP8266_RF_WIFI_GW"'
   '-DRF_RECEIVER_GPIO=5'
 board_build.flash_mode = dout
 custom_description = RF gateway for USB stick using RCSwitch
@@ -1310,7 +1310,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF2="RF2"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF2"'
+  '-DGateway_Name="OMG_ESP8266_RF2"'
 board_build.flash_mode = dout
 custom_description = KAKU RF gateway using NewRemoteSwitch library
 
@@ -1327,7 +1327,7 @@ build_flags =
   ${com-esp.build_flags}
   '-DZgatewayRF2="RF2"'
   '-DZradioCC1101="CC1101"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF2-CC1101"'
+  '-DGateway_Name="OMG_ESP8266_RF2-CC1101"'
 board_build.flash_mode = dout
 custom_description = KAKU RF gateway using NewRemoteSwitch library, need CC1101
 
@@ -1342,7 +1342,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayPilight="Pilight"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_Pilight"'
+  '-DGateway_Name="OMG_ESP8266_Pilight"'
 board_build.flash_mode = dout
 custom_description = Gateway using ESPilight without the need of CC1101
 
@@ -1357,7 +1357,7 @@ lib_deps =
 build_flags =
   ${com-esp.build_flags}
   '-DZgatewayWeatherStation="WeatherStationDataRx"'
-  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF3"'
+  '-DGateway_Name="OMG_ESP8266_RF3"'
 board_build.flash_mode = dout
 custom_description = RF gateway using WeatherStationDataRx library
 
@@ -1378,7 +1378,7 @@ build_flags =
   '-DACTUATOR_ONOFF_DEFAULT=ACTUATOR_ON'
   '-DACTUATOR_BUTTON_TRIGGER_LEVEL=0'
   '-ACTUATOR_TRIGGER=true'
-  '-DGateway_Name="OpenMQTTGateway_SONOFF_RELAY"'
+  '-DGateway_Name="OMG_SONOFF_RELAY"'
 board_build.flash_mode = dout
 custom_description = Basic Sonoff wifi relay
 custom_hardware = Sonoff Basic R1, R2
@@ -1403,7 +1403,7 @@ build_flags =
   '-ACTUATOR_TRIGGER=true'
   '-DRF_RECEIVER_GPIO=4'
   '-DZgatewayRF="RF"'
-  '-DGateway_Name="OpenMQTTGateway_SONOFF_BASIC_RFR3"'
+  '-DGateway_Name="OMG_SONOFF_BASIC_RFR3"'
 board_build.flash_mode = dout
 custom_description = Wifi relay and RF receiver using RCSwitch library, [tutorial](https://1technophile.blogspot.com/2019/08/new-sonoff-rfr3-as-433tomqtt-gateway.html)
 custom_hardware = Sonoff Basic RFR3, [tutorial](https://1technophile.blogspot.com/2019/08/new-sonoff-rfr3-as-433tomqtt-gateway.html)
@@ -1458,7 +1458,7 @@ build_flags =
   ;'-DZsensorGPIOKeyCode="GPIOKeyCode"'
   '-DZmqttDiscovery="HADiscovery"'
   '-DsimplePublishing=true'
-  '-DGateway_Name="OpenMQTTGateway_ATMEGA_ALL"'
+  '-DGateway_Name="OMG_ATMEGA_ALL"'
 
 [env:uno-rf]
 platform = ${com.atmelavr_platform}
@@ -1503,7 +1503,7 @@ build_flags =
   '-DScan_duration=3000'
   '-DAttemptBLEConnect=false'
   '-DpubBLEAdvData=true'
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
+  '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = Default BLE gateway with additional servicedata, manufacturerdata and service uuid for analysing decoding issues
 
 [env:esp32s3-dev-c1-ble]
@@ -1522,7 +1522,7 @@ build_flags =
   '-DANEOPIX_IND_NUM_LEDS=1'
   '-DRGB_INDICATORS=true'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
+  '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = BLE gateway on the S3
 
 [env:esp32c3-dev-m1-ble]
@@ -1542,7 +1542,7 @@ build_flags =
   '-DANEOPIX_IND_NUM_LEDS=1'
   '-DRGB_INDICATORS=true'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
-  '-DGateway_Name="OpenMQTTGateway_ESP32_BLE"'
+  '-DGateway_Name="OMG_ESP32_BLE"'
 custom_description = BLE gateway on the C3
 
 [env:airm2m_core_esp32c3]
@@ -1560,7 +1560,7 @@ build_flags =
   '-DLED_INFO=19'
   '-DLED_SEND_RECEIVE=20'
   '-DNO_INT_TEMP_READING=true' ; Internal temperature reading not building on ESP32 C3 or S3
-  '-DGateway_Name="OpenMQTTGateway_AirM2M_Core_ESP32C3"'
+  '-DGateway_Name="OMG_AirM2M_Core_ESP32C3"'
 custom_description = BLE gateway on the C3
 custom_hardware = AirM2M ESP32C3-CORE
 
@@ -1619,7 +1619,7 @@ build_flags =
 ; The momentary switch on the board is connected to GPIO9
   '-DTRIGGER_GPIO=9'
   '-DNO_INT_TEMP_READING=true' ; No internal temperature on ESP32 C3 or S3
-  '-DGateway_Name="OpenMQTTGateway_ESP32C3_BLE"'
+  '-DGateway_Name="OMG_ESP32C3_BLE"'
 ; Serial output currently causes a delay on each message, if no serial listener is connected.
 ; As a default we disable serial output. Use the _with_serial environment if you
 ; need serial output for debugging purposes.
@@ -1654,7 +1654,7 @@ build_flags =
   '-DLED_SEND_RECEIVE=2'
   '-DLED_SEND_RECEIVE_ON=0'
   '-DpubBLEServiceUUID=true'
-  '-DGateway_Name="OpenMQTTGateway_THINGPULSE_BLE"'
+  '-DGateway_Name="OMG_THINGPULSE_BLE"'
   '-DANEOPIX_IND_DATA_GPIO=32'
   '-DANEOPIX_IND_NUM_LEDS=4'
   '-DANEOPIX_INFO_LED=0'
@@ -1682,7 +1682,7 @@ build_flags =
   '-DLED_SEND_RECEIVE=2'
   '-DLED_SEND_RECEIVE_ON=0'
   '-DpubBLEServiceUUID=true'
-  '-DGateway_Name="OpenMQTTGateway_THINGPULSE_ETH_BLE"'
+  '-DGateway_Name="OMG_THINGPULSE_ETH_BLE"'
   '-DESP32_ETHERNET=true'
   '-DETH_PHY_TYPE=ETH_PHY_LAN8720'
   '-DETH_PHY_ADDR=0'