jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-18 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small changes

Browse Source
This commit is contained in:
fvanroie 2020-12-10 22:43:53 +01:00
parent 1a435fd094
commit e5e118575d
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hasp_gpio.cpp
View File

@ -379,13 +379,14 @@ bool gpioIsSystemPin(uint8_t gpio)
} // if tft_espi pins } // if tft_espi pins
// To-do: // To-do:
// Backlight GPIO
// Network GPIOs // Network GPIOs
// Serial GPIOs // Serial GPIOs
// Tasmota Slave GPIOs // Tasmota Slave GPIOs
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
if(psramFound()) { if(psramFound()) {
if((gpio >= 16) && (gpio <= 17)) return true; // PSRAM if((gpio == 16) || (gpio == 17)) return true; // PSRAM
} }
#endif #endif

5
src/hasp_mqtt.cpp
View File

@ -334,6 +334,7 @@ void mqttStart()
bool mqttFirstConnect = true; bool mqttFirstConnect = true;
mqttClient.setServer(mqttServer, 1883); mqttClient.setServer(mqttServer, 1883);
// mqttClient.setSocketTimeout(10); //in seconds
/* Construct unique Client ID*/ /* Construct unique Client ID*/
{ {
@ -348,6 +349,8 @@ void mqttStart()
snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic); // lastWillTopic snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic); // lastWillTopic
snprintf_P(lastWillPayload, sizeof(lastWillPayload), PSTR("OFF")); // lastWillPayload snprintf_P(lastWillPayload, sizeof(lastWillPayload), PSTR("OFF")); // lastWillPayload
haspProgressMsg(F("Connecting MQTT..."));
haspProgressVal(mqttReconnectCount * 5);
if(!mqttClient.connect(mqttClientId, mqttUser, mqttPassword, buffer, 2, false, lastWillPayload, true)) { if(!mqttClient.connect(mqttClientId, mqttUser, mqttPassword, buffer, 2, false, lastWillPayload, true)) {
// Retry until we give up and restart after connectTimeout seconds // Retry until we give up and restart after connectTimeout seconds
mqttReconnectCount++; mqttReconnectCount++;
@ -388,7 +391,7 @@ void mqttStart()
} }
Log.warning(TAG_MQTT, buffer); Log.warning(TAG_MQTT, buffer);
if(mqttReconnectCount > 50) { if(mqttReconnectCount > 20) {
Log.error(TAG_MQTT, F("Retry count exceeded, rebooting...")); Log.error(TAG_MQTT, F("Retry count exceeded, rebooting..."));
dispatch_reboot(false); dispatch_reboot(false);
} }

1
src/hasp_network.cpp
View File

@ -76,6 +76,7 @@ bool networkEverySecond(void)
#if HASP_USE_WIFI > 0 #if HASP_USE_WIFI > 0
// return wifiEverySecond(); // return wifiEverySecond();
#endif #endif
return true;
} }
#endif #endif