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

Merge branch 'HASwitchPlate:master' into backlight_fade_cb

Browse Source
This commit is contained in:
presslab-us 2024-02-09 19:29:39 -08:00 committed by GitHub
commit f1f2f51ba4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
60 changed files with 179 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yaml vendored
View File

@ -64,23 +64,23 @@ jobs:
env: esp32-s3-4848S040
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "true"
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install PlatformIO
@ -102,7 +102,7 @@ jobs:
- name: Run PlatformIO
run: pio run -e ${{ matrix.environment.env }}
- name: Upload output file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.environment.out }}
path: build_output/firmware/*.bin
@ -132,23 +132,23 @@ jobs:
linux_build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "true"
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install PlatformIO

6
.github/workflows/build_linux.yaml vendored
View File

@ -14,18 +14,18 @@ jobs:
- linux_sdl_64bits
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

8
.github/workflows/release.yml vendored
View File

@ -12,16 +12,16 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
@ -71,7 +71,7 @@ jobs:
- name: Run PlatformIO
run: pio run -e m5stack-core2
- name: Upload output file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: openHASP firmware.zip
path: build_output/firmware/*.bin

35
CHANGELOG.md
View File

@ -20,6 +20,7 @@
- Firmware files include the bitmapped font sizes 12, 16, 24 and 32pt
- Use embedded TrueType font for other font sizes (PSram highly recommended)
- Add glyphs from Cyrillic, Latin-2, Greek and Viernamese character sets to default fonts
- Add 12 new MDI icons
### Web UI
- Update Web UI to petite-vue app
@ -58,7 +59,7 @@
- Add support for ESP32-S3 and ESP32-C3 devices
- Deprecation of support for ESP32-S2 devices due to lack of sRAM
Updated libraries to ArduinoJson 6.21.4, ArduinoStreamUtils 1.7.3, AceButton 1.10.1, TFT_eSPI 2.5.0, LovyanGFX 1.1.8 and SimpleFTPServer 2.1.5
Updated libraries to Arduino_GFX v1.4.0, ArduinoJson 6.21.5, ArduinoStreamUtils 1.8.0, AceButton 1.10.1, TFT_eSPI 2.5.34, LovyanGFX 1.1.12 and SimpleFTPServer 2.1.5
## v0.6.3
@ -168,23 +169,23 @@ Updated libraries to AceButton 1.9.1 and ArduinoJson 6.18.5
- Run `/online.cmd` or `/offline.cmd` script when the wifi status changed
### Objects
- Add new *[line](https://openhasp.haswitchplate.com/0.6.1/design/objects/#line)* object
- Add `val` to *[btnmatrix](https://openhasp.haswitchplate.com/0.6.1/design/objects/#button-matrix)* when `one_select` is set
- Cache up to 20 *[images](https://openhasp.haswitchplate.com/0.6.1/design/objects/#image)* in PSram when available
- Improve precision on the *[linemeter](https://openhasp.haswitchplate.com/0.6.1/design/objects/#line-meter)* scales
- Fix *[dropdown](https://openhasp.haswitchplate.com/0.6.1/design/objects/#dropdown-list)* redraw bug
- Add new *[line](https://www.openhasp.com/0.6.1/design/objects/#line)* object
- Add `val` to *[btnmatrix](https://www.openhasp.com/0.6.1/design/objects/#button-matrix)* when `one_select` is set
- Cache up to 20 *[images](https://www.openhasp.com/0.6.1/design/objects/#image)* in PSram when available
- Improve precision on the *[linemeter](https://www.openhasp.com/0.6.1/design/objects/#line-meter)* scales
- Fix *[dropdown](https://www.openhasp.com/0.6.1/design/objects/#dropdown-list)* redraw bug
### Devices
- Fix [L8-HD dimmer](https://openhasp.haswitchplate.com/0.6.1/devices/lanbon-l8/) not responding correctly to mqtt after a reboot
- Add [M5Stack Core2](https://openhasp.haswitchplate.com/0.6.1/devices/m5stack-core2/) backlight dimming
- Add [Yeacreate Nscreen32](https://openhasp.haswitchplate.com/0.6.1/devices/yeacreate-nscreen32/)
- Add [Makerfabs ESP32 TFT Touch](https://openhasp.haswitchplate.com/0.6.1/devices/makerfabs-tft-touch/) Capacitive
- Fix [L8-HD dimmer](https://www.openhasp.com/0.6.1/devices/lanbon-l8/) not responding correctly to mqtt after a reboot
- Add [M5Stack Core2](https://www.openhasp.com/0.6.1/devices/m5stack-core2/) backlight dimming
- Add [Yeacreate Nscreen32](https://www.openhasp.com/0.6.1/devices/yeacreate-nscreen32/)
- Add [Makerfabs ESP32 TFT Touch](https://www.openhasp.com/0.6.1/devices/makerfabs-tft-touch/) Capacitive
### Fonts
- [Additional characters](https://openhasp.haswitchplate.com/0.6.1/design/fonts/#ascii): `²` (squared) and `³` (cubed)
- [Additional icons](https://openhasp.haswitchplate.com/0.6.1/design/fonts/#built-in-icons): recycle-variant and additional weather icons
- Use latin1 as default charset on [WT32-SC01](https://openhasp.haswitchplate.com/0.6.1/devices/wt32-sc01/)
- Add [Greek font](https://openhasp.haswitchplate.com/0.6.1/design/fonts/#greek)
- [Additional characters](https://www.openhasp.com/0.6.1/design/fonts/#ascii): `²` (squared) and `³` (cubed)
- [Additional icons](https://www.openhasp.com/0.6.1/design/fonts/#built-in-icons): recycle-variant and additional weather icons
- Use latin1 as default charset on [WT32-SC01](https://www.openhasp.com/0.6.1/devices/wt32-sc01/)
- Add [Greek font](https://www.openhasp.com/0.6.1/design/fonts/#greek)
### Compiling
- Allow custom bootlogo
@ -252,7 +253,7 @@ Updated libraries to lvgl 7.11.0, ArduinoJson 6.18.0 and TFT_eSPI 2.3.70
## v0.5.0
Name changed to openHASP - https://openhasp.haswitchplate.com/
Name changed to openHASP - https://www.openhasp.com/
> When using HomeAssistant also update the [openHASP Custom Component](https://github.com/HASwitchPlate/openHASP-custom-component/releases/tag/0.5.0)
- Switch built-in icons from FontAwesome to MaterialDesign icons #139
@ -263,7 +264,7 @@ Name changed to openHASP - https://openhasp.haswitchplate.com/
- Add `back`, `prev`, `next` attributes to pages #114
- JSON Serialize text in payloads containing text attributes #140
- Add az-touch-mod-esp32_ili9341 config and allow for TFT_BACKLIGHT_ON set to LOW #131
- Add [FreeTouchDeck](https://openhasp.haswitchplate.com/0.5/#devices/freetouchdeck/) and [ESP32-Touchdown](https://openhasp.haswitchplate.com/0.5/#devices/esp32-touchdown/) configs
- Add [FreeTouchDeck](https://www.openhasp.com/0.5/#devices/freetouchdeck/) and [ESP32-Touchdown](https://www.openhasp.com/0.5/#devices/esp32-touchdown/) configs
- Add roller `mode` `infinite` attribute
- Add btnmatrix `toggle` and `one_check` attributes
- Rework all event handlers to reduce update events and prevent race condition #119 *(events have changed!)*
@ -291,7 +292,7 @@ Changes:
- Remove HA auto-discovery in favor of the HA Custom Component
- Add `clearpage all` command option
- Add local page navigation and transitions
- Add [scale properties](https://openhasp.haswitchplate.com/0.5/#styling/#scale)
- Add [scale properties](https://www.openhasp.com/0.5/#styling/#scale)
- Add `config/gpio` command
- Allow for timezone setting in user_config_override.h (thanks @arovak)
- Start localizations for NL, HU and RO (thanks @nagyrobi)

2
LICENSE
View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2019-2023 Francis Van Roie
Copyright (c) 2019-2024 Francis Van Roie
Copyright (c) 2018-2019 Allen Derusha allen@derusha.org
Permission is hereby granted, free of charge, to any person obtaining a copy

BIN
data/cert/x509_crt_bundle.bin
View File

Binary file not shown.

2
data/edit.htm
View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.0/ace.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.0/theme-monokai.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.0/mode-html.js"></script><script type="module" src="/static/main.js?COMMIT_HASH"></script><script src="/static/script.js?COMMIT_HASH"></script><title>openHASP File Editor</title><link rel="stylesheet" href="/static/vars.css?COMMIT_HASH"><link rel="stylesheet" href="/static/style.css?COMMIT_HASH"><link rel="icon" href="/static/logo.svg?COMMIT_HASH" type="image/svg+xml"><link href="https://fonts.cdnfonts.com/css/jetbrains-mono" rel="stylesheet"><link href="https://fonts.cdnfonts.com/css/source-code-pro" rel="stylesheet"><style>ul{list-style-type:none;padding-left:20px}ul>li{white-space:nowrap}.inact:hover{cursor:default}.item:hover{cursor:pointer;background-color:#dadaff}.item>span:nth-child(2):hover{text-decoration:underline}.selitem>div{background-color:#ccf}.selitem>div:hover{background-color:#ccf}</style></head><body v-cloak v-scope @vue:mounted="mounted"><div class="container__editor" onmousedown="hidectx()"><div class="container__left"><div id="tree"><div class="item bold"><span class="fi fa-flash" title="/"></span><span>L:</span></div></div></div><div class="resizer" id="dragMe"></div><div class="container__right"><div class="toolbar"><input type="file" id="upload" name="upload" multiple="multiple" hidden><span class="left"><button id="home">Home</button><button onclick='upload(_("tree"),"/")'>Upload</button><button id="save" disabled="disabled">Save</button></span><div class="right"><input id="page" type="number" min="1" max="12" class="number"><button id="load">Reload Pages</button><button id="init">Clear Pages</button></div><span class="left"><button id="cut" disabled="disabled">Cut</button><button id="copy" disabled="disabled">Copy</button><button id="paste" disabled="disabled">Paste</button></span><span id="name"></span><span class="left"><button id="undo" disabled="disabled">Undo</button><button id="redo" disabled="disabled">Redo</button></span><span class="left"><select id="font"><option>JetBrains Mono</option><option selected="selected">Source Code Pro</option><input id="fontsize" type="number" step="any" min="9" max="40" value="12"></span></div><div id="editor" class="container__bottom"></div><div id="preview" class="container__bottom"></div><iframe id="download-frame"></iframe></div><div id="ctx" onmousedown="event.stopPropagation()"><ul><li><span class="icon file"></span>New File</li><li><span class="icon upload"></span>Upload Files</li><li><span class="icon edit"></span>Edit</li><li><span class="icon eye"></span>Preview</li><li><span class="icon download"></span>Download</li><li><span class="icon trash"></span>Delete</li></ul></div></div><div id="toast"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/ace.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/theme-monokai.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.6/mode-html.js"></script><script type="module" src="/static/main.js?COMMIT_HASH"></script><script src="/static/script.js?COMMIT_HASH"></script><title>openHASP File Editor</title><link rel="stylesheet" href="/static/vars.css?COMMIT_HASH"><link rel="stylesheet" href="/static/style.css?COMMIT_HASH"><link rel="icon" href="/static/logo.svg?COMMIT_HASH" type="image/svg+xml"><link href="https://fonts.cdnfonts.com/css/jetbrains-mono" rel="stylesheet"><link href="https://fonts.cdnfonts.com/css/source-code-pro" rel="stylesheet"><style>ul{list-style-type:none;padding-left:20px}ul>li{white-space:nowrap}.inact:hover{cursor:default}.item:hover{cursor:pointer;background-color:#dadaff}.item>span:nth-child(2):hover{text-decoration:underline}.selitem>div{background-color:#ccf}.selitem>div:hover{background-color:#ccf}</style></head><body v-cloak v-scope @vue:mounted="mounted"><div class="container__editor" onmousedown="hidectx()"><div class="container__left"><div id="tree"><div class="item bold"><span class="fi fa-flash" title="/"></span><span>L:</span></div></div></div><div class="resizer" id="dragMe"></div><div class="container__right"><div class="toolbar"><input type="file" id="upload" name="upload" multiple="multiple" hidden><span class="left"><button id="home">Home</button><button onclick='upload(_("tree"),"/")'>Upload</button><button id="save" disabled="disabled">Save</button></span><div class="right"><input id="page" type="number" min="1" max="12" class="number"><button id="load">Reload Pages</button><button id="init">Clear Pages</button></div><span class="left"><button id="cut" disabled="disabled">Cut</button><button id="copy" disabled="disabled">Copy</button><button id="paste" disabled="disabled">Paste</button></span><span id="name"></span><span class="left"><button id="undo" disabled="disabled">Undo</button><button id="redo" disabled="disabled">Redo</button></span><span class="left"><select id="font"><option>JetBrains Mono</option><option selected="selected">Source Code Pro</option><input id="fontsize" type="number" step="any" min="9" max="40" value="12"></span></div><div id="editor" class="container__bottom"></div><div id="preview" class="container__bottom"></div><iframe id="download-frame"></iframe></div><div id="ctx" onmousedown="event.stopPropagation()"><ul><li><span class="icon file"></span>New File</li><li><span class="icon upload"></span>Upload Files</li><li><span class="icon edit"></span>Edit</li><li><span class="icon eye"></span>Preview</li><li><span class="icon download"></span>Download</li><li><span class="icon trash"></span>Delete</li></ul></div></div><div id="toast"></div></body></html>

2
data/script.js
View File

File diff suppressed because one or more lines are too long

10
platformio.ini
View File

@ -1,4 +1,4 @@
; MIT License - Copyright (c) 2019-2023 Francis Van Roie
; MIT License - Copyright (c) 2019-2024 Francis Van Roie
; For full license information read the LICENSE file in the project folder
;
; PlatformIO Project Configuration File
@ -75,14 +75,14 @@ build_flags =
-D HASP_VER_MAJ=0
-D HASP_VER_MIN=7
;-D HASP_VER_REV=4
-D HASP_VER_REV=0-rc10
-D HASP_VER_REV=0-rc11
;-D HASP_VER_REV=4-rc1
${override.build_flags}
; -- Shared library dependencies in all environments
; Warning : don't put comments after github links => causes infinite download loop
lib_deps =
bblanchon/ArduinoJson@^6.21.4
bblanchon/ArduinoJson@^6.21.5
;git+https://github.com/fvanroie/ConsoleInput.git
;git+https://github.com/andrethomas/TasmotaSlave.git
;git+https://github.com/lvgl/lvgl.git
@ -104,11 +104,11 @@ build_src_filter = +<*> -<.git/> -<examples/> -<test/> -<tests/> -<stm32f4/> -<l
[lovyangfx]
lib_deps =
lovyan03/LovyanGFX@^1.1.8
lovyan03/LovyanGFX@^1.1.12
[arduinogfx]
lib_deps =
moononournation/GFX Library for Arduino@1.4.0
moononournation/GFX Library for Arduino@1.4.0 ; Update needs modification of custom PCA class
;git+https://github.com/moononournation/Arduino_GFX.git
[tft_espi]

6
src/dev/esp32/esp32.cpp
View File

@ -295,7 +295,8 @@ bool Esp32Device::get_backlight_invert()
void Esp32Device::set_backlight_level(uint8_t level)
{
_backlight_level = level;
update_backlight(true);
// update_backlight(true);
update_backlight(false);
}
uint8_t Esp32Device::get_backlight_level()
@ -306,7 +307,8 @@ uint8_t Esp32Device::get_backlight_level()
void Esp32Device::set_backlight_power(bool power)
{
_backlight_power = power;
update_backlight(true);
// update_backlight(true);
update_backlight(false);
}
bool Esp32Device::get_backlight_power()

2
src/dev/esp32/esp32.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_DEVICE_ESP32_H

2
src/drv/tft/tft_driver_arduinogfx.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if defined(ARDUINO) && defined(HASP_USE_ARDUINOGFX)

2
src/drv/tft/tft_driver_lovyangfx.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if defined(ARDUINO) && defined(LGFX_USE_V1)

2
src/drv/touch/touch_driver_gt911.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if defined(ARDUINO) && (TOUCH_DRIVER == 0x0911) && !defined(HASP_USE_LGFX_TOUCH)

2
src/drv/touch/touch_driver_gt911.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_GT911_TOUCH_DRIVER_H

4
src/drv/touch/touch_driver_tftespi.h
View File

@ -1,10 +1,10 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_TFTESPI_TOUCH_DRIVER_H
#define HASP_TFTESPI_TOUCH_DRIVER_H
#ifdef ARDUINO && defined(USER_SETUP_LOADED)
#if defined(ARDUINO) && defined(USER_SETUP_LOADED)
#include <Arduino.h>
#include "touch_driver.h" // base class

2
src/hasp/hasp.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

2
src/hasp/hasp.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_H

6
src/hasp/hasp_attribute.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"
@ -19,6 +19,9 @@ LV_FONT_DECLARE(unscii_8_icon);
extern const char** btnmatrix_default_map; // memory pointer to lvgl default btnmatrix map
extern const char* msgbox_default_map[]; // memory pointer to lvgl default btnmatrix map
extern const uint8_t rootca_crt_bundle_start[] asm("_binary_data_cert_x509_crt_bundle_bin_start");
extern const uint8_t rootca_crt_bundle_end[] asm("_binary_data_cert_x509_crt_bundle_bin_end");
void my_image_release_resources(lv_obj_t* obj)
{
if(!obj) return;
@ -1345,6 +1348,7 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
#if defined(ARDUINO) && defined(ARDUINO_ARCH_ESP32)
#if HASP_USE_WIFI > 0 || HASP_USE_ETHERNET > 0
HTTPClient http;
// http.begin(payload, (const char*)rootca_crt_bundle_start);
http.begin(payload);
http.setTimeout(5000);
http.setConnectTimeout(5000);

65
src/hasp/hasp_dispatch.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include <time.h>
@ -269,6 +269,42 @@ static void dispatch_output(const char* topic, const char* payload)
#endif
}
// static inline size_t dispatch_msg_length(size_t len)
// {
// return (len / 64) * 64 + 64;
// }
// void dispatch_enqueue_message(const char* topic, const char* payload, size_t payload_len, uint8_t source)
// {
// // Add new message to the queue
// dispatch_message_t data;
// size_t topic_len = strlen(topic);
// data.topic = (char*)hasp_calloc(sizeof(char), dispatch_msg_length(topic_len + 1));
// data.payload = (char*)hasp_calloc(sizeof(char), dispatch_msg_length(payload_len + 1));
// data.source = source;
// if(!data.topic || !data.payload) {
// LOG_ERROR(TAG_MQTT_RCV, D_ERROR_OUT_OF_MEMORY);
// hasp_free(data.topic);
// hasp_free(data.payload);
// return;
// }
// memcpy(data.topic, topic, topic_len);
// memcpy(data.payload, payload, payload_len);
// {
// size_t attempt = 0;
// while(xQueueSend(message_queue, &data, (TickType_t)0) == errQUEUE_FULL && attempt < 100) {
// delay(5);
// attempt++;
// };
// if(attempt >= 100) {
// LOG_ERROR(TAG_MSGR, D_ERROR_OUT_OF_MEMORY);
// }
// }
// }
// objectattribute=value
static void dispatch_command(const char* topic, const char* payload, bool update, uint8_t source)
{
@ -765,6 +801,11 @@ void dispatch_run_script(const char*, const char* payload, uint8_t source)
return;
}
// if(!gui_acquire(pdMS_TO_TICKS(500))) {
// LOG_ERROR(TAG_MSGR, F(D_FILE_LOAD_FAILED), payload);
// return;
// }
// char buffer[512]; // use stack
String buffer((char*)0); // use heap
buffer.reserve(512);
@ -788,6 +829,7 @@ void dispatch_run_script(const char*, const char* payload, uint8_t source)
}
}
// gui_release();
cmdfile.close();
LOG_INFO(TAG_MSGR, F(D_FILE_LOADED), payload);
#else
@ -1321,8 +1363,8 @@ void dispatch_current_state(uint8_t source)
bool dispatch_factory_reset()
{
bool formatted = true;
bool erased = true;
bool cleared = true;
bool erased = true;
bool cleared = true;
#if ESP32
erased = nvs_clear_user_config();
@ -1519,7 +1561,20 @@ void dispatchSetup()
}
IRAM_ATTR void dispatchLoop()
{}
{
// UBaseType_t msg_count = uxQueueMessagesWaiting(message_queue));
// if(msg_count == 0) return;
// dispatch_message_t data;
// while(xQueueReceive(message_queue, &data, (TickType_t)0)) {
// LOG_WARNING(TAG_MSGR, F("[%d] QUE %s => %s"), msg_count, data.topic, data.payload);
// size_t length = strlen(data.payload);
// dispatch_topic_payload(data.topic, data.payload, length > 0, data.source);
// hasp_free(data.topic);
// hasp_free(data.payload);
// // delay(1);
// }
}
#if 1 || ARDUINO
void dispatchEverySecond()
@ -1551,7 +1606,7 @@ void everySecond()
{
if(dispatch_setings.teleperiod > 0) {
std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
std::chrono::seconds elapsed = std::chrono::duration_cast<std::chrono::seconds>(end - begin);
std::chrono::seconds elapsed = std::chrono::duration_cast<std::chrono::seconds>(end - begin);
if(elapsed.count() >= dispatch_setings.teleperiod) {
std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now();

9
src/hasp/hasp_dispatch.h
View File

@ -5,6 +5,15 @@
#define HASP_DISPATCH_H
#include "hasplib.h"
// #include "freertos/queue.h"
// QueueHandle_t message_queue;
// typedef struct
// {
// char* topic; //[64];
// char* payload; //[512];
// uint source;
// } dispatch_message_t;
struct dispatch_conf_t
{

2
src/hasp/hasp_font.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include <string.h>

2
src/hasp/hasp_nvs.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifdef ESP32

2
src/hasp/hasp_nvs.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_NVS_H

2
src/hasp/hasp_object.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_OBJECT_H

2
src/hasp/hasp_task.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

2
src/hasp_config.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if HASP_USE_CONFIG > 0

2
src/hasp_config.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if HASP_USE_CONFIG > 0

2
src/hasp_debug.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

2
src/hasp_filesystem.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifdef ARDUINO

2
src/hasp_filesystem.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_FILESYSTEM_H

2
src/hasp_gui.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

2
src/hasp_oobe.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if HASP_USE_CONFIG > 0

2
src/hasp_oobe.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if HASP_USE_CONFIG > 0

2
src/hasplib.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifdef ARDUINO

2
src/main_arduino.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if !(defined(WINDOWS) || defined(POSIX))

2
src/mqtt/hasp_mqtt.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_MQTT_H

2
src/mqtt/hasp_mqtt_esp.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasp_conf.h"

2
src/mqtt/hasp_mqtt_paho_single.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
/* Single threaded synchronous paho client */

