Merge pull request #692 from iranl/fix-rolling-log

Save rolling log to preferences

src/NukiNetworkLock.cpp

@@ -35,6 +35,8 @@ NukiNetworkLock::~NukiNetworkLock()
 
 void NukiNetworkLock::initialize()
 {
+    _lastRollingLog = _preferences->getInt(preference_lock_log_num, 0);
+    
     String mqttPath = _preferences->getString(preference_mqtt_lock_path, "");
     mqttPath.concat("/lock");
 
@@ -203,6 +205,7 @@ void NukiNetworkLock::onMqttDataReceived(const char* topic, byte* payload, const
         return;
     }
 
+    /*
     if(comparePrefixedPath(topic, mqtt_topic_lock_log_rolling_last))
     {
         if(strcmp(data, "") == 0 ||
@@ -216,6 +219,7 @@ void NukiNetworkLock::onMqttDataReceived(const char* topic, byte* payload, const
             _lastRollingLog = atoi(data);
         }
     }
+    */
 
     if(_nukiOfficial->getOffEnabled())
     {
@@ -770,6 +774,7 @@ void NukiNetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntr
         if(log.index > _lastRollingLog)
         {
             _lastRollingLog = log.index;
+            _preferences->putInt(preference_lock_log_num, _lastRollingLog);
             serializeJson(entry, _buffer, _bufferSize);
             _nukiPublisher->publishString(mqtt_topic_lock_log_rolling, _buffer, true);
             _nukiPublisher->publishInt(mqtt_topic_lock_log_rolling_last, log.index, true);

src/NukiNetworkOpener.cpp

@@ -23,6 +23,8 @@ NukiNetworkOpener::NukiNetworkOpener(NukiNetwork* network, Preferences* preferen
 
 void NukiNetworkOpener::initialize()
 {
+    _lastRollingLog = _preferences->getInt(preference_opener_log_num, 0);
+    
     String mqttPath = _preferences->getString(preference_mqtt_lock_path, "");
     mqttPath.concat("/opener");
 
@@ -155,6 +157,7 @@ void NukiNetworkOpener::onMqttDataReceived(const char* topic, byte* payload, con
         return;
     }
 
+    /*
     if(comparePrefixedPath(topic, mqtt_topic_lock_log_rolling_last))
     {
         if(strcmp(data, "") == 0 ||
@@ -168,6 +171,7 @@ void NukiNetworkOpener::onMqttDataReceived(const char* topic, byte* payload, con
             _lastRollingLog = atoi(data);
         }
     }
+    */
 
     if(comparePrefixedPath(topic, mqtt_topic_lock_action))
     {
@@ -684,6 +688,7 @@ void NukiNetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::Log
             }
 
             _lastRollingLog = log.index;
+            _preferences->putInt(preference_opener_log_num, _lastRollingLog);
         }
     }
 

src/NukiOpenerWrapper.cpp

@@ -485,6 +485,7 @@ uint16_t NukiOpenerWrapper::getPin()
 void NukiOpenerWrapper::unpair()
 {
     _nukiOpener.unPairNuki();
+    _preferences->remove(preference_opener_log_num);
     Preferences nukiBlePref;
     nukiBlePref.begin("NukiHubopener", false);
     nukiBlePref.clear();

src/NukiWrapper.cpp

@@ -517,6 +517,7 @@ uint32_t NukiWrapper::getUltraPin()
 void NukiWrapper::unpair()
 {
     _nukiLock.unPairNuki();
+    _preferences->remove(preference_lock_log_num);    
     Preferences nukiBlePref;
     nukiBlePref.begin("NukiHub", false);
     nukiBlePref.clear();

src/PreferencesKeys.h

@@ -182,6 +182,8 @@
 #define preference_latest_version (char*)"latest"
 #define preference_reset_mqtt_topics (char*)"rstMqtt"
 #define preference_nukihub_id (char*)"nukihubId"
+#define preference_lock_log_num (char*)"lckLgNm"
+#define preference_opener_log_num (char*)"opLgNm"
 
 //OBSOLETE
 #define preference_access_level (char*)"accLvl"