jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 13:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MQTT_PORT on Windows

Browse Source
This commit is contained in:
fvanroie 2023-03-19 16:47:18 +01:00
parent c7b8b847ad
commit 3ab88a3485
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGLELOG.md
View File

@ -7,14 +7,14 @@
### Objects ### Objects
<!-- ? Support for State and Part properties --> <!-- ? Support for State and Part properties -->
- `action` and `swipe` can now be set to any command - `action` and `swipe` can now be set to any command
- Set default line_width of new `line` objects to 1 - Set default `line_width` of new `line` objects to 1
- Allow line and block comments in pages.jsonl - Allow line and block comments in pages.jsonl
- HASP theme: Toggle objects now use the secondary color when they are in the toggled state. - HASP theme: Toggle objects now use the secondary color when they are in the toggled state.
### Fonts ### Fonts
- Firmware files include the bitmapped font sizes 12, 16, 24 and 32pt - Firmware files include the bitmapped font sizes 12, 16, 24 and 32pt
- Use embedded TrueType font for other font sizes (PSram highly recommended) - Use embedded TrueType font for other font sizes (PSram highly recommended)
- Add glyphs from character sets Cyrillic, Latin-2, Greek and Viernamese to default fonts - Add glyphs from Cyrillic, Latin-2, Greek and Viernamese character sets to default fonts
### Web UI ### Web UI
- Update Web UI to petite-vue app - Update Web UI to petite-vue app
@ -48,7 +48,7 @@
- Add support for ESP32-S3 devices - Add support for ESP32-S3 devices
- Deprication of support for ESP32-S2 devices due to lack of sRAM - Deprication of support for ESP32-S2 devices due to lack of sRAM
Updated libraries to ArduinoJson 6.20.1, ArduinoStreamUtils 1.7.0, TFT_eSPI 2.5.0, LovyanGFX 1.1.2 and SimpleFTPServer 2.1.5 Updated libraries to ArduinoJson 6.21.0, ArduinoStreamUtils 1.7.0, TFT_eSPI 2.5.0, LovyanGFX 1.1.2 and SimpleFTPServer 2.1.5
## v0.6.3 ## v0.6.3

4
platformio.ini
View File

@ -75,14 +75,14 @@ build_flags =
-D HASP_VER_MAJ=0 -D HASP_VER_MAJ=0
-D HASP_VER_MIN=7 -D HASP_VER_MIN=7
;-D HASP_VER_REV=4 ;-D HASP_VER_REV=4
-D HASP_VER_REV=0-rc1 -D HASP_VER_REV=0-rc2
;-D HASP_VER_REV=4-rc1 ;-D HASP_VER_REV=4-rc1
${override.build_flags} ${override.build_flags}
; -- Shared library dependencies in all environments ; -- Shared library dependencies in all environments
; Warning : don't put comments after github links => causes infinite download loop ; Warning : don't put comments after github links => causes infinite download loop
lib_deps = lib_deps =
bblanchon/ArduinoJson@^6.20.1 bblanchon/ArduinoJson@^6.21.0
;git+https://github.com/fvanroie/ConsoleInput.git ;git+https://github.com/fvanroie/ConsoleInput.git
;git+https://github.com/andrethomas/TasmotaSlave.git ;git+https://github.com/andrethomas/TasmotaSlave.git
;git+https://github.com/lvgl/lvgl.git ;git+https://github.com/lvgl/lvgl.git

5
src/mqtt/hasp_mqtt_paho_single.cpp
View File

@ -234,7 +234,8 @@ int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload)
int mqtt_send_discovery(const char* payload, size_t len) int mqtt_send_discovery(const char* payload, size_t len)
{ {
char tmp_topic[128]; char tmp_topic[128];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR(MQTT_PREFIX "/" MQTT_TOPIC_DISCOVERY "/%s"),haspDevice.get_hardware_id()); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR(MQTT_PREFIX "/" MQTT_TOPIC_DISCOVERY "/%s"),
haspDevice.get_hardware_id());
return mqttPublish(tmp_topic, payload, len, false); return mqttPublish(tmp_topic, payload, len, false);
} }
@ -423,9 +424,11 @@ bool mqttSetConfig(const JsonObject& settings)
// configOutput(settings, TAG_MQTT); // configOutput(settings, TAG_MQTT);
bool changed = false; bool changed = false;
if(!settings[FPSTR(FP_CONFIG_PORT)].isNull()) {
// changed |= configSet(mqttPort, settings[FPSTR(FP_CONFIG_PORT)], F("mqttPort")); // changed |= configSet(mqttPort, settings[FPSTR(FP_CONFIG_PORT)], F("mqttPort"));
changed |= mqttPort != settings[FPSTR(FP_CONFIG_PORT)]; changed |= mqttPort != settings[FPSTR(FP_CONFIG_PORT)];
mqttPort = settings[FPSTR(FP_CONFIG_PORT)]; mqttPort = settings[FPSTR(FP_CONFIG_PORT)];
}
if(!settings[FPSTR(FP_CONFIG_NAME)].isNull()) { if(!settings[FPSTR(FP_CONFIG_NAME)].isNull()) {
LOG_VERBOSE(TAG_MQTT, "%s => %s", FP_CONFIG_NAME, settings[FPSTR(FP_CONFIG_NAME)].as<const char*>()); LOG_VERBOSE(TAG_MQTT, "%s => %s", FP_CONFIG_NAME, settings[FPSTR(FP_CONFIG_NAME)].as<const char*>());

2
user_setups/darwin_sdl/darwin_sdl_64bits.ini
View File

@ -67,7 +67,7 @@ lib_deps =
; lv_drivers@~7.9.1 ; lv_drivers@~7.9.1
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git https://github.com/eclipse/paho.mqtt.c.git
bblanchon/ArduinoJson@^6.19.4 ; Json(l) parser bblanchon/ArduinoJson@^6.21.0 ; Json(l) parser
https://github.com/fvanroie/lv_drivers https://github.com/fvanroie/lv_drivers
git+https://github.com/lvgl/lv_lib_png.git#release/v7 git+https://github.com/lvgl/lv_lib_png.git#release/v7

2
user_setups/linux_sdl/linux_sdl_64bits.ini
View File

@ -62,7 +62,7 @@ lib_deps =
;lv_drivers@~7.9.0 ;lv_drivers@~7.9.0
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git https://github.com/eclipse/paho.mqtt.c.git
bblanchon/ArduinoJson@^6.19.4 ; Json(l) parser bblanchon/ArduinoJson@^6.21.0 ; Json(l) parser
https://github.com/fvanroie/lv_drivers https://github.com/fvanroie/lv_drivers
lib_ignore = lib_ignore =

2
user_setups/win32/windows_sdl_64bits.ini
View File

@ -93,7 +93,7 @@ lib_deps =
;lv_drivers@~7.9.0 ;lv_drivers@~7.9.0
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git https://github.com/eclipse/paho.mqtt.c.git
bblanchon/ArduinoJson@^6.19.4 ; Json(l) parser bblanchon/ArduinoJson@^6.21.0 ; Json(l) parser
https://github.com/fvanroie/lv_drivers https://github.com/fvanroie/lv_drivers
lib_ignore = lib_ignore =