mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 13:21:54 +00:00
liquidraver
38f815a0a1
Server roles (slice 7) - CommonCLI split into upstream's shape; region CLI moved into CommonCLI; ClientACL, RegionMap, TransportKeyStore and both server meshes in upstream shape over an Arduino compat shim (helpers/compat: Arduino.h, Stream/Print, Serial, SHA256, FILESYSTEM/File over Zephyr fs) - room server processAck port; `get acl` prints as upstream - room: default name Room-XXXX, display/input rotation, live radio UI refresh Event loops (slice 7b) - repeater and room server share server_main_common with a ServerRole descriptor; shared event bits in src/mesh_events.h - room server deadline-driven (idle wakes 2.2/s -> 0.08/s); companion loop() runs on housekeeping (closes the lazy contact-flush gap) - `get loop.wakes` in debug builds (CONFIG_ZEPHCORE_LOOP_WAKE_STATS) Companion transports and WiFi (slice 8) - upstream MultiSerialInterface: BLE, USB/UART and TCP are each a BaseSerialInterface, every connected transport gets every frame; CompanionSerial holds a lossless reply; shared frame_txq for BLE/TCP - SerialCompanionTransport and LinuxTCPTransport replaced by TcpCompanionTransport; ZephyrBLE split (gatt layout, DFU) - WiFi companion (upstream wifi.ssid/pwd/enabled CLI, TCP port 5000) on boards declaring `capabilities: wifi` in zephcore.yml: the PSRAM ESP32-S3 boards, plus Heltec V3 (140 contacts), Wireless Tracker (130) and both C6 boards (280); ESP32-S3 without PSRAM gets bounded WiFi buffers and a measured 72 KB heap; PSRAM boards' internal heap 72 KB - TCP queues: own depth (ZEPHCORE_TCP_QUEUE_SIZE=8), RX waits instead of dropping - RAM: companion ClientACL dropped; main/BT-TX/TCP stacks sized from measured peaks (-7 KB nRF companions, -9 KB ESP32 companions) - ESP32 WiFi stopped working under ~200 frames/s unicast. Fixed by: patches/zephyr/0017 never block the WiFi task in the RX callback; patches/zephyr/0018 lock shared_multi_heap (heap corruption with the WiFi heap in PSRAM); patches/modules/hal_espressif/0001 backport of hal_espressif af97fb02df (PSRAM realloc) Storage and prefs (slice 9) - prefs are now prefs.json through upstream's ConfigSerializer (ported verbatim), with upstream's key names for shared fields and ZephCore's own under "zc"; on first boot the binary new_prefs / repeater prefs is migrated and kept, so a downgrade still boots with the old settings - helpers/PrefsCodec: both legacy binary layouts (companion 272 B, server 311 B) as Zephyr-free codecs; sanitizeNodePrefs is the only validator - fix: server prefs could be replaced by a truncated file when a write failed; identity, prefs and channel writes go through one checked atomic replace (ZephyrFsUtil) - fix: a corrupt cad_auto byte turned adaptive CAD off instead of the default on - fix: a deliberate 300 s GPS duty on a repeater was rewritten to 48 h on every boot (that migration now runs on legacy files only) - one identity loader for all roles (IdentityFile); an unusable key file is always parked as .bad before regenerating - server store no longer stamps repeater defaults on room server and observer; companion first-boot volume policy moved into the store (adoptVolume) - ZephyrDataStore 1435 -> ~850 lines
77 lines
2.0 KiB
C++
77 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include <Arduino.h>
|
|
|
|
#ifndef CONFIG_MAX_DEPTH
|
|
#define CONFIG_MAX_DEPTH 8
|
|
#endif
|
|
|
|
#ifndef CONFIG_MAX_KEYLEN
|
|
#define CONFIG_MAX_KEYLEN 16
|
|
#endif
|
|
|
|
#ifndef CONFIG_MAX_TOKEN_LEN
|
|
#define CONFIG_MAX_TOKEN_LEN 128
|
|
#endif
|
|
|
|
class ConfigSerializer {
|
|
bool _first;
|
|
int8_t _depth;
|
|
bool _dirty = false;
|
|
|
|
protected:
|
|
enum OP { READ, WRITE };
|
|
|
|
class Context {
|
|
Stream* _f;
|
|
OP _op;
|
|
uint8_t rd_len;
|
|
uint8_t rd_mode;
|
|
char pending;
|
|
char rd_buf[CONFIG_MAX_TOKEN_LEN];
|
|
char _keys[CONFIG_MAX_DEPTH][CONFIG_MAX_KEYLEN];
|
|
|
|
public:
|
|
bool success = true;
|
|
Context(Stream* f, OP op) : _f(f), _op(op) { rd_buf[rd_len = 0] = 0; rd_mode = 0; pending = 0; }
|
|
OP op() const { return _op; }
|
|
Stream* file() const { return _f; }
|
|
int readNext();
|
|
const char* getToken() const { return rd_buf; }
|
|
bool keyMatch(int8_t depth, const char* key) { return strcmp(key, _keys[depth]) == 0; }
|
|
void setKey(uint8_t depth, const char* key) { strcpy(_keys[depth], key); }
|
|
const char* getKey(uint8_t depth) { return _keys[depth]; }
|
|
};
|
|
|
|
Context* _context = NULL;
|
|
int8_t getDepth() const { return _depth; }
|
|
|
|
void writeComma();
|
|
|
|
ConfigSerializer() { }
|
|
|
|
void def(const char* key, char* value, size_t max_len); // max_len inclusive of null
|
|
void def(const char* key, void* value, size_t len); // binary blob (encoded in hex)
|
|
void def(const char* key, int32_t& value);
|
|
void def(const char* key, int16_t& value);
|
|
void def(const char* key, int8_t& value);
|
|
void def(const char* key, uint32_t& value);
|
|
void def(const char* key, uint16_t& value);
|
|
void def(const char* key, uint8_t& value);
|
|
void def(const char* key, float& value);
|
|
void def(const char* key, double& value);
|
|
void def(const char* key, bool& value);
|
|
void def(const char* key, ConfigSerializer& sub_obj);
|
|
|
|
virtual void structure() = 0;
|
|
|
|
void markDirty() { _dirty = true; }
|
|
|
|
public:
|
|
bool loadSerial(Stream& s);
|
|
bool saveSerial(Stream& s);
|
|
|
|
virtual bool isDirty() const { return _dirty; }
|
|
virtual void clearDirty() { _dirty = false; }
|
|
};
|