2
src/mqtt/hasp_mqtt_pubsubclient.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasp_conf.h"

2
src/sys/gpio/hasp_gpio.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "lv_conf.h" // For timing defines

2
src/sys/gpio/hasp_gpio.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_GPIO_H

15
src/sys/net/hasp_time.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include <time.h>
@ -110,9 +110,7 @@ String time_zone_to_possix(const char* timezone)
case TZ_ASIA_RIYADH:
case TZ_ETC_GMT__3:
case TZ_EUROPE_ISTANBUL:
case TZ_EUROPE_KIROV:
case TZ_EUROPE_MINSK:
case TZ_EUROPE_VOLGOGRAD:
return "<+03>-3";
case TZ_ASIA_TEHRAN:
return "<+0330>-3:30";
@ -283,9 +281,9 @@ String time_zone_to_possix(const char* timezone)
return "<-03>3";
case TZ_AMERICA_MIQUELON:
return "<-03>3<-02>,M3.2.0,M11.1.0";
case TZ_AMERICA_GODTHAB:
case TZ_AMERICA_NUUK:
return "<-03>3<-02>,M3.4.6/22,J365/25";
case TZ_AMERICA_GODTHAB:
return "<-02>2<-01>,M3.5.0/-1,M10.5.0/0";
case TZ_AMERICA_BOA_VISTA:
case TZ_AMERICA_CAMPO_GRANDE:
case TZ_AMERICA_CARACAS:
@ -482,10 +480,11 @@ String time_zone_to_possix(const char* timezone)
case TZ_INDIAN_COMORO:
case TZ_INDIAN_MAYOTTE:
return "EAT-3";
case TZ_AFRICA_CAIRO:
case TZ_AFRICA_TRIPOLI:
case TZ_EUROPE_KALININGRAD:
return "EET-2";
case TZ_AFRICA_CAIRO:
return "EET-2EEST,M4.5.5/0,M10.5.4/24";
case TZ_EUROPE_CHISINAU:
return "EET-2EEST,M3.5.0,M10.5.0/3";
case TZ_ASIA_BEIRUT:
@ -506,7 +505,7 @@ String time_zone_to_possix(const char* timezone)
return "EET-2EEST,M3.5.0/3,M10.5.0/4";
case TZ_ASIA_GAZA:
case TZ_ASIA_HEBRON:
return "EET-2EEST,M3.5.6,M10.5.6";
return "EET-2EEST,M3.4.4/50,M10.4.4/50";
case TZ_AMERICA_ATIKOKAN:
case TZ_AMERICA_CANCUN:
case TZ_AMERICA_CAYMAN:
@ -577,8 +576,10 @@ String time_zone_to_possix(const char* timezone)
case TZ_ASIA_PYONGYANG:
case TZ_ASIA_SEOUL:
return "KST-9";
case TZ_EUROPE_KIROV:
case TZ_EUROPE_MOSCOW:
case TZ_EUROPE_SIMFEROPOL:
case TZ_EUROPE_VOLGOGRAD:
return "MSK-3";
case TZ_AMERICA_CRESTON:
case TZ_AMERICA_DAWSON:

