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

Initial HASS autodiscovery support

Browse Source
This commit is contained in:
rodriguezst
2022-06-19 09:51:07 +00:00
committed by GitHub
parent 6e3371df3d
commit 9f68e67ce8
8 changed files with 83 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Network.cpp
View File

@@ -343,6 +343,36 @@ void Network::publishPresenceDetection(char *csv)
_presenceCsv = csv;
}
void Network::publishHASSConfig(const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState)
{
String configJSON = "{\"~\": \"";
configJSON.concat(baseTopic);
configJSON.concat("\", \"name\": \"");
configJSON.concat(name);
configJSON.concat("\", \"unique_id\": \"");
configJSON.concat(uidString);
configJSON.concat("\", \"cmd_t\": \"~/lock/action\", \"pl_lock\": \"");
configJSON.concat(lockAction);
configJSON.concat("\", \"pl_unlk\": \"");
configJSON.concat(unlockAction);
configJSON.concat("\", \"pl_open\": \"");
configJSON.concat(openAction);
configJSON.concat("\", \"stat_t\": \"~/lock/state\", \"stat_locked\": \"");
configJSON.concat(lockedState);
configJSON.concat("\", \"stat_unlocked\": \"");
configJSON.concat(unlockedState);
configJSON.concat("\", \"opt\": \"false\"}");
String path = "homeassistant/lock/";
path.concat(uidString);
path.concat("/config");
Serial.println("HASS Config:");
Serial.println(configJSON);
_device->mqttClient()->publish(path.c_str(), configJSON.c_str(), true);
}
void Network::setLockActionReceivedCallback(bool (*lockActionReceivedCallback)(const char *))
{
_lockActionReceivedCallback = lockActionReceivedCallback;

1
Network.h
View File

@@ -36,6 +36,7 @@ public:
void publishConfig(const NukiLock::Config& config);
void publishAdvancedConfig(const NukiLock::AdvancedConfig& config);
void publishPresenceDetection(char* csv);
void publishHASSConfig(const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState);
void setLockActionReceivedCallback(bool (*lockActionReceivedCallback)(const char* value));
void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* path, const char* value));

5
NetworkOpener.cpp
View File

@@ -166,6 +166,11 @@ void NetworkOpener::publishAdvancedConfig(const NukiOpener::AdvancedConfig &conf
// publishBool(mqtt_topic_config_auto_lock, config.autoLockEnabled == 1);
}
void NetworkOpener::publishHASSConfig(const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState)
{
_network->publishHASSConfig(baseTopic, name, uidString, lockAction, unlockAction, openAction, lockedState, unlockedState);
}
void NetworkOpener::setLockActionReceivedCallback(bool (*lockActionReceivedCallback)(const char *))
{
_lockActionReceivedCallback = lockActionReceivedCallback;

1
NetworkOpener.h
View File

@@ -26,6 +26,7 @@ public:
void publishBatteryReport(const NukiOpener::BatteryReport& batteryReport);
void publishConfig(const NukiOpener::Config& config);
void publishAdvancedConfig(const NukiOpener::AdvancedConfig& config);
void publishHASSConfig(const char* baseTopic, char* name, char* uidString, char* lockAction, char* unlockAction, char* openAction, char* lockedState, char* unlockedState);
void setLockActionReceivedCallback(bool (*lockActionReceivedCallback)(const char* value));
void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* path, const char* value));

21
NukiOpenerWrapper.cpp
View File

@@ -75,6 +75,7 @@ void NukiOpenerWrapper::update()
if (_nukiOpener.pairNuki() == NukiOpener::PairingResult::Success) {
Serial.println(F("Nuki opener paired"));
_paired = true;
setupHASS();
}
else
{
@@ -299,3 +300,23 @@ void NukiOpenerWrapper::readAdvancedConfig()
_nukiAdvancedConfigValid = result == Nuki::CmdResult::Success;
Serial.println(result);
}
void NukiOpenerWrapper::setupHASS()
{
if(!_nukiConfigValid) // only ask for config once to save battery life
{
Nuki::CmdResult result = _nukiOpener.requestConfig(&_nukiConfig);
_nukiConfigValid = result == Nuki::CmdResult::Success;
}
if (_nukiConfigValid)
{
String baseTopic = _preferences->getString(preference_mqtt_opener_path);
char uidString[20];
itoa(_nukiConfig.nukiId, uidString, 16);
_network->publishHASSConfig(baseTopic.c_str(),(char*)_nukiConfig.name,uidString,"deactivateRTO","activateRTO","electricStrikeActuation","locked","RTOactive");
}
else
{
Serial.println(F("Unable to setup HASS. Invalid config received."));
}
}

2
NukiOpenerWrapper.h
View File

@@ -39,6 +39,8 @@ private:
void readConfig();
void readAdvancedConfig();
void setupHASS();
NukiOpener::LockAction lockActionToEnum(const char* str); // char array at least 14 characters
std::string _deviceName;

21
NukiWrapper.cpp
View File

@@ -76,6 +76,7 @@ void NukiWrapper::update()
if (_nukiLock.pairNuki() == Nuki::PairingResult::Success) {
Serial.println(F("Nuki paired"));
_paired = true;
setupHASS();
}
else
{
@@ -321,3 +322,23 @@ void NukiWrapper::readAdvancedConfig()
_nukiAdvancedConfigValid = result == Nuki::CmdResult::Success;
Serial.println(result);
}
void NukiWrapper::setupHASS()
{
if(!_nukiConfigValid) // only ask for config once to save battery life
{
Nuki::CmdResult result = _nukiLock.requestConfig(&_nukiConfig);
_nukiConfigValid = result == Nuki::CmdResult::Success;
}
if (_nukiConfigValid)
{
String baseTopic = _preferences->getString(preference_mqtt_lock_path);
char uidString[20];
itoa(_nukiConfig.nukiId, uidString, 16);
_network->publishHASSConfig(baseTopic.c_str(),(char*)_nukiConfig.name,uidString,"lock","unlock","unlatch","locked","unlocked");
}
else
{
Serial.println(F("Unable to setup HASS. Invalid config received."));
}
}

2
NukiWrapper.h
View File

@@ -37,6 +37,8 @@ private:
void readConfig();
void readAdvancedConfig();
void setupHASS();
NukiLock::LockAction lockActionToEnum(const char* str); // char array at least 14 characters
std::string _deviceName;