From 8b204f291106da11f84743fd6f57111823dc724a Mon Sep 17 00:00:00 2001
From: Florian <florian@theengs.io>
Date: Wed, 6 Dec 2023 10:56:05 -0600
Subject: [PATCH] [SYS] Fix default adjustable setting when not using discovery
 and boolean init (#1825)

---
 docs/use/gateway.md         |  2 +-
 main/User_config.h          |  4 ++--
 main/ZactuatorONOFF.ino     |  2 ++
 main/ZgatewayBLEConnect.ino |  1 -
 main/main.ino               | 25 +++++++++++++------------
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/docs/use/gateway.md b/docs/use/gateway.md
index 39b3aa4..1204770 100644
--- a/docs/use/gateway.md
+++ b/docs/use/gateway.md
@@ -203,7 +203,7 @@ The pre-built binaries for **rfbridge** and **avatto-bakeey-ir** have the above
 
 ## Change the LED indicator brightness
 
-Minimum: 0, Maximum: 255, Default defined by DEAULT_ADJ_BRIGHTNESS
+Minimum: 0, Maximum: 255, Default defined by DEFAULT_ADJ_BRIGHTNESS
 
 `mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"brightness":200}'`
 
diff --git a/main/User_config.h b/main/User_config.h
index 107f4a1..97c8826 100644
--- a/main/User_config.h
+++ b/main/User_config.h
@@ -521,8 +521,8 @@ Adafruit_NeoPixel leds2(ANEOPIX_IND_NUM_LEDS, ANEOPIX_IND_DATA_GPIO2, ANEOPIX_IN
 #  ifndef ANEOPIX_BRIGHTNESS
 #    define ANEOPIX_BRIGHTNESS 20 // Set Default maximum RGB brightness to approx 10% (0-255 scale)
 #  endif
-#  ifndef DEAULT_ADJ_BRIGHTNESS
-#    define DEAULT_ADJ_BRIGHTNESS 255 // Set Default RGB adjustable brightness
+#  ifndef DEFAULT_ADJ_BRIGHTNESS
+#    define DEFAULT_ADJ_BRIGHTNESS 255 // Set Default RGB adjustable brightness
 #  endif
 #  ifndef ANEOPIX_COLOR_SCHEME // allow for different color combinations
 #    define ANEOPIX_COLOR_SCHEME 0
diff --git a/main/ZactuatorONOFF.ino b/main/ZactuatorONOFF.ino
index 540c2fe..97886f8 100644
--- a/main/ZactuatorONOFF.ino
+++ b/main/ZactuatorONOFF.ino
@@ -289,6 +289,8 @@ void ActuatorTrigger() {
   StaticJsonDocument<64> jsonBuffer;
   JsonObject ONOFFdata = jsonBuffer.to<JsonObject>();
   ONOFFdata["cmd"] = (int)level;
+  ONOFFdata["origin"] = subjectGTWONOFFtoMQTT;
+  handleJsonEnqueue(ONOFFdata, QueueSemaphoreTimeOutTask);
 #  ifdef ESP32
   if (ONOFFConfig.useLastStateOnStart) {
     ONOFFdata["save"] = true;
diff --git a/main/ZgatewayBLEConnect.ino b/main/ZgatewayBLEConnect.ino
index 52a24bf..50d878b 100644
--- a/main/ZgatewayBLEConnect.ino
+++ b/main/ZgatewayBLEConnect.ino
@@ -6,7 +6,6 @@
 #    include "ZgatewayBLEConnect.h"
 #    define convertTemp_CtoF(c) ((c * 1.8) + 32)
 
-extern bool BTProcessLock;
 extern std::vector<BLEdevice*> devices;
 
 NimBLERemoteCharacteristic* zBLEConnect::getCharacteristic(const NimBLEUUID& service,
diff --git a/main/main.ino b/main/main.ino
index b0db9fa..0b62e7d 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -801,26 +801,25 @@ void delayWithOTA(long waitMillis) {
 #endif
 }
 
-#ifdef ZmqttDiscovery
 void SYSConfig_init() {
+#ifdef ZmqttDiscovery
   SYSConfig.discovery = true;
   SYSConfig.ohdiscovery = OpenHABDiscovery;
-#  ifdef RGB_INDICATORS
-  SYSConfig.rgbbrightness = DEAULT_ADJ_BRIGHTNESS;
-#  endif
+#endif
+#ifdef RGB_INDICATORS
+  SYSConfig.rgbbrightness = DEFAULT_ADJ_BRIGHTNESS;
+#endif
 }
 
 void SYSConfig_fromJson(JsonObject& SYSdata) {
+#ifdef ZmqttDiscovery
   Config_update(SYSdata, "disc", SYSConfig.discovery);
   Config_update(SYSdata, "ohdisc", SYSConfig.ohdiscovery);
-#  ifdef RGB_INDICATORS
-  Config_update(SYSdata, "rgbb", SYSConfig.rgbbrightness);
-#  endif
-}
-#else
-void SYSConfig_init() {}
-void SYSConfig_fromJson(JsonObject& SYSdata) {}
 #endif
+#ifdef RGB_INDICATORS
+  Config_update(SYSdata, "rgbb", SYSConfig.rgbbrightness);
+#endif
+}
 
 #if defined(ESP32)
 void SYSConfig_load() {
@@ -2699,7 +2698,9 @@ bool checkForUpdates() {
 }
 
 #    else
-bool checkForUpdates() {}
+bool checkForUpdates() {
+  return false;
+}
 #    endif
 #  elif ESP8266
 #    include <ESP8266httpUpdate.h>