Reduce build warnings

This commit is contained in:
fvanroie 2021-04-12 03:28:13 +02:00
parent fd0e5cfc57
commit 2dc7255117
8 changed files with 22 additions and 22 deletions

View File

@ -253,7 +253,7 @@ static WiFiSpiClass WiFi;
#endif
#endif
#if defined(WINDOWS)
#if defined(WINDOWS)
#include <Windows.h>
#define delay Sleep
#endif

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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"

View File

@ -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();

View File

@ -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)