refactor: use MAX state if n/a

Author: rednblkx

main/LockManager.cpp

@@ -212,8 +212,8 @@ void LockManager::overrideState(uint8_t c_state, uint8_t t_state) {
 
     ESP_LOGI(TAG, "External source reported new c_state: %d t_state: %d. Overriding internal state.", c_state, t_state);
 
-    m_currentState = c_state != 255 ? c_state : m_currentState;
-    m_targetState = t_state != 255 ? t_state : m_targetState;
+    m_currentState = c_state != lockStates::MAX ? c_state : m_currentState;
+    m_targetState = t_state != lockStates::MAX ? t_state : m_targetState;
 
     if(momentaryStateTimer && esp_timer_is_active(momentaryStateTimer)) esp_timer_stop(momentaryStateTimer);
     EventLockState s{

main/MqttManager.cpp

@@ -393,12 +393,12 @@ void MqttManager::onData(const std::string& topic, const std::string& data) {
                topic == m_mqttConfig.lockCustomStateCmd) {
       uint8_t v; if (!to_u8(data, v)) { ESP_LOGW(TAG, "Invalid lockCStateCmd payload: %s", data.c_str()); return; }
       if (m_mqttConfig.customLockStates.at("C_UNLOCKING") == v) {
-        s.currentState = LockManager::UNKNOWN;
+        s.currentState = LockManager::MAX;
         s.targetState = LockManager::UNLOCKED;
         size_t d_len = alpaca::serialize(s, d);
         AppEventLoop::publish(LOCK_EVENT, LOCK_TARGET_STATE_CHANGED, d.data(), d_len);
       } else if (m_mqttConfig.customLockStates.at("C_LOCKING") == v) {
-        s.currentState = LockManager::UNKNOWN;
+        s.currentState = LockManager::MAX;
         s.targetState = LockManager::LOCKED;
         size_t d_len = alpaca::serialize(s, d);
         AppEventLoop::publish(LOCK_EVENT, LOCK_TARGET_STATE_CHANGED, d.data(), d_len);
@@ -414,12 +414,12 @@ void MqttManager::onData(const std::string& topic, const std::string& data) {
         AppEventLoop::publish(LOCK_EVENT, LOCK_OVERRIDE_STATE, d.data(), d_len);
       } else if (m_mqttConfig.customLockStates.at("C_JAMMED") == v) {
         s.currentState = LockManager::JAMMED;
-        s.targetState = LockManager::JAMMED;
+        s.targetState = LockManager::MAX;
         size_t d_len = alpaca::serialize(s, d);
         AppEventLoop::publish(LOCK_EVENT, LOCK_OVERRIDE_STATE, d.data(), d_len);
       } else if (m_mqttConfig.customLockStates.at("C_UNKNOWN") == v) {
         s.currentState = LockManager::UNKNOWN;
-        s.targetState = LockManager::UNKNOWN;
+        s.targetState = LockManager::MAX;
         size_t d_len = alpaca::serialize(s, d);
         AppEventLoop::publish(LOCK_EVENT, LOCK_OVERRIDE_STATE, d.data(), d_len);
       }

main/include/LockManager.hpp

@@ -30,7 +30,7 @@ class LockManager {
         MQTT,
     };
 
-    enum lockStates { UNLOCKED, LOCKED, JAMMED, UNKNOWN, UNLOCKING, LOCKING };
+    enum lockStates { UNLOCKED, LOCKED, JAMMED, UNKNOWN, UNLOCKING, LOCKING, MAX };
 
     /**
      * @brief Constructs the LockManager.