From e3c07411cbcd7d2dd1dca9ef06b17b785e3ad070 Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Sat, 2 Dec 2023 21:06:46 +0700 Subject: [PATCH 1/5] allow preloading virtual interrupt buffer --- src/espmega_iot_core.cpp | 9 +++++++++ src/espmega_iot_core.hpp | 1 + src/user_code.hpp | 3 +++ 3 files changed, 13 insertions(+) diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index e895f15..c2267d1 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -171,6 +171,9 @@ void setup() Wire.setClock(400000); #endif io_begin(); +#ifdef VIRTUAL_INTERRUPT_PRELOAD + virtual_interrupt_preload(); +#endif eeprom_retrieve_init(); user_pre_init(); #ifdef ENABLE_INTERNAL_LCD @@ -2186,3 +2189,9 @@ bool dac_get_state(int id) } #endif + +void virtual_interrupt_preload() { + for (int i = 0; i < 16; i++) { + virtual_interupt_state[i] = ESPMega_digitalRead(virtual_interrupt_pins[i]); + } +} \ No newline at end of file diff --git a/src/espmega_iot_core.hpp b/src/espmega_iot_core.hpp index f0b63af..bf277ec 100644 --- a/src/espmega_iot_core.hpp +++ b/src/espmega_iot_core.hpp @@ -46,6 +46,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length); void virtual_interrupt_loop(); void virtual_interrupt_callback(int pin, int state); +void virtual_interrupt_preload(); void network_begin(); void mqtt_connect(); void mqtt_subscribe(); diff --git a/src/user_code.hpp b/src/user_code.hpp index 9de5311..94f92b5 100644 --- a/src/user_code.hpp +++ b/src/user_code.hpp @@ -12,6 +12,9 @@ //#define OVERCLOCK_FM //#define OVERCLOCK_FM2 +// I/O Configuration +#define VIRTUAL_INTERRUPT_PRELOAD // Preload Virtual Interrupts buffer + // Enable Software Module(s) #define ENABLE_INTERNAL_LCD #define ENABLE_IR_MODULE From 192b1468f8d7004b9e9205aaca948cedd5529cf0 Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Sun, 3 Dec 2023 00:37:24 +0700 Subject: [PATCH 2/5] publish availability --- src/espmega_iot_core.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index c2267d1..ca29b47 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -32,6 +32,7 @@ WebServer otaserver(80); #endif bool standalone = true; char MQTT_BASE_TOPIC[20]; +char AVAILABILITY_TOPIC[40]; uint8_t base_topic_length = 0; char STATE_REQUEST_TOPIC[40]; bool MQTT_USE_AUTH = false; @@ -237,6 +238,7 @@ void loop() */ void eeprom_retrieve_init() { + // EEPROM Data Retrival #ifdef ENABLE_CLIMATE_MODULE ac_mode = ESPMega_FRAM.read8(EEPROM_ADDRESS_AC_MODE); @@ -320,6 +322,8 @@ void eeprom_retrieve_init() strcat(PWM_VALUE_TOPIC, "/pwm/00/value"); memcpy(INPUTS_TOPIC, MQTT_BASE_TOPIC, 20); strcat(INPUTS_TOPIC, "/input/00"); + memcpy(AVAILABILITY_TOPIC, MQTT_BASE_TOPIC, 20); + strcat(AVAILABILITY_TOPIC, "/availability"); #ifdef ENABLE_ANALOG_MODULE memcpy(ADC_COMMAND_TOPIC, MQTT_BASE_TOPIC, 20); strcat(ADC_COMMAND_TOPIC, "/adc/00/set/state"); @@ -567,13 +571,14 @@ void mqtt_connect() Serial.print("MQTT not connected, connecting . . .\n"); lcd_send_stop_bit(); if (MQTT_USE_AUTH) - mqtt.connect(HOSTNAME, MQTT_USERNAME, MQTT_PASSWORD); + mqtt.connect(HOSTNAME, MQTT_USERNAME, MQTT_PASSWORD, AVAILABILITY_TOPIC, 0, true, "offline"); else - mqtt.connect(HOSTNAME); + mqtt.connect(HOSTNAME, AVAILABILITY_TOPIC, 0, true, "offline"); if (mqtt.connected()) { mqtt_subscribe(); Serial.print("MQTT connected\n"); + mqtt.publish(AVAILABILITY_TOPIC, "online", true); lcd_send_stop_bit(); publish_pwm_states(); publish_input_states(); From 9e2efddfc93d5071c00f2ff7ac0aed7a0a1744c5 Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Sun, 3 Dec 2023 02:34:37 +0700 Subject: [PATCH 3/5] http authentication support --- src/espmega_iot_core.cpp | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index ca29b47..3d4625d 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -38,6 +38,10 @@ char STATE_REQUEST_TOPIC[40]; bool MQTT_USE_AUTH = false; char MQTT_USERNAME[32]; char MQTT_PASSWORD[32]; +#ifdef ENABLE_WEBUI +char WEBUI_USERNAME[32]; +char WEBUI_PASSWORD[32]; +#endif uint8_t utc_offset = 7; #ifdef ENABLE_CLIMATE_MODULE float current_room_temp = 0; @@ -129,6 +133,8 @@ char DAC_VALUE_TOPIC[75]; #define EEPROM_ADDRESS_ADC_REPORT_STATE 187 // 8bytes, thru 194 #define EEPROM_ADDRESS_DAC_STATE 195 // 4bytes, thru 198 #define EEPROM_ADDRESS_DAC_VALUE 199 // 8bytes, thru 206 +#define EEPROM_ADDRESS_WEBUI_USERNAME 207 // 32bytes, thru 238 +#define EEPROM_ADDRESS_WEBUI_PASSWORD 239 // 32bytes, thru 270 char PWM_STATE_TOPIC[75]; char PWM_VALUE_TOPIC[75]; @@ -238,7 +244,10 @@ void loop() */ void eeprom_retrieve_init() { - + #ifdef ENABLE_WEBUI + ESPMega_FRAM.read(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)WEBUI_USERNAME, 32); + ESPMega_FRAM.read(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)WEBUI_PASSWORD, 32); + #endif // EEPROM Data Retrival #ifdef ENABLE_CLIMATE_MODULE ac_mode = ESPMega_FRAM.read8(EEPROM_ADDRESS_AC_MODE); @@ -365,6 +374,8 @@ void ota_begin() { otaserver.on("/", HTTP_GET, []() { + if(!otaserver.authenticate(WEBUI_USERNAME, WEBUI_PASSWORD)) + return otaserver.requestAuthentication(); otaserver.sendHeader("Connection", "close"); String otabuffer = ota_part1; otabuffer+=ota_part2_1+"Hostname"+ota_part2_2+String(HOSTNAME)+ota_part2_3; @@ -382,6 +393,8 @@ void ota_begin() otaserver.send(200, "text/html", otabuffer); }); otaserver.on("/config", HTTP_GET, []() { + if(!otaserver.authenticate(WEBUI_USERNAME, WEBUI_PASSWORD)) + return otaserver.requestAuthentication(); otaserver.sendHeader("Connection", "close"); String configbuffer = config_part1; configbuffer+=config_txt_part1+"IP Address"+config_txt_part2+"text"+config_txt_part3+"dev_ip"+config_txt_part4+"dev_ip"+config_txt_part5+IP.toString()+config_txt_part6; @@ -395,11 +408,15 @@ void ota_begin() configbuffer+=config_txt_part1+"BMS Server - Username"+config_txt_part2+"text"+config_txt_part3+"bms_username"+config_txt_part4+"bms_username"+config_txt_part5+String(MQTT_USERNAME)+config_txt_part6; configbuffer+=config_txt_part1+"BMS Server - Password"+config_txt_part2+"password"+config_txt_part3+"bms_password"+config_txt_part4+"bms_password"+config_txt_part5+String(MQTT_PASSWORD)+config_txt_part6; configbuffer+=config_txt_part1+"BMS Server - Endpoint"+config_txt_part2+"text"+config_txt_part3+"bms_endpoint"+config_txt_part4+"bms_endpoint"+config_txt_part5+String(MQTT_BASE_TOPIC)+config_txt_part6; + configbuffer+=config_txt_part1+"WebUI Username"+config_txt_part2+"text"+config_txt_part3+"webui_username"+config_txt_part4+"webui_username"+config_txt_part5+String(WEBUI_USERNAME)+config_txt_part6; + configbuffer+=config_txt_part1+"WebUI Password"+config_txt_part2+"password"+config_txt_part3+"webui_password"+config_txt_part4+"webui_password"+config_txt_part5+String(WEBUI_PASSWORD)+config_txt_part6; configbuffer+=config_part2; otaserver.send(200, "text/html", configbuffer); }); otaserver.on("/save_config", HTTP_GET, []() { + if(!otaserver.authenticate(WEBUI_USERNAME, WEBUI_PASSWORD)) + return otaserver.requestAuthentication(); otaserver.sendHeader("Connection", "close"); String configbuffer = "Configuration Saved. Rebooting . . ."; otaserver.send(200, "text/html", configbuffer); @@ -432,6 +449,10 @@ void ota_begin() } else if(!arg.compareTo("bms_useauth")) { if(!value.compareTo("yes")) use_auth = true; + } else if(!arg.compareTo("webui_username")) { + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)value.c_str(), value.length()); + } else if(!arg.compareTo("webui_password")) { + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)value.c_str(), value.length()); } } set_mqtt_useauth(use_auth); @@ -442,6 +463,8 @@ void ota_begin() otaserver.on( "/update", HTTP_POST, []() { + if(!otaserver.authenticate(WEBUI_USERNAME, WEBUI_PASSWORD)) + return otaserver.requestAuthentication(); otaserver.sendHeader("Connection", "close"); otaserver.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK"); ESP.restart(); }, @@ -1789,6 +1812,18 @@ void set_mqtt_useauth(bool use_auth) ESPMega_FRAM.write8(EEPROM_ADDRESS_MQTT_USEAUTH, MQTT_USE_AUTH); } +void set_webui_username(String username) +{ + username.toCharArray(WEBUI_USERNAME, 32); + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)WEBUI_USERNAME, 32); +} + +void set_webui_password(String password) +{ + password.toCharArray(WEBUI_PASSWORD, 32); + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)WEBUI_PASSWORD, 32); +} + /** * @brief Resets the device to factory default settings. * @@ -1824,6 +1859,9 @@ void factory_reset() set_ip("192.168.0.10"); set_gw("192.168.0.1"); set_netmask("255.255.255.0"); + set_webui_username("admin"); + set_webui_password("admin"); + // Reboot #ifdef ENABLE_INTERNAL_LCD lcd_send_stop_bit(); From dae545a63eab2895f730edc552756c26fa514364 Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Sun, 3 Dec 2023 02:37:50 +0700 Subject: [PATCH 4/5] automatically initialize new device with webui username and password --- src/espmega_iot_core.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index 3d4625d..50e1bd4 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -247,6 +247,14 @@ void eeprom_retrieve_init() #ifdef ENABLE_WEBUI ESPMega_FRAM.read(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)WEBUI_USERNAME, 32); ESPMega_FRAM.read(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)WEBUI_PASSWORD, 32); + if(strlen(WEBUI_USERNAME)==0) { + strcpy(WEBUI_USERNAME,"admin"); + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)WEBUI_USERNAME, 32); + } + if(strlen(WEBUI_PASSWORD)==0) { + strcpy(WEBUI_PASSWORD,"admin"); + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)WEBUI_PASSWORD, 32); + } #endif // EEPROM Data Retrival #ifdef ENABLE_CLIMATE_MODULE From d489126f1423e6b7265293cc954c3dd75ae03c34 Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Sun, 3 Dec 2023 14:52:04 +0700 Subject: [PATCH 5/5] add null termination when writing http auth info --- src/espmega_iot_core.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index 50e1bd4..b1d9ae8 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -458,9 +458,9 @@ void ota_begin() if(!value.compareTo("yes")) use_auth = true; } else if(!arg.compareTo("webui_username")) { - ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)value.c_str(), value.length()); + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_USERNAME, (uint8_t *)value.c_str(), value.length()+1); } else if(!arg.compareTo("webui_password")) { - ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)value.c_str(), value.length()); + ESPMega_FRAM.write(EEPROM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)value.c_str(), value.length()+1); } } set_mqtt_useauth(use_auth);