Merge remote-tracking branch 'upstream/dev' into keymindCascade
# Conflicts: # examples/companion_radio/ui-new/UITask.cpp # examples/companion_radio/ui-orig/UITask.cpp # examples/companion_radio/ui-tiny/UITask.cpp # examples/simple_repeater/MyMesh.cpp # src/Mesh.cpp # src/Mesh.h # src/helpers/ESP32Board.cpp # src/helpers/ESP32Board.h # src/helpers/SimpleMeshTables.h # variants/heltec_v3/HeltecV3Board.h # variants/tenstar_c3/target.h
This commit is contained in:
commit
84c166d5cc
53 files changed
+1057
-130
No files matched your search
@@ -547,7 +547,7 @@ bool DataStore::putBlobByKey(const uint8_t key[], int key_len, const uint8_t src
|
||||
uint32_t pos = 0, found_pos = 0;
|
||||
uint32_t min_timestamp = 0xFFFFFFFF;
|
||||
|
||||
// search for matching key OR evict by oldest timestmap
|
||||
// search for matching key OR evict by oldest timestamp
|
||||
BlobRec tmp;
|
||||
file.seek(0);
|
||||
while (file.read((uint8_t *) &tmp, sizeof(tmp)) == sizeof(tmp)) {
|
||||
|
||||
Reference in new issue
Block a user