jeans/HASPone
jeans/HASPone
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/HASPone.git synced 2025-07-27 21:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from HASwitchPlate/dev-1.01

Browse Source 
# HASPone v1.01

## New features

* Add reboot on touch while waiting for WiFi or MQTT connect

## Bug fixes

* Remove MQTT and telnet loop process while handling Nextion ACKs
* Prevent writes to EEPROM on WiFi init
This commit is contained in:
Allen Derusha 2021-04-01 08:07:07 -04:00 committed by GitHub
commit 9b320d09b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
View File

@ -62,7 +62,7 @@ char nextionBaud[7] = "115200";
#include <SoftwareSerial.h> #include <SoftwareSerial.h>
#include <ESP8266Ping.h> #include <ESP8266Ping.h>
const float haspVersion = 1.00; // Current HASP software release version const float haspVersion = 1.01; // Current HASP software release version
const uint16_t mqttMaxPacketSize = 2048; // Size of buffer for incoming MQTT message const uint16_t mqttMaxPacketSize = 2048; // Size of buffer for incoming MQTT message
byte nextionReturnBuffer[128]; // Byte array to pass around data coming from the panel byte nextionReturnBuffer[128]; // Byte array to pass around data coming from the panel
uint8_t nextionReturnIndex = 0; // Index for nextionReturnBuffer uint8_t nextionReturnIndex = 0; // Index for nextionReturnBuffer
@ -85,6 +85,7 @@ bool debugTelnetEnabled = false; // Enable telnet debug out
bool nextionBufferOverrun = false; // Set to true if an overrun error was encountered bool nextionBufferOverrun = false; // Set to true if an overrun error was encountered
bool nextionAckEnable = false; // Wait for each Nextion command to be acked before continuing bool nextionAckEnable = false; // Wait for each Nextion command to be acked before continuing
bool nextionAckReceived = false; // Ack was received bool nextionAckReceived = false; // Ack was received
bool rebootOnp0b1 = false; // When true, reboot device on button press ofr p[0].b[1]
const unsigned long nextionAckTimeout = 1000; // Timeout to wait for an ack before throwing error const unsigned long nextionAckTimeout = 1000; // Timeout to wait for an ack before throwing error
unsigned long nextionAckTimer = 0; // Timer to track Nextion ack unsigned long nextionAckTimer = 0; // Timer to track Nextion ack
const unsigned long telnetInputMax = 128; // Size of user input buffer for user telnet session const unsigned long telnetInputMax = 128; // Size of user input buffer for user telnet session
@ -317,7 +318,7 @@ void mqttConnect()
static bool mqttFirstConnect = true; // For the first connection, we want to send an OFF/ON state to static bool mqttFirstConnect = true; // For the first connection, we want to send an OFF/ON state to
// trigger any automations, but skip that if we reconnect while // trigger any automations, but skip that if we reconnect while
// still running the sketch // still running the sketch
rebootOnp0b1 = true;
static uint8_t mqttReconnectCount = 0; static uint8_t mqttReconnectCount = 0;
unsigned long mqttConnectTimer = 0; unsigned long mqttConnectTimer = 0;
const unsigned long mqttConnectTimeout = 5000; const unsigned long mqttConnectTimeout = 5000;
@ -513,6 +514,7 @@ void mqttConnect()
} }
} }
} }
rebootOnp0b1 = false;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -811,9 +813,6 @@ void nextionHandleInput()
nextionAckReceived = true; nextionAckReceived = true;
nextionProcessInput(); nextionProcessInput();
} }
webServer.handleClient(); // webServer loop
telnetHandleClient(); // telnet client loop
yield(); yield();
} }
if (millis() > handlerTimeout) if (millis() > handlerTimeout)
@ -1059,13 +1058,17 @@ void nextionProcessInput()
mqttClient.publish(mqttStateJSONTopic, mqttButtonJSONEvent); mqttClient.publish(mqttStateJSONTopic, mqttButtonJSONEvent);
debugPrintln(String(F("MQTT OUT: '")) + mqttStateJSONTopic + String(F("' : '")) + mqttButtonJSONEvent + String(F("'"))); debugPrintln(String(F("MQTT OUT: '")) + mqttStateJSONTopic + String(F("' : '")) + mqttButtonJSONEvent + String(F("'")));
} }
if (beepEnabled) if (beepEnabled)
{ {
beepOnTime = 500; beepOnTime = 500;
beepOffTime = 100; beepOffTime = 100;
beepCounter = 1; beepCounter = 1;
} }
if (rebootOnp0b1 && (nextionPage == "0") && (nextionButtonID == "1"))
{
debugPrintln(String(F("HMI IN: p[0].b[1] pressed during HASP configuration, rebooting.")));
espReset();
}
} }
if (nextionButtonAction == 0x00) if (nextionButtonAction == 0x00)
{ {
@ -1767,6 +1770,7 @@ void nextionUpdateProgress(const unsigned int &progress, const unsigned int &tot
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void espWifiConnect() void espWifiConnect()
{ // Connect to WiFi { // Connect to WiFi
rebootOnp0b1 = true;
nextionSetAttr("p[0].b[1].font", "6"); nextionSetAttr("p[0].b[1].font", "6");
if (lcdVersion < 1 || lcdVersion > 2) if (lcdVersion < 1 || lcdVersion > 2)
@ -1789,7 +1793,7 @@ void espWifiConnect()
nextionSetAttr("p[0].b[1].txt", "\"WiFi Connecting...\\r " + String(WiFi.SSID()) + "\""); nextionSetAttr("p[0].b[1].txt", "\"WiFi Connecting...\\r " + String(WiFi.SSID()) + "\"");
unsigned long connectTimer = millis() + 5000; unsigned long connectTimer = millis() + 5000;
debugPrintln(String(F("WIFI: Connecting to previously-saved SSID: ")) + String(WiFi.SSID())); debugPrintln(String(F("WIFI: Connecting to previously-saved SSID: ")) + String(WiFi.SSID()));
WiFi.begin(WiFi.SSID(), WiFi.psk()); WiFi.begin();
while ((WiFi.status() != WL_CONNECTED) && (millis() < connectTimer)) while ((WiFi.status() != WL_CONNECTED) && (millis() < connectTimer))
{ {
yield(); yield();
@ -1806,7 +1810,7 @@ void espWifiConnect()
delay(100); delay(100);
WiFi.mode(WIFI_STA); // toggle it back on again WiFi.mode(WIFI_STA); // toggle it back on again
connectTimer = millis() + connectTime; connectTimer = millis() + connectTime;
WiFi.begin(WiFi.SSID(), WiFi.psk()); WiFi.begin();
while ((WiFi.status() != WL_CONNECTED) && (millis() < connectTimer)) while ((WiFi.status() != WL_CONNECTED) && (millis() < connectTimer))
{ {
yield(); yield();
@ -1924,6 +1928,8 @@ void espWifiConnect()
{ {
nextionSendCmd("page " + String(nextionActivePage)); nextionSendCmd("page " + String(nextionActivePage));
} }
rebootOnp0b1 = false;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -3301,7 +3307,7 @@ bool updateCheck()
{ // firmware update check { // firmware update check
WiFiClientSecure wifiUpdateClientSecure; WiFiClientSecure wifiUpdateClientSecure;
HTTPClient updateClient; HTTPClient updateClient;
debugPrintln(String(F("UPDATE: Checking update URL: ")) + String(UPDATE_URL)); debugPrintln(String(F("UPDATE: Checking update URL: ")) + FPSTR(UPDATE_URL));
wifiUpdateClientSecure.setInsecure(); wifiUpdateClientSecure.setInsecure();
wifiUpdateClientSecure.setBufferSizes(512, 512); wifiUpdateClientSecure.setBufferSizes(512, 512);