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

remove ha auto discovery lock'n'go for opener

Browse Source
This commit is contained in:
technyon
2024-02-04 17:03:50 +01:00
parent 8841bc95b3
commit de117f5a06
4 changed files with 43 additions and 35 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.31" #define NUKI_HUB_VERSION "8.32-pre-3"
#define MQTT_QOS_LEVEL 1 #define MQTT_QOS_LEVEL 1
#define MQTT_CLEAN_SESSIONS false #define MQTT_CLEAN_SESSIONS false

44
Network.cpp
View File

@@ -943,6 +943,29 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
{ "state_on", "1" }, { "state_on", "1" },
{ "state_off", "0" }}); { "state_off", "0" }});
// Unlatch
publishHassTopic("button",
"unlatch",
uidString,
"_unlatch_button",
"Unlatch",
name,
baseTopic,
mqtt_topic_mqtt_connection_state,
deviceType,
"",
"",
"",
mqtt_topic_lock_action,
{ { "enabled_by_default", "false" },
{ "pl_prs", "unlatch" }});
}
}
void Network::publishHASSConfigAdditionalButtons(char *deviceType, const char *baseTopic, char *name, char *uidString, const char *availabilityTopic, const bool &hasKeypad, char *lockAction, char *unlockAction, char *openAction, char *lockedState, char *unlockedState)
{
// Lock 'n' Go // Lock 'n' Go
publishHassTopic("button", publishHassTopic("button",
"lockngo", "lockngo",
@@ -976,26 +999,9 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
mqtt_topic_lock_action, mqtt_topic_lock_action,
{ { "enabled_by_default", "false" }, { { "enabled_by_default", "false" },
{ "pl_prs", "lockNgoUnlatch" }}); { "pl_prs", "lockNgoUnlatch" }});
// Unlatch
publishHassTopic("button",
"unlatch",
uidString,
"_unlatch_button",
"Unlatch",
name,
baseTopic,
mqtt_topic_mqtt_connection_state,
deviceType,
"",
"",
"",
mqtt_topic_lock_action,
{ { "enabled_by_default", "false" },
{ "pl_prs", "unlatch" }});
}
} }
//json["cmd_t"] = String("~") + String(mqtt_topic_lock_action); //json["cmd_t"] = String("~") + String(mqtt_topic_lock_action);
void Network::publishHASSConfigBatLevel(char *deviceType, const char *baseTopic, char *name, char *uidString) void Network::publishHASSConfigBatLevel(char *deviceType, const char *baseTopic, char *name, char *uidString)
{ {

1
Network.h
View File

@@ -44,6 +44,7 @@ public:
bool publishString(const char* prefix, const char* topic, const char* value); bool publishString(const char* prefix, const char* topic, const char* value);
void publishHASSConfig(char* deviceType, const char* baseTopic, char* name, char* uidString, const char* availabilityTopic, const bool& hasKeypad, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState); void publishHASSConfig(char* deviceType, const char* baseTopic, char* name, char* uidString, const char* availabilityTopic, const bool& hasKeypad, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState);
void publishHASSConfigAdditionalButtons(char* deviceType, const char* baseTopic, char* name, char* uidString, const char* availabilityTopic, const bool& hasKeypad, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState);
void publishHASSConfigBatLevel(char* deviceType, const char* baseTopic, char* name, char* uidString); void publishHASSConfigBatLevel(char* deviceType, const char* baseTopic, char* name, char* uidString);
void publishHASSConfigDoorSensor(char* deviceType, const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState); void publishHASSConfigDoorSensor(char* deviceType, const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState);
void publishHASSConfigRingDetect(char* deviceType, const char* baseTopic, char* name, char* uidString); void publishHASSConfigRingDetect(char* deviceType, const char* baseTopic, char* name, char* uidString);

1
NetworkLock.cpp
View File

@@ -532,6 +532,7 @@ void NetworkLock::publishHASSConfig(char *deviceType, const char *baseTopic, cha
char *unlockAction, char *openAction, char *lockedState, char *unlockedState) char *unlockAction, char *openAction, char *lockedState, char *unlockedState)
{ {
_network->publishHASSConfig(deviceType, baseTopic, name, uidString, "~/maintenance/mqttConnectionState", hasKeypad, lockAction, unlockAction, openAction, lockedState, unlockedState); _network->publishHASSConfig(deviceType, baseTopic, name, uidString, "~/maintenance/mqttConnectionState", hasKeypad, lockAction, unlockAction, openAction, lockedState, unlockedState);
_network->publishHASSConfigAdditionalButtons(deviceType, baseTopic, name, uidString, "~/maintenance/mqttConnectionState", hasKeypad, lockAction, unlockAction, openAction, lockedState, unlockedState);
_network->publishHASSConfigBatLevel(deviceType, baseTopic, name, uidString); _network->publishHASSConfigBatLevel(deviceType, baseTopic, name, uidString);
_network->publishHASSConfigLedBrightness(deviceType, baseTopic, name, uidString); _network->publishHASSConfigLedBrightness(deviceType, baseTopic, name, uidString);
if(hasDoorSensor) if(hasDoorSensor)