From 2bf8ebfb568586c005ee9671ff2a8b2e2a13886f Mon Sep 17 00:00:00 2001 From: Ben Suffolk Date: Sun, 2 Jul 2023 12:07:00 +0100 Subject: [PATCH 1/2] Comment out LV_FONT_DEFAULT to allow custom builds to compile --- include/user_config_override-template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/user_config_override-template.h b/include/user_config_override-template.h index a5bfdff3..db8490fc 100644 --- a/include/user_config_override-template.h +++ b/include/user_config_override-template.h @@ -134,7 +134,7 @@ // #define HASP_FONT_SIZE_4 48 // #define HASP_FONT_SIZE_5 12 -#define LV_FONT_DEFAULT &HASP_FONT_1 +// #define LV_FONT_DEFAULT &HASP_FONT_1 /*************************************************** * GPIO Settings @@ -158,4 +158,4 @@ //#define HASP_LOG_LEVEL LOG_LEVEL_VERBOSE // LOG_LEVEL_* can be DEBUG, VERBOSE, TRACE, INFO, WARNING, ERROR, CRITICAL, ALERT, FATAL, SILENT //#define HASP_LOG_TASKS // Also log the Taskname and watermark of ESP32 tasks -#endif // HASP_USER_CONFIG_OVERRIDE_H \ No newline at end of file +#endif // HASP_USER_CONFIG_OVERRIDE_H From 14d5c7ace5ee324fc3e9570d213f450d6654d72e Mon Sep 17 00:00:00 2001 From: Ben Suffolk Date: Sun, 2 Jul 2023 13:54:54 +0100 Subject: [PATCH 2/2] Make mqtt_esp honour the MQTT_GROUPNAME define --- src/mqtt/hasp_mqtt_esp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mqtt/hasp_mqtt_esp.cpp b/src/mqtt/hasp_mqtt_esp.cpp index 21bfbe13..8018f766 100644 --- a/src/mqtt/hasp_mqtt_esp.cpp +++ b/src/mqtt/hasp_mqtt_esp.cpp @@ -26,7 +26,7 @@ #include "esp_tls.h" #define MQTT_DEFAULT_NODE_TOPIC MQTT_PREFIX "/%hostname%/%topic%" -#define MQTT_DEFAULT_GROUP_TOPIC MQTT_PREFIX "/plates/%topic%" +#define MQTT_DEFAULT_GROUP_TOPIC MQTT_PREFIX "/" MQTT_GROUPNAME "/%topic%" #define MQTT_DEFAULT_BROADCAST_TOPIC MQTT_PREFIX "/" MQTT_TOPIC_BROADCAST "/%topic%" #define MQTT_DEFAULT_HASS_TOPIC "homeassistant/status" @@ -509,7 +509,7 @@ void mqttStart() subtopic.reserve(64); String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting - nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, "plates"); + nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, MQTT_GROUPNAME); nvsOldGroup += "/%topic%"; subtopic = F(MQTT_TOPIC_COMMAND); @@ -700,7 +700,7 @@ bool mqttGetConfig(const JsonObject& settings) { String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting - nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, "plates"); + nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, MQTT_GROUPNAME); nvsOldGroup += "/%topic%"; String nvsGroupTopic = @@ -784,7 +784,7 @@ bool mqttSetConfig(const JsonObject& settings) } // if(strlen(mqttGroupName) == 0) { - // strcpy_P(mqttGroupName, PSTR("plates")); + // strcpy_P(mqttGroupName, PSTR(MQTT_GROUPNAME)); // changed = true; // }