2
src/sys/net/hasp_time.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_TIME_H

2
src/sys/net/hasp_wifi.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include <Arduino.h>

2
src/sys/net/hasp_wifi.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_WIFI_H

2
src/sys/net/hasp_wireguard.cpp
View File

@ -12,7 +12,7 @@
char wg_ip[16] = WIREGUARD_IP;
char wg_private_key[45] = WIREGUARD_PRIVATE_KEY;
char wg_ep_ip[16] = WIREGUARD_EP_IP;
char wg_ep_ip[40] = WIREGUARD_EP_IP;
uint16_t wg_ep_port = WIREGUARD_EP_PORT;
char wg_ep_public_key[45] = WIREGUARD_EP_PUBLIC_KEY;
static WireGuard wg;

2
src/sys/svc/hasp_console.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

2
src/sys/svc/hasp_console.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_CONSOLE_H

2
src/sys/svc/hasp_ftp.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

2
src/sys/svc/hasp_ftp.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_FTP_H

6
src/sys/svc/hasp_http.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"
@ -920,7 +920,7 @@ static void http_handle_about()
<span v-if="model.l && !!model.l" v-t="'about.' + model.l"></span></p>
</template>
<h3>openHASP</h3><p>Copyright 2019-2023 Francis Van Roie</br>MIT License</p>
<h3>openHASP</h3><p>Copyright 2019-2024 Francis Van Roie</br>MIT License</p>
<p v-t="'about.clause1'"></p>
<p v-t="'about.clause2'"></p>
<p v-t="'about.clause3'"></p>
@ -2357,7 +2357,7 @@ static void http_handle_wireguard()
</div>
<div class="row">
<div class="col-25"><label for="host" v-t="'wg.host'"></label></div>
<div class="col-75"><input type="text" id="host" maxlength="15" placeholder="Remote IP" v-model="config.wg.host" pattern="^((\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$"></div>
<div class="col-75"><input type="text" id="host" maxlength="40" placeholder="Remote IP" v-model="config.wg.host"></div>
</div>
<div class="row">
<div class="col-25"><label for="port" v-t="'wg.port'"></label></div>

