Merge pull request #322 from OpenKNX/upstream/fix-and-cleanup/pr316-unloding-fix

thelsing · web-flow · commit 316189e7d2ba · 2025-10-07T20:07:32.000+02:00
Fix for PR #316: Special Case Handling for Unload-Timeout
diff --git a/src/knx/memory.cpp b/src/knx/memory.cpp
@@ -302,13 +302,17 @@ void Memory::freeMemory(uint8_t* ptr)
     removeFromUsedList(block);
     addToFreeList(block);
     _saveTimeout = millis();
+    if (_saveTimeout == 0)
+        _saveTimeout = 1; // prevent 0=disabled; no impact by minimal increased timeout
 }
 
 void Memory::writeMemory(uint32_t relativeAddress, size_t size, uint8_t* data)
 {
     if(_saveTimeout != 0)
     {
         _saveTimeout = millis();
+        if (_saveTimeout == 0)
+            _saveTimeout = 1; // prevent 0=disabled; no impact by minimal increased timeout
     }
     _platform.writeNonVolatileMemory(relativeAddress, data, size);
 }

Original file line number	Diff line number	Diff line change
`@@ -302,13 +302,17 @@ void Memory::freeMemory(uint8_t* ptr)`
`302`	`302`	`removeFromUsedList(block);`
`303`	`303`	`addToFreeList(block);`
`304`	`304`	`_saveTimeout = millis();`
	`305`	`+ if (_saveTimeout == 0)`
	`306`	`+ _saveTimeout = 1; // prevent 0=disabled; no impact by minimal increased timeout`
`305`	`307`	`}`
`306`	`308`
`307`	`309`	`void Memory::writeMemory(uint32_t relativeAddress, size_t size, uint8_t* data)`
`308`	`310`	`{`
`309`	`311`	`if(_saveTimeout != 0)`
`310`	`312`	`{`
`311`	`313`	`_saveTimeout = millis();`
	`314`	`+ if (_saveTimeout == 0)`
	`315`	`+ _saveTimeout = 1; // prevent 0=disabled; no impact by minimal increased timeout`
`312`	`316`	`}`
`313`	`317`	`_platform.writeNonVolatileMemory(relativeAddress, data, size);`
`314`	`318`	`}`