Merge branch 'technyon:master' into update-wifimanager

src/MqttTopics.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #define mqtt_topic_lock_action "/lock/action"
+#define mqtt_topic_lock_status_updated "/lock/statusUpdated"
 #define mqtt_topic_lock_state "/lock/state"
 #define mqtt_topic_lock_ha_state "/lock/hastate"
 #define mqtt_topic_lock_json "/lock/json"

src/NetworkLock.cpp

@@ -241,7 +241,7 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
 
     lockstateToString(keyTurnerState.lockState, str);
 
-    if((_firstTunerStatePublish || keyTurnerState.lockState != lastKeyTurnerState.lockState) && keyTurnerState.lockState != NukiLock::LockState::Undefined)
+    if(keyTurnerState.lockState != NukiLock::LockState::Undefined)
     {
 
         publishString(mqtt_topic_lock_state, str);
@@ -253,6 +253,7 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
     }
 
     json["lock_state"] = str;
+    json["lockngo_state"] = (keyTurnerState.lockNgoTimer == 0 ? 0 : 1);
 
     memset(&str, 0, sizeof(str));
     triggerToString(keyTurnerState.trigger, str);
@@ -263,6 +264,12 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
     }
 
     json["trigger"] = str;
+    
+    char curTime[20];
+    sprintf(curTime, "%04d-%02d-%02d %02d:%02d:%02d", keyTurnerState.currentTimeYear, keyTurnerState.currentTimeMonth, keyTurnerState.currentTimeDay, keyTurnerState.currentTimeHour, keyTurnerState.currentTimeMinute, keyTurnerState.currentTimeSecond);
+    json["currentTime"] = curTime;
+    json["timeZoneOffset"] = keyTurnerState.timeZoneOffset;
+    json["nightModeActive"] = keyTurnerState.nightModeActive;
 
     memset(&str, 0, sizeof(str));
     lockactionToString(keyTurnerState.lastLockAction, str);
@@ -274,6 +281,10 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
 
     json["last_lock_action"] = str;
 
+    memset(&str, 0, sizeof(str));
+    triggerToString(keyTurnerState.lastLockActionTrigger, str);
+    json["last_lock_action_trigger"] = str;
+
     memset(&str, 0, sizeof(str));
     NukiLock::completionStatusToString(keyTurnerState.lastLockActionCompletionStatus, str);
 
@@ -806,6 +817,11 @@ void NetworkLock::publishTimeControlCommandResult(const char* result)
     publishString(mqtt_topic_timecontrol_command_result, result);
 }
 
+void NetworkLock::publishStatusUpdated(const bool statusUpdated)
+{
+    publishBool(mqtt_topic_lock_status_updated, statusUpdated);
+}
+
 void NetworkLock::setLockActionReceivedCallback(LockActionResult (*lockActionReceivedCallback)(const char *))
 {
     _lockActionReceivedCallback = lockActionReceivedCallback;

src/NetworkLock.h

@@ -38,6 +38,7 @@ public:
     void removeHASSConfig(char* uidString);
     void publishKeypad(const std::list<NukiLock::KeypadEntry>& entries, uint maxKeypadCodeCount);
     void publishTimeControl(const std::list<NukiLock::TimeControlEntry>& timeControlEntries);
+    void publishStatusUpdated(const bool statusUpdated);
     void publishConfigCommandResult(const char* result);
     void publishKeypadCommandResult(const char* result);
     void publishKeypadJsonCommandResult(const char* result);

src/NetworkOpener.cpp

@@ -265,6 +265,25 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn
     }
 
     json["trigger"] = str;
+    
+    json["ringToOpenTimer"] = keyTurnerState.ringToOpenTimer;
+    char curTime[20];
+    sprintf(curTime, "%04d-%02d-%02d %02d:%02d:%02d", keyTurnerState.currentTimeYear, keyTurnerState.currentTimeMonth, keyTurnerState.currentTimeDay, keyTurnerState.currentTimeHour, keyTurnerState.currentTimeMinute, keyTurnerState.currentTimeSecond);
+    json["currentTime"] = curTime;
+    json["timeZoneOffset"] = keyTurnerState.timeZoneOffset;
+
+    lockactionToString(keyTurnerState.lastLockAction, str);
+
+    if(_firstTunerStatePublish || keyTurnerState.lastLockAction != lastKeyTurnerState.lastLockAction)
+    {
+        publishString(mqtt_topic_lock_last_lock_action, str);
+    }
+
+    json["last_lock_action"] = str;
+
+    memset(&str, 0, sizeof(str));
+    triggerToString(keyTurnerState.lastLockActionTrigger, str);
+    json["last_lock_action_trigger"] = str;
 
     memset(&str, 0, sizeof(str));
     completionStatusToString(keyTurnerState.lastLockActionCompletionStatus, str);
@@ -864,6 +883,11 @@ void NetworkOpener::publishTimeControlCommandResult(const char* result)
 {
     publishString(mqtt_topic_timecontrol_command_result, result);
 }
+
+void NetworkOpener::publishStatusUpdated(const bool statusUpdated)
+{
+    publishBool(mqtt_topic_lock_status_updated, statusUpdated);
+}
   
 void NetworkOpener::setLockActionReceivedCallback(LockActionResult (*lockActionReceivedCallback)(const char *))
 {

src/NetworkOpener.h

@@ -35,6 +35,7 @@ public:
     void removeHASSConfig(char* uidString);
     void publishKeypad(const std::list<NukiLock::KeypadEntry>& entries, uint maxKeypadCodeCount);
     void publishTimeControl(const std::list<NukiOpener::TimeControlEntry>& timeControlEntries);
+    void publishStatusUpdated(const bool statusUpdated);
     void publishConfigCommandResult(const char* result);
     void publishKeypadCommandResult(const char* result);
     void publishKeypadJsonCommandResult(const char* result);

src/NukiOpenerWrapper.cpp

@@ -154,9 +154,10 @@ void NukiOpenerWrapper::update()
 
     if(_statusUpdated || _nextLockStateUpdateTs == 0 || ts >= _nextLockStateUpdateTs || (queryCommands & QUERY_COMMAND_LOCKSTATE) > 0)
     {
+        _statusUpdated = false;
         _nextLockStateUpdateTs = ts + _intervalLockstate * 1000;
         updateKeyTurnerState();
-        _statusUpdated = false;
+        _network->publishStatusUpdated(_statusUpdated);
     }
     if(_nextBatteryReportTs == 0 || ts > _nextBatteryReportTs || (queryCommands & QUERY_COMMAND_BATTERY) > 0)
     {
@@ -1964,6 +1965,7 @@ void NukiOpenerWrapper::notify(Nuki::EventType eventType)
     if(eventType == Nuki::EventType::KeyTurnerStatusUpdated)
     {
         _statusUpdated = true;
+        _network->publishStatusUpdated(_statusUpdated);
     }
 }
 

src/NukiWrapper.cpp

@@ -176,6 +176,7 @@ void NukiWrapper::update()
         _statusUpdated = false;
         _nextLockStateUpdateTs = ts + _intervalLockstate * 1000;
         updateKeyTurnerState();
+        _network->publishStatusUpdated(_statusUpdated);
     }
     if(_nextBatteryReportTs == 0 || ts > _nextBatteryReportTs || (queryCommands & QUERY_COMMAND_BATTERY) > 0)
     {
@@ -1940,6 +1941,7 @@ void NukiWrapper::notify(Nuki::EventType eventType)
     if(eventType == Nuki::EventType::KeyTurnerStatusUpdated)
     {
         _statusUpdated = true;
+        _network->publishStatusUpdated(_statusUpdated);
     }
 }