mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 17:49: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
69 lines
2.2 KiB
C++
69 lines
2.2 KiB
C++
#pragma once
|
|
|
|
//#include <Arduino.h> // needed for PlatformIO
|
|
#include <mesh/Packet.h>
|
|
#include <Stream.h> // ZEPHCORE: helpers/compat (Arduino.h provides it upstream)
|
|
#include "TransportKeyStore.h"
|
|
|
|
// ZEPHCORE: table size from Kconfig.
|
|
#if !defined(MAX_REGION_ENTRIES) && defined(CONFIG_ZEPHCORE_MAX_REGION_ENTRIES)
|
|
#define MAX_REGION_ENTRIES CONFIG_ZEPHCORE_MAX_REGION_ENTRIES
|
|
#endif
|
|
|
|
#ifndef MAX_REGION_ENTRIES
|
|
#define MAX_REGION_ENTRIES 32
|
|
#endif
|
|
|
|
#define REGION_DENY_FLOOD 0x01
|
|
#define REGION_DENY_DIRECT 0x02 // reserved for future
|
|
|
|
struct RegionEntry {
|
|
uint16_t id;
|
|
uint16_t parent;
|
|
uint8_t flags;
|
|
char name[31];
|
|
|
|
bool isWildcard() const { return id == 0; }
|
|
};
|
|
|
|
class RegionMap {
|
|
TransportKeyStore* _store;
|
|
uint16_t next_id, home_id, default_id;
|
|
uint16_t num_regions;
|
|
RegionEntry regions[MAX_REGION_ENTRIES];
|
|
RegionEntry wildcard;
|
|
|
|
void printChildRegions(int indent, const RegionEntry* parent, Stream& out) const;
|
|
|
|
public:
|
|
RegionMap(TransportKeyStore& store);
|
|
|
|
static bool is_name_char(uint8_t c);
|
|
|
|
bool load(FILESYSTEM* _fs, const char* path=NULL);
|
|
bool save(FILESYSTEM* _fs, const char* path=NULL);
|
|
|
|
RegionEntry* putRegion(const char* name, uint16_t parent_id, uint16_t id = 0);
|
|
RegionEntry* findMatch(mesh::Packet* packet, uint8_t mask);
|
|
RegionEntry& getWildcard() { return wildcard; }
|
|
RegionEntry* findByName(const char* name);
|
|
RegionEntry* findByNamePrefix(const char* prefix);
|
|
RegionEntry* findById(uint16_t id);
|
|
RegionEntry* getHomeRegion(); // NOTE: can be NULL
|
|
void setHomeRegion(const RegionEntry* home);
|
|
RegionEntry* getDefaultRegion(); // NOTE: can be NULL
|
|
void setDefaultRegion(const RegionEntry* def);
|
|
bool removeRegion(const RegionEntry& region);
|
|
bool clear();
|
|
void resetFrom(const RegionMap& src) { num_regions = 0; next_id = src.next_id; }
|
|
int getCount() const { return num_regions; }
|
|
const RegionEntry* getByIdx(int i) const { return ®ions[i]; }
|
|
const RegionEntry* getRoot() const { return &wildcard; }
|
|
int exportNamesTo(char *dest, int max_len, uint8_t mask, bool invert = false);
|
|
int getTransportKeysFor(const RegionEntry& src, TransportKey dest[], int max_num);
|
|
|
|
void exportTo(Stream& out) const;
|
|
size_t exportTo(char *dest, size_t max_len) const;
|
|
|
|
};
|