Fixing headers for gateway modules (#1554)
* Fixing red squiggles in VSCode/PlatformIO * Lint issues
This commit is contained in:
1 parent
08279baf65
commit
bf004b078b
20 files changed
+83
-34
No files matched your search
+1
-21
@@ -186,8 +186,6 @@ char mqtt_user[parameters_size + 1] = MQTT_USER; // not compulsory only if your
|
||||
char mqtt_pass[parameters_size + 1] = MQTT_PASS; // not compulsory only if your broker needs authentication
|
||||
char mqtt_server[parameters_size + 1] = MQTT_SERVER;
|
||||
char mqtt_port[6] = MQTT_PORT;
|
||||
char mqtt_topic[parameters_size + 1] = Base_Topic;
|
||||
char gateway_name[parameters_size + 1] = Gateway_Name;
|
||||
char ota_pass[parameters_size + 1] = ota_password;
|
||||
#ifdef USE_MAC_AS_GATEWAY_NAME
|
||||
# undef WifiManager_ssid
|
||||
@@ -204,24 +202,11 @@ bool connectedOnce = false; //indicate if we have been connected once to MQTT
|
||||
bool connected = false; //indicate whether we are currently connected. Used to detected re-connection
|
||||
int failure_number_ntwk = 0; // number of failure connecting to network
|
||||
int failure_number_mqtt = 0; // number of failure connecting to MQTT
|
||||
#ifdef ZmqttDiscovery
|
||||
bool disc = true; // Auto discovery with Home Assistant convention
|
||||
unsigned long lastDiscovery = 0; // Time of the last discovery to trigger automaticaly to off after DiscoveryAutoOffTimer
|
||||
#endif
|
||||
|
||||
unsigned long timer_led_measures = 0;
|
||||
static void* eClient = nullptr;
|
||||
static unsigned long last_ota_activity_millis = 0;
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
# include <vector>
|
||||
// Flags definition for white list, black list, discovery management
|
||||
# define device_flags_init 0 << 0
|
||||
# define device_flags_isDisc 1 << 0
|
||||
# define device_flags_isWhiteL 1 << 1
|
||||
# define device_flags_isBlackL 1 << 2
|
||||
# define device_flags_connect 1 << 3
|
||||
# define isWhite(device) device->isWhtL
|
||||
# define isBlack(device) device->isBlkL
|
||||
# define isDiscovered(device) device->isDisc
|
||||
|
||||
static bool mqtt_secure = MQTT_SECURE_DEFAULT;
|
||||
static bool mqtt_cert_validate = MQTT_CERT_VALIDATE_DEFAULT;
|
||||
@@ -255,9 +240,7 @@ static bool esp32EthConnected = false;
|
||||
# include <WiFiClientSecure.h>
|
||||
# include <WiFiMulti.h>
|
||||
WiFiMulti wifiMulti;
|
||||
# include <Preferences.h>
|
||||
# include <WiFiManager.h>
|
||||
Preferences preferences;
|
||||
# ifdef MDNS_SD
|
||||
# include <ESPmDNS.h>
|
||||
# endif
|
||||
@@ -284,9 +267,6 @@ ESP8266WiFiMulti wifiMulti;
|
||||
# include <Ethernet.h>
|
||||
#endif
|
||||
|
||||
#define convertTemp_CtoF(c) ((c * 1.8) + 32)
|
||||
#define convertTemp_FtoC(f) ((f - 32) * 5 / 9)
|
||||
|
||||
// client link to pubsub MQTT
|
||||
PubSubClient client;
|
||||
|
||||
|
||||
Reference in new issue
Block a user