andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

esp32 fix

Browse Source
This commit is contained in:
Andrey Klimov
2021-06-19 01:50:42 +03:00
parent c2fead7ac5
commit 32eacaeb07
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build-flags/build_flags_esp32-wifi
View File

@@ -6,7 +6,8 @@
-DMODBUS_DISABLE -DMODBUS_DISABLE
#-DMBUS_DISABLE #-DMBUS_DISABLE
-DCOUNTER_DISABLE -DCOUNTER_DISABLE
#-DSYSLOG_ENABLE - udp errors -DSYSLOG_ENABLE
# - udp errors
-DOTA -DOTA
-DMCP23017 -DMCP23017
-DMODBUS_TX_PIN=13 -DMODBUS_TX_PIN=13

BIN
compiled/esp32-wifi/firmware.bin
View File

Binary file not shown.

19
lighthub/main.cpp
View File

@@ -259,6 +259,12 @@ bool isNotRetainingStatus() {
return (lanStatus != RETAINING_COLLECTING); return (lanStatus != RETAINING_COLLECTING);
} }
int httpHandler(Client& client, String request, long contentLength)
{
debugSerial<<request<<endl;
return -1;
}
void mqttCallback(char *topic, byte *payload, unsigned int length) { void mqttCallback(char *topic, byte *payload, unsigned int length) {
debugSerial<<F("\n[")<<topic<<F("] "); debugSerial<<F("\n[")<<topic<<F("] ");
if (!payload) return; if (!payload) return;
@@ -384,15 +390,17 @@ if (element && element->type == aJson_String) return element->valuestring;
{ {
ArduinoOTA.begin(Ethernet.localIP(), "Lighthub", "password", InternalStorage); ArduinoOTA.begin(Ethernet.localIP(), "Lighthub", "password", InternalStorage);
ArduinoOTA.setCustomHandler(httpHandler);
infoSerial<<F("OTA initialized\n"); infoSerial<<F("OTA initialized\n");
} }
#elif defined (ARDUINO_ARCH_AVR) #elif defined (ARDUINO_ARCH_AVR)
InternalStorageAVRClass flashStorage; InternalStorageAVRClass flashStorage(EEPROM_offsetJSON);
void setupOTA(void) void setupOTA(void)
{ {
ArduinoOTA.begin(Ethernet.localIP(), "Lighthub", "password", flashStorage); ArduinoOTA.begin(Ethernet.localIP(), "Lighthub", "password", flashStorage);
ArduinoOTA.setCustomHandler(httpHandler);
infoSerial<<F("OTA initialized\n"); infoSerial<<F("OTA initialized\n");
} }
@@ -402,6 +410,7 @@ if (element && element->type == aJson_String) return element->valuestring;
{ {
ArduinoOTA.begin(Ethernet.localIP(), "Lighthub", "password", flashStorage); ArduinoOTA.begin(Ethernet.localIP(), "Lighthub", "password", flashStorage);
ArduinoOTA.setCustomHandler(httpHandler);
infoSerial<<F("OTA initialized\n"); infoSerial<<F("OTA initialized\n");
} }
@@ -756,6 +765,9 @@ void ip_ready_config_loaded_connecting_to_broker() {
deviceName = getStringFromConfig(mqttArr, 0); deviceName = getStringFromConfig(mqttArr, 0);
infoSerial<<F("Device Name:")<<deviceName<<endl; infoSerial<<F("Device Name:")<<deviceName<<endl;
#ifdef OTA
ArduinoOTA.setDeviceName(deviceName);
#endif
//debugSerial<<F("N:")<<n<<endl; //debugSerial<<F("N:")<<n<<endl;
char *servername = getStringFromConfig(mqttArr, 1); char *servername = getStringFromConfig(mqttArr, 1);
@@ -1541,11 +1553,12 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) //|| defined (NRF5) #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) //|| defined (NRF5)
HTTPClient httpClient; HTTPClient httpClient;
WiFiClient wifiClient; // WiFiClient wifiClient;
String fullURI = "http://"; String fullURI = "http://";
fullURI+=configServer; fullURI+=configServer;
fullURI+=URI; fullURI+=URI;
httpClient.begin(wifiClient,fullURI); //httpClient.begin(wifiClient,fullURI);
httpClient.begin(fullURI);
int httpResponseCode = httpClient.GET(); int httpResponseCode = httpClient.GET();
if (httpResponseCode > 0) { if (httpResponseCode > 0) {
infoSerial.printf("[HTTP] GET... code: %d\n", httpResponseCode); infoSerial.printf("[HTTP] GET... code: %d\n", httpResponseCode);

2
lighthub/modules/out_uartbridge.cpp
View File

@@ -168,7 +168,7 @@ int out_UARTbridge::Poll(short cause)
uint8_t chA; uint8_t chA;
uint8_t chB; uint8_t chB;
while (MODULE_UATRBRIDGE_UARTA.available() || MODULE_UATRBRIDGE_UARTB.available()) // while (MODULE_UATRBRIDGE_UARTA.available() || MODULE_UATRBRIDGE_UARTB.available())
{ {
if (MODULE_UATRBRIDGE_UARTA.available()) if (MODULE_UATRBRIDGE_UARTA.available())