From 743083cbfe9cbe1a2c92302be7843e3a375bec39 Mon Sep 17 00:00:00 2001
From: Florian <florian@theengs.io>
Date: Mon, 6 May 2024 11:29:52 -0500
Subject: [PATCH] [ONBOARD] Use Gateway short name macro (#1943)

---
 main/User_config.h | 2 +-
 main/Zblufi.ino    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/main/User_config.h b/main/User_config.h
index d8fed4a..f6e3547 100644
--- a/main/User_config.h
+++ b/main/User_config.h
@@ -57,7 +57,7 @@
 #  define Gateway_Name "OpenMQTTGateway"
 #endif
 #ifndef Gateway_Short_Name
-#  define Gateway_Short_Name "OMG"
+#  define Gateway_Short_Name "OMG" // 3 characters maximum
 #endif
 
 #ifndef Base_Topic
diff --git a/main/Zblufi.ino b/main/Zblufi.ino
index 2d036b2..ffa9f56 100644
--- a/main/Zblufi.ino
+++ b/main/Zblufi.ino
@@ -254,8 +254,13 @@ bool startBlufi() {
   esp_blufi_btc_init();
   uint8_t mac[6];
   esp_read_mac(mac, ESP_MAC_WIFI_STA);
-  char advName[20] = {0};
-  snprintf(advName, sizeof(advName), "OMGBFI_%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+  char advName[17] = {0};
+  // Check length of Gateway_Short_Name
+  if (strlen(Gateway_Short_Name) > 3) {
+    Log.error(F("Gateway_Short_Name is too long, max 3 characters" CR));
+    return false;
+  }
+  snprintf(advName, sizeof(advName), Gateway_Short_Name "_%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
   NimBLEDevice::init(advName);
   esp_blufi_gatt_svr_init();
   ble_gatts_start();