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

Merge branch 'master' into update-tasks

Browse Source
This commit is contained in:
iranl
2024-05-26 21:27:29 +02:00
committed by GitHub
parent acad87b308 e598fc5677
commit 728bd5f818
33 changed files with 1065 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Network.cpp
View File

@@ -359,6 +359,7 @@ bool Network::update()
}
if (!_versionPublished) {
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_version, NUKI_HUB_VERSION);
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_build, NUKI_HUB_BUILD);
_versionPublished = true;
}
_lastMaintenanceTs = ts;
@@ -598,7 +599,8 @@ void Network::registerMqttReceiver(MqttReceiver* receiver)
void Network::onMqttDataReceivedCallback(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total)
{
uint8_t value[360] = {0};
uint8_t value[800] = {0};
size_t l = min(len, sizeof(value)-1);
for(int i=0; i<l; i++)
@@ -692,6 +694,11 @@ const String Network::networkDeviceName() const
return _device->deviceName();
}
const String Network::networkBSSID() const
{
return _device->BSSIDstr();
}
void Network::publishFloat(const char* prefix, const char* topic, const float value, const uint8_t precision)
{
char str[30];
@@ -928,6 +935,23 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
"",
{ { (char*)"en", (char*)"true" },
{(char*)"ic", (char*)"mdi:counter"}});
// Nuki Hub build
publishHassTopic("sensor",
"nuki_hub_build",
uidString,
"_nuki_hub_build",
"Nuki Hub build",
name,
baseTopic,
_lockPath + mqtt_topic_info_nuki_hub_build,
deviceType,
"",
"",
"diagnostic",
"",
{ { (char*)"en", (char*)"true" },
{(char*)"ic", (char*)"mdi:counter"}});
if(_preferences->getBool(preference_check_updates))
{
@@ -3141,6 +3165,7 @@ void Network::removeHASSConfig(char* uidString)
removeHassTopic((char*)"sensor", (char*)"firmware_version", uidString);
removeHassTopic((char*)"sensor", (char*)"hardware_version", uidString);
removeHassTopic((char*)"sensor", (char*)"nuki_hub_version", uidString);
removeHassTopic((char*)"sensor", (char*)"nuki_hub_build", uidString);
removeHassTopic((char*)"sensor", (char*)"nuki_hub_latest", uidString);
removeHassTopic((char*)"update", (char*)"nuki_hub_update", uidString);
removeHassTopic((char*)"sensor", (char*)"nuki_hub_ip", uidString);