jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #503 from bensuffolk/master

Browse Source 
Comment out LV_FONT_DEFAULT to allow custom builds to compile
This commit is contained in:
fvanroie 2023-07-03 17:32:53 +02:00 committed by GitHub
commit f91e2b1d5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/user_config_override-template.h
View File

@ -134,7 +134,7 @@
// #define HASP_FONT_SIZE_4 48 // #define HASP_FONT_SIZE_4 48
// #define HASP_FONT_SIZE_5 12 // #define HASP_FONT_SIZE_5 12
#define LV_FONT_DEFAULT &HASP_FONT_1 // #define LV_FONT_DEFAULT &HASP_FONT_1
/*************************************************** /***************************************************
* GPIO Settings * 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_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 //#define HASP_LOG_TASKS // Also log the Taskname and watermark of ESP32 tasks
#endif // HASP_USER_CONFIG_OVERRIDE_H #endif // HASP_USER_CONFIG_OVERRIDE_H

8
src/mqtt/hasp_mqtt_esp.cpp
View File

@ -26,7 +26,7 @@
#include "esp_tls.h" #include "esp_tls.h"
#define MQTT_DEFAULT_NODE_TOPIC MQTT_PREFIX "/%hostname%/%topic%" #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_BROADCAST_TOPIC MQTT_PREFIX "/" MQTT_TOPIC_BROADCAST "/%topic%"
#define MQTT_DEFAULT_HASS_TOPIC "homeassistant/status" #define MQTT_DEFAULT_HASS_TOPIC "homeassistant/status"
@ -509,7 +509,7 @@ void mqttStart()
subtopic.reserve(64); subtopic.reserve(64);
String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting
nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, "plates"); nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, MQTT_GROUPNAME);
nvsOldGroup += "/%topic%"; nvsOldGroup += "/%topic%";
subtopic = F(MQTT_TOPIC_COMMAND); subtopic = F(MQTT_TOPIC_COMMAND);
@ -700,7 +700,7 @@ bool mqttGetConfig(const JsonObject& settings)
{ {
String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting
nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, "plates"); nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, MQTT_GROUPNAME);
nvsOldGroup += "/%topic%"; nvsOldGroup += "/%topic%";
String nvsGroupTopic = String nvsGroupTopic =
@ -784,7 +784,7 @@ bool mqttSetConfig(const JsonObject& settings)
} }
// if(strlen(mqttGroupName) == 0) { // if(strlen(mqttGroupName) == 0) {
// strcpy_P(mqttGroupName, PSTR("plates")); // strcpy_P(mqttGroupName, PSTR(MQTT_GROUPNAME));
// changed = true; // changed = true;
// } // }