From 2aa2564078d796348e560058580c171975729e35 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 31 Oct 2022 11:11:50 +0100 Subject: [PATCH] version 3.5.0b8, Changelog, remove some F() --- CHANGELOG_LATEST.md | 5 ++++- lib/framework/MqttSettingsService.cpp | 12 ++++++------ lib/framework/NTPSettingsService.cpp | 8 ++++---- lib/framework/OTASettingsService.cpp | 10 +++++----- mock-api/server.js | 13 ++++++++++++- src/version.h | 2 +- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 3532cb04f..1fcd7b198 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -10,11 +10,13 @@ - Add devices: Greenstar 30Ri boiler, Junkers FW500 thermostat, Buderus BC30 controller - Add program memory info - Add mqtt queue and connection infos -- Add min/max setting to customizations - Adapt min/max if ems-value is not in this range - Add heat pump settings for inputs and limits [#600](https://github.com/emsesp/EMS-ESP32/issues/600) - Add hybrid heatpump [#500](https://github.com/emsesp/EMS-ESP32/issues/500) - Add translated tags +- Add min/max to customization table [#686](https://github.com/emsesp/EMS-ESP32/issues/686) +- Add MD5 check [#637](https://github.com/emsesp/EMS-ESP32/issues/637) +- Add more bus-ids [#673](https://github.com/emsesp/EMS-ESP32/issues/673) ## Fixed @@ -26,6 +28,7 @@ - RF room temperature sensor are shown as thermostat - render mqtt float json values with trailing zero - removed flash strings +- reload page after restart button is pressed ## **BREAKING CHANGES:** diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp index 67ac1e01a..3056de814 100644 --- a/lib/framework/MqttSettingsService.cpp +++ b/lib/framework/MqttSettingsService.cpp @@ -80,11 +80,11 @@ AsyncMqttClient * MqttSettingsService::getMqttClient() { } void MqttSettingsService::onMqttConnect(bool sessionPresent) { - // emsesp::EMSESP::logger().info(F("Connected to MQTT, %s"), (sessionPresent) ? F("with persistent session") : F("without persistent session")); + // emsesp::EMSESP::logger().info("Connected to MQTT, %s", (sessionPresent) ? ("with persistent session") : ("without persistent session")); } void MqttSettingsService::onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { - // emsesp::EMSESP::logger().info(F("Disconnected from MQTT reason: %d"), (uint8_t)reason); + // emsesp::EMSESP::logger().info("Disconnected from MQTT reason: %d", (uint8_t)reason); _disconnectReason = reason; _disconnectedAt = uuid::get_uptime(); } @@ -104,14 +104,14 @@ void MqttSettingsService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) { case ARDUINO_EVENT_ETH_GOT_IP6: case ARDUINO_EVENT_WIFI_STA_GOT_IP6: if (_state.enabled) { - // emsesp::EMSESP::logger().info(F("IPv4 Network connection found, starting MQTT client")); + // emsesp::EMSESP::logger().info("IPv4 Network connection found, starting MQTT client"); onConfigUpdated(); } break; case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: case ARDUINO_EVENT_ETH_DISCONNECTED: if (_state.enabled) { - // emsesp::EMSESP::logger().info(F("Network connection dropped, stopping MQTT client")); + // emsesp::EMSESP::logger().info("Network connection dropped, stopping MQTT client"); _mqttClient.disconnect(); // onConfigUpdated(); } @@ -127,7 +127,7 @@ void MqttSettingsService::configureMqtt() { _mqttClient.disconnect(); // only connect if WiFi is connected and MQTT is enabled if (_state.enabled && emsesp::EMSESP::system_.network_connected()) { - // emsesp::EMSESP::logger().info(F("Configuring Mqtt client")); + // emsesp::EMSESP::logger().info("Configuring Mqtt client"); _mqttClient.setServer(retainCstr(_state.host.c_str(), &_retainedHost), _state.port); if (_state.username.length() > 0) { _mqttClient.setCredentials(retainCstr(_state.username.c_str(), &_retainedUsername), @@ -141,7 +141,7 @@ void MqttSettingsService::configureMqtt() { _mqttClient.setMaxTopicLength(_state.maxTopicLength); _mqttClient.connect(); // } else { - // emsesp::EMSESP::logger().info(F("Error configuring Mqtt client")); + // emsesp::EMSESP::logger().info("Error configuring Mqtt client"); } } diff --git a/lib/framework/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp index 55ab6964c..a9b943cc9 100644 --- a/lib/framework/NTPSettingsService.cpp +++ b/lib/framework/NTPSettingsService.cpp @@ -28,14 +28,14 @@ void NTPSettingsService::WiFiEvent(WiFiEvent_t event) { switch (event) { case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: case ARDUINO_EVENT_ETH_DISCONNECTED: - emsesp::EMSESP::logger().info(F("WiFi connection dropped, stopping NTP")); + emsesp::EMSESP::logger().info("WiFi connection dropped, stopping NTP"); connected_ = false; configureNTP(); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: case ARDUINO_EVENT_ETH_GOT_IP: - // emsesp::EMSESP::logger().info(F("Got IP address, starting NTP synchronization")); + // emsesp::EMSESP::logger().info("Got IP address, starting NTP synchronization"); connected_ = true; configureNTP(); break; @@ -49,7 +49,7 @@ void NTPSettingsService::WiFiEvent(WiFiEvent_t event) { void NTPSettingsService::configureNTP() { emsesp::EMSESP::system_.ntp_connected(false); if (connected_ && _state.enabled) { - emsesp::EMSESP::logger().info(F("Starting NTP")); + emsesp::EMSESP::logger().info("Starting NTP"); sntp_set_sync_interval(3600000); // onehour sntp_set_time_sync_notification_cb(ntp_received); configTzTime(_state.tzFormat.c_str(), _state.server.c_str()); @@ -81,6 +81,6 @@ void NTPSettingsService::configureTime(AsyncWebServerRequest * request, JsonVari } void NTPSettingsService::ntp_received(struct timeval * tv) { - // emsesp::EMSESP::logger().info(F("NTP sync to %d sec"), tv->tv_sec); + // emsesp::EMSESP::logger().info("NTP sync to %d sec", tv->tv_sec); emsesp::EMSESP::system_.ntp_connected(true); } diff --git a/lib/framework/OTASettingsService.cpp b/lib/framework/OTASettingsService.cpp index 2aacdb37e..a91bd645f 100644 --- a/lib/framework/OTASettingsService.cpp +++ b/lib/framework/OTASettingsService.cpp @@ -47,15 +47,15 @@ void OTASettingsService::configureArduinoOTA() { #if defined(EMSESP_USE_SERIAL) Serial.printf("Error[%u]: ", error); if (error == OTA_AUTH_ERROR) - Serial.println(F("Auth Failed")); + Serial.println("Auth Failed"); else if (error == OTA_BEGIN_ERROR) - Serial.println(F("Begin Failed")); + Serial.println("Begin Failed"); else if (error == OTA_CONNECT_ERROR) - Serial.println(F("Connect Failed")); + Serial.println("Connect Failed"); else if (error == OTA_RECEIVE_ERROR) - Serial.println(F("Receive Failed")); + Serial.println("Receive Failed"); else if (error == OTA_END_ERROR) - Serial.println(F("End Failed")); + Serial.println("End Failed"); #endif }); diff --git a/mock-api/server.js b/mock-api/server.js index dbde18d51..a1d167a45 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -1154,7 +1154,7 @@ rest_server.post(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => { } else if (board_profile == 'C3MINI') { // Lolin C3 mini data.led_gpio = 7 - data.dallas_gpio = 2 + data.dallas_gpio = 1 data.rx_gpio = 4 data.tx_gpio = 5 data.pbutton_gpio = 9 @@ -1162,6 +1162,17 @@ rest_server.post(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => { data.eth_power = 0 data.eth_phy_addr = 0 data.eth_clock_mode = 0 + } else if (board_profile == 'S2MINI') { + // Lolin C3 mini + data.led_gpio = 15 + data.dallas_gpio = 7 + data.rx_gpio = 11 + data.tx_gpio = 12 + data.pbutton_gpio = 0 + data.phy_type = 0 + data.eth_power = 0 + data.eth_phy_addr = 0 + data.eth_clock_mode = 0 } console.log('boardProfile POST. Sending back, profile: ' + board_profile + ', ' + 'data: ' + JSON.stringify(data)) diff --git a/src/version.h b/src/version.h index 61da75d0e..e943da6ae 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ -#define EMSESP_APP_VERSION "3.5.0b7" +#define EMSESP_APP_VERSION "3.5.0b8" #if CONFIG_IDF_TARGET_ESP32C3 #define EMSESP_PLATFORM "ESP32-C3";