From 2dc725511714f4b7f1b53869fb12afe31fb41164 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Mon, 12 Apr 2021 03:28:13 +0200
Subject: [PATCH] Reduce build warnings

---
 include/hasp_conf.h                 |  2 +-
 src/dev/device.h                    | 12 ++++++------
 src/dev/esp32/esp32.cpp             |  4 ++--
 src/dev/esp32/esp32.h               |  4 ++--
 src/drv/tft_driver.h                | 10 +++++-----
 src/drv/tft_driver_sdl2.h           |  2 +-
 src/mqtt/hasp_mqtt.h                |  6 ++----
 src/mqtt/hasp_mqtt_pubsubclient.cpp |  4 +++-
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/hasp_conf.h b/include/hasp_conf.h
index fe34ab5d..d6f82f2f 100644
--- a/include/hasp_conf.h
+++ b/include/hasp_conf.h
@@ -253,7 +253,7 @@ static WiFiSpiClass WiFi;
 #endif
 #endif
 
-#if defined(WINDOWS) 
+#if defined(WINDOWS)
 #include <Windows.h>
 #define delay Sleep
 #endif
diff --git a/src/dev/device.h b/src/dev/device.h
index 4f6ae713..68d1867a 100644
--- a/src/dev/device.h
+++ b/src/dev/device.h
@@ -91,23 +91,23 @@ class BaseDevice {
 } // namespace dev
 
 #if defined(ESP32)
-#warning Building for ESP32 Devices
+// #warning Building for ESP32 Devices
 #include "esp32/esp32.h"
 #elif defined(ESP8266)
-#warning Building for ESP8266 Devices
+// #warning Building for ESP8266 Devices
 #include "esp8266/esp8266.h"
 #elif defined(STM32F4)
-#warning Building for STM32F4xx Devices
+// #warning Building for STM32F4xx Devices
 #include "stm32f4/stm32f4.h"
 #elif defined(WINDOWS)
-#warning Building for Win32 Devices
+// #warning Building for Win32 Devices
 #include "win32/hasp_win32.h"
 #elif defined(POSIX)
-#warning Building for Posix Devices
+// #warning Building for Posix Devices
 #include "posix/hasp_posix.h"
 
 #else
-#warning Building for Generic Devices
+// #warning Building for Generic Devices
 using dev::BaseDevice;
 extern dev::BaseDevice haspDevice;
 #endif
diff --git a/src/dev/esp32/esp32.cpp b/src/dev/esp32/esp32.cpp
index aa715f38..2dce3065 100644
--- a/src/dev/esp32/esp32.cpp
+++ b/src/dev/esp32/esp32.cpp
@@ -158,10 +158,10 @@ bool Esp32Device::is_system_pin(uint8_t pin)
 } // namespace dev
 
 #if defined(LANBONL8)
-#warning Building for Lanbon L8
+// #warning Building for Lanbon L8
 #include "dev/esp32/lanbonl8.h"
 #elif defined(M5STACK)
-#warning Building for M5Stack core2
+// #warning Building for M5Stack core2
 #include "dev/esp32/m5stackcore2.h"
 #else
 dev::Esp32Device haspDevice;
diff --git a/src/dev/esp32/esp32.h b/src/dev/esp32/esp32.h
index 76d61c34..15cbaad9 100644
--- a/src/dev/esp32/esp32.h
+++ b/src/dev/esp32/esp32.h
@@ -64,10 +64,10 @@ class Esp32Device : public BaseDevice {
 } // namespace dev
 
 #if defined(LANBONL8)
-#warning Building for Lanbon L8
+// #warning Building for Lanbon L8
 #include "lanbonl8.h"
 #elif defined(M5STACK)
-#warning Building for M5Stack core2
+// #warning Building for M5Stack core2
 #include "m5stackcore2.h"
 #else
 using dev::Esp32Device;
diff --git a/src/drv/tft_driver.h b/src/drv/tft_driver.h
index 52a25f5d..79b383d3 100644
--- a/src/drv/tft_driver.h
+++ b/src/drv/tft_driver.h
@@ -37,19 +37,19 @@ class BaseTft {
 } // namespace dev
 
 #if defined(ESP32)
-#warning Building for ESP32 Tfts
+// #warning Building for ESP32 Tfts
 #include "tft_driver_tftespi.h"
 #elif defined(ESP8266)
-#warning Building for ESP8266 Tfts
+// #warning Building for ESP8266 Tfts
 #include "tft_driver_tftespi.h"
 #elif defined(STM32F4)
-#warning Building for STM32F4xx Tfts
+// #warning Building for STM32F4xx Tfts
 #include "tft_driver_tftespi.h"
 #elif defined(WINDOWS) || defined(POSIX)
-#warning Building for SDL2
+// #warning Building for SDL2
 #include "tft_driver_sdl2.h"
 #else
-#warning Building for Generic Tfts
+// #warning Building for Generic Tfts
 using dev::BaseTft;
 extern dev::BaseTft haspTft;
 #endif
diff --git a/src/drv/tft_driver_sdl2.h b/src/drv/tft_driver_sdl2.h
index d4c453eb..eec985c1 100644
--- a/src/drv/tft_driver_sdl2.h
+++ b/src/drv/tft_driver_sdl2.h
@@ -7,7 +7,7 @@
 #include "tft_driver.h"
 
 #if defined(WINDOWS) || defined(POSIX)
-#warning Building H driver TFT SDL2
+// #warning Building H driver TFT SDL2
 
 #include "lvgl.h"
 #include "indev/mouse.h"
diff --git a/src/mqtt/hasp_mqtt.h b/src/mqtt/hasp_mqtt.h
index d109f038..29fe1434 100644
--- a/src/mqtt/hasp_mqtt.h
+++ b/src/mqtt/hasp_mqtt.h
@@ -9,20 +9,18 @@
 
 #include "hasp_conf.h"
 
-
 // #if defined(WINDOWS) || defined(POSIX)
 // #define __FlashStringHelper char
 // #endif
 
-enum hasp_mqtt_error_t {
+typedef enum {
     MQTT_ERR_OK       = 0,
     MQTT_ERR_DISABLED = -1,
     MQTT_ERR_NO_CONN  = -2,
     MQTT_ERR_SUB_FAIL = -3,
     MQTT_ERR_PUB_FAIL = -4,
     MQTT_ERR_UNKNOWN  = -128
-};
-
+} hasp_mqtt_error_t;
 
 void mqttSetup();
 void mqttLoop();
diff --git a/src/mqtt/hasp_mqtt_pubsubclient.cpp b/src/mqtt/hasp_mqtt_pubsubclient.cpp
index 791387de..e051ed51 100644
--- a/src/mqtt/hasp_mqtt_pubsubclient.cpp
+++ b/src/mqtt/hasp_mqtt_pubsubclient.cpp
@@ -116,7 +116,7 @@ bool mqttIsConnected()
     return mqttEnabled && mqttClient.connected();
 }
 
-void mqtt_send_lwt(bool online)
+bool mqtt_send_lwt(bool online)
 {
     char tmp_payload[8];
     char tmp_topic[strlen(mqttNodeTopic) + 4];
@@ -126,6 +126,8 @@ void mqtt_send_lwt(bool online)
 
     size_t len = snprintf_P(tmp_payload, sizeof(tmp_payload), online ? PSTR("online") : PSTR("offline"));
     bool res   = mqttPublish(tmp_topic, tmp_payload, len, true);
+
+    return res;
 }
 
 int mqtt_send_object_state(uint8_t pageid, uint8_t btnid, const char* payload)