From 34ca47d104af1f37784e670b22536fd21a3472f2 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Thu, 7 May 2020 00:35:49 +0200 Subject: [PATCH] Add check HASP_USE_* > 0 --- src/hasp.h | 2 +- src/hasp_config.cpp | 20 ++++++++++---------- src/hasp_debug.cpp | 12 ++++++------ src/hasp_dispatch.cpp | 4 ++-- src/hasp_gui.cpp | 6 +++--- src/hasp_mdns.cpp | 4 ++-- src/hasp_ota.cpp | 4 ++-- src/main.cpp | 40 ++++++++++++++++++++-------------------- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/hasp.h b/src/hasp.h index 169871a9..74d7a40d 100644 --- a/src/hasp.h +++ b/src/hasp.h @@ -19,7 +19,7 @@ extern "C" { * INCLUDES *********************/ -#if HASP_USE_APP +#if HASP_USE_APP>0 /********************* * DEFINES diff --git a/src/hasp_config.cpp b/src/hasp_config.cpp index 70fc0d50..c2da806a 100644 --- a/src/hasp_config.cpp +++ b/src/hasp_config.cpp @@ -199,7 +199,7 @@ void configWriteConfig() bool writefile = false; bool changed = false; -#if HASP_USE_WIFI +#if HASP_USE_WIFI>0 if(settings[F("wifi")].as().isNull()) settings.createNestedObject(F("wifi")); changed = wifiGetConfig(settings[F("wifi")]); if(changed) { @@ -207,7 +207,7 @@ void configWriteConfig() writefile = true; } #endif -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 if(settings[F("mqtt")].as().isNull()) settings.createNestedObject(F("mqtt")); changed = mqttGetConfig(settings[F("mqtt")]); if(changed) { @@ -216,7 +216,7 @@ void configWriteConfig() writefile = true; } #endif -#if HASP_USE_TELNET +#if HASP_USE_TELNET>0 if(settings[F("telnet")].as().isNull()) settings.createNestedObject(F("telnet")); changed = telnetGetConfig(settings[F("telnet")]); if(changed) { @@ -225,7 +225,7 @@ void configWriteConfig() writefile = true; } #endif -#if HASP_USE_MDNS +#if HASP_USE_MDNS>0 if(settings[F("mdns")].as().isNull()) settings.createNestedObject(F("mdns")); changed = mdnsGetConfig(settings[F("mdns")]); if(changed) { @@ -233,7 +233,7 @@ void configWriteConfig() writefile = true; } #endif -#if HASP_USE_HTTP +#if HASP_USE_HTTP>0 if(settings[F("http")].as().isNull()) settings.createNestedObject(F("http")); changed = httpGetConfig(settings[F("http")]); if(changed) { @@ -348,23 +348,23 @@ void configSetup() haspSetConfig(settings[F("hasp")]); // otaGetConfig(settings[F("ota")]); -#if HASP_USE_WIFI +#if HASP_USE_WIFI>0 Log.verbose(F("Loading WiFi settings")); wifiSetConfig(settings[F("wifi")]); #endif -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 Log.verbose(F("Loading MQTT settings")); mqttSetConfig(settings[F("mqtt")]); #endif -#if HASP_USE_TELNET +#if HASP_USE_TELNET>0 Log.verbose(F("Loading Telnet settings")); telnetSetConfig(settings[F("telnet")]); #endif -#if HASP_USE_MDNS +#if HASP_USE_MDNS>0 Log.verbose(F("Loading MDNS settings")); mdnsSetConfig(settings[F("mdns")]); #endif -#if HASP_USE_HTTP +#if HASP_USE_HTTP>0 Log.verbose(F("Loading HTTP settings")); httpSetConfig(settings[F("http")]); #endif diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index 61ccf0cf..38033453 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -31,11 +31,11 @@ #define SERIAL_SPEED 115200 #endif -#if HASP_USE_TELNET != 0 +#if HASP_USE_TELNET > 0 #include "hasp_telnet.h" #endif -#if HASP_USE_SYSLOG != 0 +#if HASP_USE_SYSLOG > 0 #include "Syslog.h" #ifndef SYSLOG_SERVER @@ -122,7 +122,7 @@ void debugStart() // log/logf method) } -#if HASP_USE_SYSLOG != 0 +#if HASP_USE_SYSLOG > 0 void syslogSend(uint8_t priority, const char * debugText) { if(strlen(debugSyslogHost) != 0 && WiFi.isConnected()) { @@ -133,7 +133,7 @@ void syslogSend(uint8_t priority, const char * debugText) void debugSetup() { -#if HASP_USE_SYSLOG != 0 +#if HASP_USE_SYSLOG > 0 syslog = new Syslog(syslogClient, debugSyslogProtocol == 0 ? SYSLOG_PROTO_IETF : SYSLOG_PROTO_BSD); syslog->server(debugSyslogHost, debugSyslogPort); syslog->deviceHostname(mqttNodeName); @@ -158,7 +158,7 @@ bool debugGetConfig(const JsonObject & settings) if(debugTelePeriod != settings[FPSTR(F_DEBUG_TELEPERIOD)].as()) changed = true; settings[FPSTR(F_DEBUG_TELEPERIOD)] = debugTelePeriod; -#if HASP_USE_SYSLOG != 0 +#if HASP_USE_SYSLOG > 0 if(strcmp(debugSyslogHost, settings[FPSTR(F_CONFIG_HOST)].as().c_str()) != 0) changed = true; settings[FPSTR(F_CONFIG_HOST)] = debugSyslogHost; @@ -196,7 +196,7 @@ bool debugSetConfig(const JsonObject & settings) changed |= configSet(debugTelePeriod, settings[FPSTR(F_DEBUG_TELEPERIOD)], PSTR("debugTelePeriod")); /* Syslog Settings*/ -#if HASP_USE_SYSLOG != 0 +#if HASP_USE_SYSLOG > 0 if(!settings[FPSTR(F_CONFIG_HOST)].isNull()) { changed |= strcmp(debugSyslogHost, settings[FPSTR(F_CONFIG_HOST)]) != 0; strncpy(debugSyslogHost, settings[FPSTR(F_CONFIG_HOST)], sizeof(debugSyslogHost)); diff --git a/src/hasp_dispatch.cpp b/src/hasp_dispatch.cpp index 38a2d271..80e44a46 100644 --- a/src/hasp_dispatch.cpp +++ b/src/hasp_dispatch.cpp @@ -38,7 +38,7 @@ void dispatchLoop() void dispatchStatusUpdate() { -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 mqtt_send_statusupdate(); #endif } @@ -308,7 +308,7 @@ void dispatch_button(uint8_t id, const char * event) #else Log.notice(F("OUT: input%d = %s"), id, event); #endif -#if HASP_USE_TASMOTA_SLAVE +#if HASP_USE_TASMOTA_SLAVE>0 slave_send_input(id, event); #endif } diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp index 917af85a..7c33af36 100644 --- a/src/hasp_gui.cpp +++ b/src/hasp_gui.cpp @@ -18,7 +18,7 @@ //#include "lv_ex_conf.h" //#include "tpcal.h" -#if HASP_USE_PNGDECODE +#if HASP_USE_PNGDECODE > 0 #include "png_decoder.h" #endif @@ -26,7 +26,7 @@ #define TOUCH_DRIVER 0 #endif -#if HASP_USE_SPIFFS +#if HASP_USE_SPIFFS > 0 #if defined(ARDUINO_ARCH_ESP32) #include "SPIFFS.h" #endif @@ -664,7 +664,7 @@ void guiSetup() #endif /* Initialize PNG decoder */ -#if HASP_USE_PNGDECODE != 0 +#if HASP_USE_PNGDECODE > 0 png_decoder_init(); #endif diff --git a/src/hasp_mdns.cpp b/src/hasp_mdns.cpp index 7beb2941..c6613820 100644 --- a/src/hasp_mdns.cpp +++ b/src/hasp_mdns.cpp @@ -13,10 +13,10 @@ #include "hasp_config.h" #include "hasp_conf.h" -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 #include "hasp_mqtt.h" #endif -#if HASP_USE_MDNS +#if HASP_USE_MDNS>0 #include "hasp_mdns.h" #endif diff --git a/src/hasp_ota.cpp b/src/hasp_ota.cpp index 188fbcc0..cc7a3fca 100644 --- a/src/hasp_ota.cpp +++ b/src/hasp_ota.cpp @@ -10,11 +10,11 @@ #include "hasp_conf.h" -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 #include "hasp_mqtt.h" #endif -#if HASP_USE_MDNS +#if HASP_USE_MDNS>0 #include "hasp_mdns.h" #endif diff --git a/src/main.cpp b/src/main.cpp index 6dbea96c..229159a8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,15 +21,15 @@ void setup() ***************************/ /* Init Storage */ -#if HASP_USE_EEPROM +#if HASP_USE_EEPROM>0 eepromSetup(); // Don't start at boot, only at write #endif -#if HASP_USE_SPIFFS +#if HASP_USE_SPIFFS>0 spiffsSetup(); #endif -#if HASP_USE_SDCARD +#if HASP_USE_SDCARD>0 sdcardSetup(); #endif @@ -43,11 +43,11 @@ void setup() ***************************/ debugSetup(); -#if HASP_USE_GPIO +#if HASP_USE_GPIO>0 gpioSetup(); #endif -#if HASP_USE_WIFI +#if HASP_USE_WIFI>0 wifiSetup(); #endif @@ -55,11 +55,11 @@ void setup() oobeSetup(); haspSetup(); -#if HASP_USE_MDNS +#if HASP_USE_MDNS>0 mdnsSetup(); #endif -#if HASP_USE_OTA +#if HASP_USE_OTA>0 otaSetup(); #endif @@ -67,11 +67,11 @@ void setup() ethernetSetup(); #endif -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 mqttSetup(); #endif -#if HASP_USE_HTTP +#if HASP_USE_HTTP>0 httpSetup(); #endif @@ -79,7 +79,7 @@ void setup() telnetSetup(); #endif -#if HASP_USE_TASMOTA_SLAVE +#if HASP_USE_TASMOTA_SLAVE>0 slaveSetup(); #endif @@ -90,15 +90,15 @@ void loop() { /* Storage Loops */ /* - #if HASP_USE_EEPROM + #if HASP_USE_EEPROM>0 // eepromLoop(); // Not used #endif - #if HASP_USE_SPIFFS + #if HASP_USE_SPIFFS>0 // spiffsLoop(); // Not used #endif - #if HASP_USE_SDCARD + #if HASP_USE_SDCARD>0 // sdcardLoop(); // Not used #endif @@ -112,7 +112,7 @@ void loop() // haspLoop(); debugLoop(); -#if HASP_USE_GPIO +#if HASP_USE_GPIO>0 gpioLoop(); #endif @@ -121,19 +121,19 @@ void loop() ethernetLoop(); #endif -#if HASP_USE_MQTT +#if HASP_USE_MQTT>0 mqttLoop(); #endif // MQTT -#if HASP_USE_HTTP +#if HASP_USE_HTTP>0 httpLoop(); #endif // HTTP -#if HASP_USE_MDNS +#if HASP_USE_MDNS>0 mdnsLoop(); #endif // MDNS -#if HASP_USE_OTA +#if HASP_USE_OTA>0 otaLoop(); #endif // OTA @@ -141,7 +141,7 @@ void loop() telnetLoop(); #endif // TELNET -#if HASP_USE_TASMOTA_SLAVE +#if HASP_USE_TASMOTA_SLAVE>0 slaveLoop(); #endif // TASMOTASLAVE @@ -150,7 +150,7 @@ void loop() /* Timer Loop */ if(millis() - mainLastLoopTime >= 1000) { /* Run Every Second */ -#if HASP_USE_OTA +#if HASP_USE_OTA>0 otaEverySecond(); #endif debugEverySecond();