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

Merge branch 'master' into update-check

Browse Source
This commit is contained in:
iranl
2024-02-08 21:01:47 +01:00
committed by GitHub
parent 2c71fedcfa a9d80b33ef
commit d0d34ae9f1
11 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MqttTopics.h
View File

@@ -42,6 +42,7 @@
#define mqtt_topic_info_firmware_version "/info/firmwareVersion"
#define mqtt_topic_info_nuki_hub_version "/info/nukiHubVersion"
#define mqtt_topic_info_nuki_hub_latest "/info/nukiHubLatest"
#define mqtt_topic_info_nuki_hub_ip "/info/nukiHubIp"
#define mqtt_topic_keypad "/keypad"
#define mqtt_topic_keypad_command_action "/keypad/command/action"

36
Network.cpp
View File

@@ -514,6 +514,7 @@ bool Network::reconnect()
}
publishString(_maintenancePathPrefix, mqtt_topic_mqtt_connection_state, "online");
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_ip, _device->localIP().c_str());
_mqttConnectionState = 2;
for(const auto& callback : _reconnectedCallbacks)
@@ -752,6 +753,18 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
json["dev"]["mf"] = "Nuki";
json["dev"]["mdl"] = deviceType;
json["dev"]["name"] = name;
String cuUrl = _preferences->getString(preference_mqtt_hass_cu_url);
if (cuUrl != "")
{
json["dev"]["cu"] = cuUrl;
}
else
{
json["dev"]["cu"] = "http://" + _device->localIP();
}
json["~"] = baseTopic;
json["name"] = nullptr;
json["unique_id"] = String(uidString) + "_lock";
@@ -953,6 +966,23 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
{ { "enabled_by_default", "true" },
{"ic", "mdi:counter"}});
// NUKI Hub IP Address
publishHassTopic("sensor",
"nuki_hub_ip",
uidString,
"_nuki_hub_ip",
"NUKI Hub IP",
name,
baseTopic,
_lockPath + mqtt_topic_info_nuki_hub_ip,
deviceType,
"",
"",
"diagnostic",
"",
{ { "enabled_by_default", "true" },
{"ic", "mdi:ip"}});
// LED enabled
publishHassTopic("switch",
"led_enabled",
@@ -1427,6 +1457,12 @@ void Network::removeHASSConfig(char* uidString)
path.concat(uidString);
path.concat("/sound_level/config");
_device->mqttPublish(path.c_str(), MQTT_QOS_LEVEL, true, "");
path = discoveryTopic;
path.concat("/sensor/");
path.concat(uidString);
path.concat("/nuki_hub_ip/config");
_device->mqttPublish(path.c_str(), MQTT_QOS_LEVEL, true, "");
path = discoveryTopic;
path.concat("/number/");

3
PreferencesKeys.h
View File

@@ -20,6 +20,7 @@
#define preference_mqtt_crt "mqttcrt"
#define preference_mqtt_key "mqttkey"
#define preference_mqtt_hass_discovery "hassdiscovery"
#define preference_mqtt_hass_cu_url "hassConfigUrl"
#define preference_ip_dhcp_enabled "dhcpena"
#define preference_ip_address "ipaddr"
#define preference_ip_subnet "ipsub"
@@ -64,7 +65,7 @@ private:
preference_mqtt_user, preference_mqtt_password, preference_mqtt_log_enabled, preference_lock_enabled,
preference_mqtt_lock_path, preference_opener_enabled, preference_mqtt_opener_path,
preference_lock_max_keypad_code_count, preference_opener_max_keypad_code_count, preference_mqtt_ca,
preference_mqtt_crt, preference_mqtt_key, preference_mqtt_hass_discovery,
preference_mqtt_crt, preference_mqtt_key, preference_mqtt_hass_discovery, preference_mqtt_hass_cu_url,
preference_ip_dhcp_enabled, preference_ip_address, preference_ip_subnet, preference_ip_gateway, preference_ip_dns_server,
preference_network_hardware, preference_network_wifi_fallback_disabled, preference_rssi_publish_interval,
preference_hostname, preference_network_timeout, preference_restart_on_disconnect,

6
WebCfgServer.cpp
View File

@@ -352,6 +352,11 @@ bool WebCfgServer::processArgs(String& message)
configChanged = true;
}
}
else if(key == "HASSCUURL")
{
_preferences->putString(preference_mqtt_hass_cu_url, value);
configChanged = true;
}
else if(key == "HOSTNAME")
{
_preferences->putString(preference_hostname, value);
@@ -771,6 +776,7 @@ void WebCfgServer::buildMqttConfigHtml(String &response)
response.concat("<h3>Advanced MQTT and Network Configuration</h3>");
response.concat("<table>");
printInputField(response, "HASSDISCOVERY", "Home Assistant discovery topic (empty to disable; usually homeassistant)", _preferences->getString(preference_mqtt_hass_discovery).c_str(), 30);
printInputField(response, "HASSCUURL", "Home Assistant device configuration URL (empty to use http://LOCALIP; fill when using a reverse proxy for example)", _preferences->getString(preference_mqtt_hass_cu_url).c_str(), 261);
printTextarea(response, "MQTTCA", "MQTT SSL CA Certificate (*, optional)", _preferences->getString(preference_mqtt_ca).c_str(), TLS_CA_MAX_SIZE, _network->encryptionSupported(), true);
printTextarea(response, "MQTTCRT", "MQTT SSL Client Certificate (*, optional)", _preferences->getString(preference_mqtt_crt).c_str(), TLS_CERT_MAX_SIZE, _network->encryptionSupported(), true);
printTextarea(response, "MQTTKEY", "MQTT SSL Client Key (*, optional)", _preferences->getString(preference_mqtt_key).c_str(), TLS_KEY_MAX_SIZE, _network->encryptionSupported(), true);

5
networkDevices/EthLan8720Device.cpp
View File

@@ -159,6 +159,11 @@ int8_t EthLan8720Device::signalStrength()
return -1;
}
String EthLan8720Device::localIP()
{
return ETH.localIP().toString();
}
void EthLan8720Device::mqttSetClientId(const char *clientId)
{
if(_useEncryption)

2
networkDevices/EthLan8720Device.h
View File

@@ -36,6 +36,8 @@ public:
virtual bool isConnected();
int8_t signalStrength() override;
String localIP() override;
void mqttSetClientId(const char *clientId) override;

2
networkDevices/NetworkDevice.h
View File

@@ -31,6 +31,8 @@ public:
virtual bool isConnected() = 0;
virtual int8_t signalStrength() = 0;
virtual String localIP() = 0;
virtual void mqttSetClientId(const char* clientId) = 0;
virtual void mqttSetCleanSession(bool cleanSession) = 0;

5
networkDevices/W5500Device.cpp
View File

@@ -229,6 +229,11 @@ int8_t W5500Device::signalStrength()
return 127;
}
String W5500Device::localIP()
{
return Ethernet.localIP().toString();
}
void W5500Device::mqttSetClientId(const char *clientId)
{
_mqttClient.setClientId(clientId);

2
networkDevices/W5500Device.h
View File

@@ -32,6 +32,8 @@ public:
virtual bool isConnected();
int8_t signalStrength() override;
String localIP() override;
void mqttSetClientId(const char *clientId) override;

5
networkDevices/WifiDevice.cpp
View File

@@ -180,6 +180,11 @@ int8_t WifiDevice::signalStrength()
return WiFi.RSSI();
}
String WifiDevice::localIP()
{
return WiFi.localIP().toString();
}
void WifiDevice::clearRtcInitVar(WiFiManager *)
{
memset(WiFiDevice_reconfdetect, 0, sizeof WiFiDevice_reconfdetect);

2
networkDevices/WifiDevice.h
View File

@@ -26,6 +26,8 @@ public:
virtual bool isConnected();
int8_t signalStrength() override;
String localIP() override;
void mqttSetClientId(const char *clientId) override;