2
src/sys/svc/hasp_http.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_HTTP_H

2
src/sys/svc/hasp_http_async.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
//#include "webServer.h"

2
src/sys/svc/hasp_mdns.h
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_MDNS_H

2
src/sys/svc/hasp_ota.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)

2
src/sys/svc/hasp_telnet.cpp
View File

@ -1,4 +1,4 @@
/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"

3
user_setups/esp32/_esp32.ini
View File

@ -95,7 +95,7 @@ lib_deps =
git+https://github.com/fvanroie/ConsoleInput.git#dev
; lorol/LittleFS_esp32@^1.0.6 ; for Arduino v1 only
bxparks/AceButton@^1.10.1 ; GPIO button library
bblanchon/StreamUtils@^1.7.3 ; for EEPromStream and BufferedTelnetClient
bblanchon/StreamUtils@^1.8.0 ; for EEPromStream and BufferedTelnetClient
; knolleary/PubSubClient@^2.8.0 ; MQTT client
extra_scripts =
@ -144,7 +144,6 @@ framework = arduino
;platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
;;;platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
platform = https://github.com/Jason2866/platform-espressif32/releases/download/2023.10.02/platform-espressif32-2023.10.02.zip
lib_ignore =
${esp32.lib_ignore}
LittleFS_esp32 ; Not needed for Arduino v2

3
user_setups/esp32s2/_esp32s2.ini
View File

@ -83,7 +83,8 @@ platform = https://github.com/tasmota/platform-espressif32/releases/download/202
[arduino_esp32s2-solo_v2]
framework = arduino
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.01.01/platform-espressif32.zip
platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
platform = https://github.com/Jason2866/platform-espressif32/releases/download/2023.10.02/platform-espressif32-2023.10.02.zip
board_build.embed_files = ${esp32.board_build.embed_files}
board_build.filesystem = littlefs
; ----- crash reporter

3
user_setups/esp32s3/_esp32s3.ini
View File

@ -17,4 +17,5 @@ extends = esp32s3
framework = arduino
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.05.01/platform-espressif32.zip
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.01/platform-espressif32.zip
platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
platform = https://github.com/Jason2866/platform-espressif32/releases/download/2023.10.02/platform-espressif32-2023.10.02.zip