Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add firmware and hardware version to mqtt

Browse Source
This commit is contained in:
technyon
2023-02-20 20:38:51 +01:00
parent e4d973b36b
commit 4676f24e5f
5 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Config.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#define NUKI_HUB_VERSION "8.9-json-6" #define NUKI_HUB_VERSION "8.10"
#define MQTT_QOS_LEVEL 1 #define MQTT_QOS_LEVEL 1
#define MQTT_CLEAN_SESSIONS false #define MQTT_CLEAN_SESSIONS false

4
MqttTopics.h
View File

@@ -35,6 +35,10 @@
#define mqtt_topic_config_single_lock "/configuration/singleLock" #define mqtt_topic_config_single_lock "/configuration/singleLock"
#define mqtt_topic_config_sound_level "/configuration/soundLevel" #define mqtt_topic_config_sound_level "/configuration/soundLevel"
#define mqtt_topic_info_hardware_version "/info/hardwareVersion"
#define mqtt_topic_info_firmware_version "/info/firmwareVersion"
#define mqtt_topic_keypad "/keypad" #define mqtt_topic_keypad "/keypad"
#define mqtt_topic_keypad_command_action "/keypad/command/action" #define mqtt_topic_keypad_command_action "/keypad/command/action"
#define mqtt_topic_keypad_command_id "/keypad/command/id" #define mqtt_topic_keypad_command_id "/keypad/command/id"

34
Network.cpp
View File

@@ -652,6 +652,40 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
"", "",
{ { "enabled_by_default", "true" } }); { { "enabled_by_default", "true" } });
// Firmware version
publishHassTopic("sensor",
"firmware_version",
uidString,
"_firmware_version",
"Firmware version",
name,
baseTopic,
mqtt_topic_info_firmware_version,
deviceType,
"",
"",
"diagnostic",
"",
{ { "enabled_by_default", "true" },
{"ic", "mdi:counter"}});
// Firmware version
publishHassTopic("sensor",
"hardware_version",
uidString,
"_hardware_version",
"Hardware version",
name,
baseTopic,
mqtt_topic_info_hardware_version,
deviceType,
"",
"",
"diagnostic",
"",
{ { "enabled_by_default", "true" },
{"ic", "mdi:counter"}});
// LED enabled // LED enabled
publishHassTopic("switch", publishHassTopic("switch",
"led_enabled", "led_enabled",

2
NetworkLock.cpp
View File

@@ -405,6 +405,8 @@ void NetworkLock::publishConfig(const NukiLock::Config &config)
publishBool(mqtt_topic_config_led_enabled, config.ledEnabled == 1); publishBool(mqtt_topic_config_led_enabled, config.ledEnabled == 1);
publishInt(mqtt_topic_config_led_brightness, config.ledBrightness); publishInt(mqtt_topic_config_led_brightness, config.ledBrightness);
publishBool(mqtt_topic_config_single_lock, config.singleLock == 1); publishBool(mqtt_topic_config_single_lock, config.singleLock == 1);
publishString(mqtt_topic_info_firmware_version, std::to_string(config.firmwareVersion[0]) + "." + std::to_string(config.firmwareVersion[1]) + "." + std::to_string(config.firmwareVersion[2]));
publishString(mqtt_topic_info_hardware_version, std::to_string(config.hardwareRevision[0]) + "." + std::to_string(config.hardwareRevision[1]));
} }
void NetworkLock::publishAdvancedConfig(const NukiLock::AdvancedConfig &config) void NetworkLock::publishAdvancedConfig(const NukiLock::AdvancedConfig &config)

2
NetworkOpener.cpp
View File

@@ -451,6 +451,8 @@ void NetworkOpener::publishConfig(const NukiOpener::Config &config)
{ {
publishBool(mqtt_topic_config_button_enabled, config.buttonEnabled == 1); publishBool(mqtt_topic_config_button_enabled, config.buttonEnabled == 1);
publishBool(mqtt_topic_config_led_enabled, config.ledFlashEnabled == 1); publishBool(mqtt_topic_config_led_enabled, config.ledFlashEnabled == 1);
publishString(mqtt_topic_info_firmware_version, std::to_string(config.firmwareVersion[0]) + "." + std::to_string(config.firmwareVersion[1]) + "." + std::to_string(config.firmwareVersion[2]));
publishString(mqtt_topic_info_hardware_version, std::to_string(config.hardwareRevision[0]) + "." + std::to_string(config.hardwareRevision[1]));
} }
void NetworkOpener::publishAdvancedConfig(const NukiOpener::AdvancedConfig &config) void NetworkOpener::publishAdvancedConfig(const NukiOpener::AdvancedConfig &config)