mikecarper
300b889bca
Allow Auto, SSD1306 or SH1106 through display.controller on display-enabled RAK4631 and RAK3401 roles. Persist the choice before restart without changing the active screen policy, and let saved Auto override legacy build defaults. Share checked settings I/O and the existing atomic writer to keep Full Companion within its flash boundary while retaining features and existing record formats. Cover save failures, backup recovery, startup selection and ambiguous OLED replies. Validation: 35 targeted host tests passed. RAK4631 Full Companion and RAK3401 unified LoRa OTA repeater build and package checks passed with release-length version strings.
54 lines
1.8 KiB
C++
54 lines
1.8 KiB
C++
#pragma once
|
|
|
|
#include <helpers/IdentityStore.h>
|
|
#include <string.h>
|
|
#if defined(NRF52_PLATFORM)
|
|
#include <helpers/AtomicFileWriter.h>
|
|
#endif
|
|
|
|
namespace mesh { namespace storage {
|
|
|
|
#if defined(__GNUC__) && !defined(__clang__)
|
|
#define MESH_SETTINGS_FILE_SHARED __attribute__((noinline, noclone))
|
|
#else
|
|
#define MESH_SETTINGS_FILE_SHARED __attribute__((noinline))
|
|
#endif
|
|
|
|
// Share the filesystem boundary between small settings records. Callers keep
|
|
// their own format/version checks; no preference layout changes here.
|
|
MESH_SETTINGS_FILE_SHARED inline bool readFixedSettingsFile(
|
|
FILESYSTEM* fs, const char* path, uint8_t* data, size_t size) {
|
|
if (!fs) return false;
|
|
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
|
|
File file(*fs);
|
|
if (!file.open(path, FILE_O_READ)) return false;
|
|
#else
|
|
File file = fs->open(path, "r");
|
|
if (!file) return false;
|
|
#endif
|
|
const bool complete = file.size() == size && file.read(data, size) == size;
|
|
file.close();
|
|
return complete;
|
|
}
|
|
|
|
#if defined(NRF52_PLATFORM)
|
|
// Reuse the existing atomic writer and compare the complete public record as
|
|
// well as its transaction checksum. Keep this uncommon path out of callers.
|
|
MESH_SETTINGS_FILE_SHARED inline AtomicFileWriter::Outcome writeCheckedSettingsFile(
|
|
FILESYSTEM* fs, const char* path, const uint8_t* data, size_t size) {
|
|
using Outcome = AtomicFileWriter::Outcome;
|
|
uint8_t verified[16];
|
|
if (!fs || !data || size == 0 || size > sizeof(verified)) return Outcome::NotCommitted;
|
|
AtomicFileWriter file(fs, path);
|
|
if (!file || file.write(data, size) != size) return Outcome::NotCommitted;
|
|
if (!file.commit()) return file.outcome();
|
|
if (!readFixedSettingsFile(fs, path, verified, size)
|
|
|| memcmp(data, verified, size) != 0) return Outcome::Indeterminate;
|
|
return Outcome::Committed;
|
|
}
|
|
#endif
|
|
|
|
#undef MESH_SETTINGS_FILE_SHARED
|
|
|
|
}} // namespace mesh::storage
|