Skip to content

add fallback mode to button actions #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vvvrrooomm wants to merge 9 commits into
base: devel
Choose a base branch
from
Open

add fallback mode to button actions #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
92a3174
extract nspanel buttons to partial
vvvrrooomm Jan 22, 2026
9d8cc9e
show firmware version in status
vvvrrooomm Jan 22, 2026
17d991a
feature: make long button press available
vvvrrooomm Jan 23, 2026
d50b33a
extract firmware and HMI path into macro
vvvrrooomm Jan 26, 2026
69dbf56
UI improvement: add group box around button config
vvvrrooomm Jan 28, 2026
c14a72e
add fallback mode, in case mqtt is not available
vvvrrooomm Jan 28, 2026
0652e2f
fix bug: mqttmanager cannot find configured entity bc. type filter wa…
vvvrrooomm Jan 28, 2026
a896eab
renamed detached_mode_light to detached_mode_entity in frontend, to m…
vvvrrooomm Jan 28, 2026
08cff40
replace ButotnMode with definition of protobuf
vvvrrooomm Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions docker/MQTTManager/include/database_manager/database_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ struct NSPanel {
std::string version;
std::optional<uint64_t> button1_detached_mode_entity_id = 0;
int button1_mode = 0;
int button1_fallback_mode = 0;
std::optional<uint64_t> button2_detached_mode_entity_id = 0;
int button2_mode = 0;
int button2_fallback_mode = 0;
std::optional<uint64_t> button1_long_detached_mode_entity_id = 0;
int button1_long_mode = 0;
int button1_long_fallback_mode = 0;
std::optional<uint64_t> button2_long_detached_mode_entity_id = 0;
int button2_long_mode = 0;
int button2_long_fallback_mode = 0;
std::string md5_data_file;
std::string md5_firmware;
std::string md5_tft_file;
Expand Down Expand Up @@ -130,8 +138,16 @@ static inline auto database = sqlite_orm::make_storage("/data/nspanelmanager_db.
sqlite_orm::make_column("version", &NSPanel::version),
sqlite_orm::make_column("button1_detached_mode_entity_id", &NSPanel::button1_detached_mode_entity_id),
sqlite_orm::make_column("button1_mode", &NSPanel::button1_mode),
sqlite_orm::make_column("button1_mode", &NSPanel::button1_fallback_mode),
sqlite_orm::make_column("button2_detached_mode_entity_id", &NSPanel::button2_detached_mode_entity_id),
sqlite_orm::make_column("button2_mode", &NSPanel::button2_mode),
sqlite_orm::make_column("button2_mode", &NSPanel::button2_fallback_mode),
sqlite_orm::make_column("button1_long_detached_mode_entity_id", &NSPanel::button1_long_detached_mode_entity_id),
sqlite_orm::make_column("button1_long_mode", &NSPanel::button1_long_mode),
sqlite_orm::make_column("button1_long_mode", &NSPanel::button1_long_fallback_mode),
sqlite_orm::make_column("button2_long_detached_mode_entity_id", &NSPanel::button2_long_detached_mode_entity_id),
sqlite_orm::make_column("button2_long_mode", &NSPanel::button2_long_mode),
sqlite_orm::make_column("button2_long_mode", &NSPanel::button2_long_fallback_mode),
sqlite_orm::make_column("md5_data_file", &NSPanel::md5_data_file),
sqlite_orm::make_column("md5_firmware", &NSPanel::md5_firmware),
sqlite_orm::make_column("md5_tft_file", &NSPanel::md5_tft_file),
Expand Down
2 changes: 1 addition & 1 deletion docker/MQTTManager/include/entity_manager/entity_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class EntityManager {
std::lock_guard<std::mutex> mutex_guard(EntityManager::_entities_mutex);
auto rit = EntityManager::_entities.cbegin();
while (rit != EntityManager::_entities.cend()) {
if ((type != MQTT_MANAGER_ENTITY_TYPE::ANY && (*rit)->get_type() == type) && (*rit)->get_id() == id) {
if ((type == MQTT_MANAGER_ENTITY_TYPE::ANY || (*rit)->get_type() == type) && (*rit)->get_id() == id) {
return std::static_pointer_cast<EntityClass>(*rit);
} else {
++rit;
Expand Down
28 changes: 14 additions & 14 deletions docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void MqttManagerConfig::update_firmware_checksum() {
std::lock_guard<std::mutex> lock_guard(MqttManagerConfig::_md5_checksum_files_mutex);
SPDLOG_INFO("Updating/calculating MD5 checksums for all firmware files.");

auto firmware_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware.bin");
auto firmware_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/firmware.bin"));
if (firmware_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_firmware = firmware_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for firmware was not able to be calculated.");
Expand All @@ -176,7 +176,7 @@ void MqttManagerConfig::update_firmware_checksum() {
SPDLOG_ERROR("Failed to calculate checksum for firmware!");
}

auto littlefs_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/data_file.bin");
auto littlefs_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/data_file.bin"));
if (littlefs_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_littlefs = littlefs_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for littlefs/data file was not able to be calculated.");
Expand All @@ -191,7 +191,7 @@ void MqttManagerConfig::update_tft_checksums() {
std::lock_guard<std::mutex> lock_guard(MqttManagerConfig::_md5_checksum_files_mutex);
SPDLOG_INFO("Updating/calculating MD5 checksums for all .tft GUI files.");

auto eu_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft");
auto eu_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/eu/output_tft1/gui.tft"));
if (eu_tft1_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_eu_tft1 = eu_tft1_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for EU tft1 was not able to be calculated.");
Expand All @@ -201,7 +201,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for EU TFT1 Nextion GUI file!");
}

auto eu_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft");
auto eu_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/eu/output_tft2/gui.tft"));
if (eu_tft2_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_eu_tft2 = eu_tft2_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for EU tft2 was not able to be calculated.");
Expand All @@ -211,7 +211,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for EU TFT2 Nextion GUI file!");
}

auto eu_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft");
auto eu_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/eu/output_tft3/gui.tft"));
if (eu_tft3_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_eu_tft3 = eu_tft3_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for EU tft3 was not able to be calculated.");
Expand All @@ -221,7 +221,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for EU TFT3 Nextion GUI file!");
}

auto eu_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft");
auto eu_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/eu/output_tft4/gui.tft"));
if (eu_tft4_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_eu_tft4 = eu_tft4_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for EU tft4 was not able to be calculated.");
Expand All @@ -231,7 +231,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for EU TFT4 Nextion GUI file!");
}

auto us_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft");
auto us_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us/output_tft1/gui.tft"));
if (us_tft1_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_tft1 = us_tft1_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft1 was not able to be calculated.");
Expand All @@ -241,7 +241,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US TFT1 Nextion GUI file!");
}

auto us_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft");
auto us_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us/output_tft2/gui.tft"));
if (us_tft2_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_tft2 = us_tft2_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft2 was not able to be calculated.");
Expand All @@ -251,7 +251,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US TFT2 Nextion GUI file!");
}

auto us_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft");
auto us_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us/output_tft3/gui.tft"));
if (us_tft3_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_tft3 = us_tft3_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft3 was not able to be calculated.");
Expand All @@ -261,7 +261,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US TFT3 Nextion GUI file!");
}

auto us_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft");
auto us_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us/output_tft4/gui.tft"));
if (us_tft4_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_tft4 = us_tft4_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft4 was not able to be calculated.");
Expand All @@ -271,7 +271,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US TFT4 Nextion GUI file!");
}

auto us_tft1_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft");
auto us_tft1_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft"));
if (us_tft1_horizontal_mirrored_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1 = us_tft1_horizontal_mirrored_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft1 (mirrored) was not able to be calculated.");
Expand All @@ -281,7 +281,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT1 Nextion GUI file!");
}

auto us_tft2_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft");
auto us_tft2_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft"));
if (us_tft2_horizontal_mirrored_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2 = us_tft2_horizontal_mirrored_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft2 (mirrored) was not able to be calculated.");
Expand All @@ -291,7 +291,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT2 Nextion GUI file!");
}

auto us_tft3_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft");
auto us_tft3_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft"));
if (us_tft3_horizontal_mirrored_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3 = us_tft3_horizontal_mirrored_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft3 (mirrored) was not able to be calculated.");
Expand All @@ -301,7 +301,7 @@ void MqttManagerConfig::update_tft_checksums() {
SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT3 Nextion GUI file!");
}

auto us_tft4_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft");
auto us_tft4_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum(PREPEND_HMI_LOCATION("/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft"));
if (us_tft4_horizontal_mirrored_checksum.has_value()) {
MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4 = us_tft4_horizontal_mirrored_checksum.value();
WebsocketServer::remove_warning("MD5 checksum for US tft4 (mirrored) was not able to be calculated.");
Expand Down
2 changes: 2 additions & 0 deletions docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include <gtest/gtest.h>
#endif

#define PREPEND_HMI_LOCATION(file) "/usr/src/app/nspanelmanager" file

enum LightTurnOnBehaviour {
COLOR_TEMPERATURE,
RESTORE_PREVIOUS,
Expand Down
Loading