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

make sure to publish all turner states once at startup

Browse Source
This commit is contained in:
technyon
2022-04-03 16:02:01 +02:00
parent 90b47507d2
commit ca3fe61296
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Network.cpp
View File

@@ -29,13 +29,13 @@ void Network::initialize()
bool res = wm.autoConnect(); // password protected ap bool res = wm.autoConnect(); // password protected ap
if(!res) { if(!res) {
Serial.println("Failed to connect"); Serial.println(F("Failed to connect"));
return; return;
// ESP.restart(); // ESP.restart();
} }
else { else {
//if you get here you have connected to the WiFi //if you get here you have connected to the WiFi
Serial.println("connected...yeey :)"); Serial.println(F("connected...yeey :)"));
} }
const char* brokerAddr = _preferences->getString(preference_mqtt_broker).c_str(); const char* brokerAddr = _preferences->getString(preference_mqtt_broker).c_str();
@@ -96,25 +96,25 @@ bool Network::reconnect()
{ {
while (!_mqttClient.connected() && millis() > _nextReconnect) while (!_mqttClient.connected() && millis() > _nextReconnect)
{ {
Serial.println("Attempting MQTT connection"); Serial.println(F("Attempting MQTT connection"));
bool success = false; bool success = false;
if(strlen(_mqttUser) == 0) if(strlen(_mqttUser) == 0)
{ {
Serial.println("MQTT: Connecting without credentials"); Serial.println(F("MQTT: Connecting without credentials"));
success = _mqttClient.connect("nukiHub"); success = _mqttClient.connect("nukiHubx");
} }
else else
{ {
Serial.print("MQTT: Connecting with user: "); Serial.println(_mqttUser); Serial.print(F("MQTT: Connecting with user: ")); Serial.println(_mqttUser);
success = _mqttClient.connect("nukiHub", _mqttUser, _mqttPass); success = _mqttClient.connect("nukiHubx", _mqttUser, _mqttPass);
} }
if (success) { if (success) {
Serial.println(F("MQTT connected")); Serial.println(F("MQTT connected"));
_mqttConnected = true; _mqttConnected = true;
delay(200);
char path[200] = {0}; char path[200] = {0};
buildMqttPath(mqtt_topic_lockstate_action, path); buildMqttPath(mqtt_topic_lockstate_action, path);
// ... and resubscribe // ... and resubscribe
@@ -191,35 +191,35 @@ void Network::publishKeyTurnerState(const Nuki::KeyTurnerState& keyTurnerState,
{ {
char str[50]; char str[50];
if(keyTurnerState.lockState != lastKeyTurnerState.lockState) if(_firstTunerStatePublish || keyTurnerState.lockState != lastKeyTurnerState.lockState)
{ {
memset(&str, 0, sizeof(str)); memset(&str, 0, sizeof(str));
lockstateToString(keyTurnerState.lockState, str); lockstateToString(keyTurnerState.lockState, str);
publishString(mqtt_topic_lockstate_state, str); publishString(mqtt_topic_lockstate_state, str);
} }
if(keyTurnerState.trigger != lastKeyTurnerState.trigger) if(_firstTunerStatePublish || keyTurnerState.trigger != lastKeyTurnerState.trigger)
{ {
memset(&str, 0, sizeof(str)); memset(&str, 0, sizeof(str));
triggerToString(keyTurnerState.trigger, str); triggerToString(keyTurnerState.trigger, str);
publishString(mqtt_topic_lockstate_trigger, str); publishString(mqtt_topic_lockstate_trigger, str);
} }
if(keyTurnerState.lastLockActionCompletionStatus != lastKeyTurnerState.lastLockActionCompletionStatus) if(_firstTunerStatePublish || keyTurnerState.lastLockActionCompletionStatus != lastKeyTurnerState.lastLockActionCompletionStatus)
{ {
memset(&str, 0, sizeof(str)); memset(&str, 0, sizeof(str));
completionStatusToString(keyTurnerState.lastLockActionCompletionStatus, str); completionStatusToString(keyTurnerState.lastLockActionCompletionStatus, str);
publishString(mqtt_topic_lockstate_completionStatus, str); publishString(mqtt_topic_lockstate_completionStatus, str);
} }
if(keyTurnerState.doorSensorState != lastKeyTurnerState.doorSensorState) if(_firstTunerStatePublish || keyTurnerState.doorSensorState != lastKeyTurnerState.doorSensorState)
{ {
memset(&str, 0, sizeof(str)); memset(&str, 0, sizeof(str));
doorSensorStateToString(keyTurnerState.doorSensorState, str); doorSensorStateToString(keyTurnerState.doorSensorState, str);
publishString(mqtt_topic_door_sensor_state, str); publishString(mqtt_topic_door_sensor_state, str);
} }
if(keyTurnerState.criticalBatteryState != lastKeyTurnerState.criticalBatteryState) if(_firstTunerStatePublish || keyTurnerState.criticalBatteryState != lastKeyTurnerState.criticalBatteryState)
{ {
uint8_t level = (keyTurnerState.criticalBatteryState & 0b11111100) >> 1; uint8_t level = (keyTurnerState.criticalBatteryState & 0b11111100) >> 1;
bool critical = (keyTurnerState.criticalBatteryState & 0b00000001) > 0; bool critical = (keyTurnerState.criticalBatteryState & 0b00000001) > 0;
@@ -228,6 +228,8 @@ void Network::publishKeyTurnerState(const Nuki::KeyTurnerState& keyTurnerState,
publishBool(mqtt_topic_battery_critical, critical); publishBool(mqtt_topic_battery_critical, critical);
publishBool(mqtt_topic_battery_charging, charging); publishBool(mqtt_topic_battery_charging, charging);
} }
_firstTunerStatePublish = false;
} }
void Network::publishBatteryReport(const Nuki::BatteryReport& batteryReport) void Network::publishBatteryReport(const Nuki::BatteryReport& batteryReport)

2
Network.h
View File

@@ -46,5 +46,7 @@ private:
char _mqttUser[31] = {0}; char _mqttUser[31] = {0};
char _mqttPass[31] = {0}; char _mqttPass[31] = {0};
bool _firstTunerStatePublish = true;
void (*_lockActionReceivedCallback)(const char* value) = NULL; void (*_lockActionReceivedCallback)(const char* value) = NULL;
}; };