From 157d4f9b8159d51fd5346060e43572a28898c550 Mon Sep 17 00:00:00 2001
From: iranl <iranl@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:14:56 +0100
Subject: [PATCH] Fixes

---
 Network.cpp       |  2 +-
 NetworkLock.cpp   | 15 +--------------
 NetworkOpener.cpp |  6 +-----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/Network.cpp b/Network.cpp
index 92c1e5e..528d861 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -740,7 +740,7 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
         json["pl_lock"] = lockAction;
         json["pl_unlk"] = unlockAction;
         json["pl_open"] = openAction;
-        json["stat_t"] = String("~") + mqtt_topic_lock_binary_state;
+        json["stat_t"] = String("~") + mqtt_topic_lock_state;
         json["stat_jammed"] = "jammed";
         json["stat_locked"] = "locked";
         json["stat_locking"] = "locking";
diff --git a/NetworkLock.cpp b/NetworkLock.cpp
index d6fcb00..19803e7 100644
--- a/NetworkLock.cpp
+++ b/NetworkLock.cpp
@@ -281,29 +281,16 @@ void NetworkLock::publishBinaryState(NukiLock::LockState lockState)
     switch(lockState)
     {
         case NukiLock::LockState::Locked:
+        case NukiLock::LockState::Locking:
             publishString(mqtt_topic_lock_binary_state, "locked");
             break;
-        case NukiLock::LockState::Locking:
-            publishString(mqtt_topic_lock_binary_state, "locking");
-            break;
         case NukiLock::LockState::Unlocked:
-            publishString(mqtt_topic_lock_binary_state, "unlocked");
-            break;
         case NukiLock::LockState::Unlocking:
-            publishString(mqtt_topic_lock_binary_state, "unlocking");
-            break;
         case NukiLock::LockState::Unlatched:
-            publishString(mqtt_topic_lock_binary_state, "unlatched");
-            break;
         case NukiLock::LockState::Unlatching:
-            publishString(mqtt_topic_lock_binary_state, "unlatching");
-            break;
         case NukiLock::LockState::UnlockedLnga:
             publishString(mqtt_topic_lock_binary_state, "unlocked");
             break;
-        case NukiLock::LockState::MotorBlocked:
-            publishString(mqtt_topic_lock_binary_state, "jammed");
-            break;
         default:
             break;
     }
diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp
index 9287361..132dab8 100644
--- a/NetworkOpener.cpp
+++ b/NetworkOpener.cpp
@@ -274,13 +274,9 @@ void NetworkOpener::publishBinaryState(NukiOpener::OpenerState lockState)
                 publishString(mqtt_topic_lock_binary_state, "locked");
                 break;
             case NukiOpener::LockState::RTOactive:
-                publishString(mqtt_topic_lock_binary_state, "unlocked");
-                break;
             case NukiOpener::LockState::Open:
-                publishString(mqtt_topic_lock_binary_state, "unlocked");
-                break;
             case NukiOpener::LockState::Opening:
-                publishString(mqtt_topic_lock_binary_state, "unlocking");
+                publishString(mqtt_topic_lock_binary_state, "unlocked");
                 break;
             default:
                 break;