mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 23:20:09 +00:00
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
116 lines
2.9 KiB
C++
116 lines
2.9 KiB
C++
/*
|
|
* SPDX-License-Identifier: MIT
|
|
* The slice of Arduino's Print / Stream API that code ported verbatim from
|
|
* upstream MeshCore uses, so it compiles unchanged.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
class Print {
|
|
public:
|
|
virtual ~Print() {}
|
|
|
|
virtual size_t write(uint8_t c) = 0;
|
|
virtual size_t write(const uint8_t *buffer, size_t size)
|
|
{
|
|
size_t n = 0;
|
|
while (n < size && write(buffer[n])) {
|
|
n++;
|
|
}
|
|
return n;
|
|
}
|
|
size_t write(const char *str) { return str ? write((const uint8_t *)str, strlen(str)) : 0; }
|
|
|
|
size_t print(char c) { return write((uint8_t)c); }
|
|
size_t print(const char *str) { return write(str); }
|
|
size_t println(const char *str) { return write(str) + write("\r\n"); }
|
|
|
|
/* Numbers, as Arduino prints them (ConfigSerializer). int32_t is long on
|
|
* some targets and int on others, so both widths are here. */
|
|
size_t print(long n, int base = 10)
|
|
{
|
|
char buf[24];
|
|
int len = (base == 16) ? snprintf(buf, sizeof(buf), "%lx", (unsigned long)n)
|
|
: snprintf(buf, sizeof(buf), "%ld", n);
|
|
return write((const uint8_t *)buf, (size_t)len);
|
|
}
|
|
size_t print(unsigned long n, int base = 10)
|
|
{
|
|
char buf[24];
|
|
int len = snprintf(buf, sizeof(buf), (base == 16) ? "%lx" : "%lu", n);
|
|
return write((const uint8_t *)buf, (size_t)len);
|
|
}
|
|
size_t print(int n, int base = 10) { return print((long)n, base); }
|
|
size_t print(unsigned int n, int base = 10) { return print((unsigned long)n, base); }
|
|
|
|
/* Arduino's Print::printFloat, digit for digit, so a value is written as
|
|
* upstream would write it, without relying on libc float formatting. */
|
|
size_t print(double number, int digits = 2)
|
|
{
|
|
if (number != number) {
|
|
return print("nan");
|
|
}
|
|
if (number > 4294967040.0) {
|
|
return print("ovf");
|
|
}
|
|
if (number < -4294967040.0) {
|
|
return print("-ovf");
|
|
}
|
|
size_t n = 0;
|
|
|
|
if (number < 0.0) {
|
|
n += print('-');
|
|
number = -number;
|
|
}
|
|
double rounding = 0.5;
|
|
|
|
for (int i = 0; i < digits; ++i) {
|
|
rounding /= 10.0;
|
|
}
|
|
number += rounding;
|
|
unsigned long int_part = (unsigned long)number;
|
|
double remainder = number - (double)int_part;
|
|
|
|
n += print(int_part);
|
|
if (digits > 0) {
|
|
n += print('.');
|
|
}
|
|
while (digits-- > 0) {
|
|
remainder *= 10.0;
|
|
unsigned int to_print = (unsigned int)remainder;
|
|
|
|
n += print(to_print);
|
|
remainder -= to_print;
|
|
}
|
|
return n;
|
|
}
|
|
|
|
/* Longer output is truncated; the ported callers print short lines. */
|
|
size_t printf(const char *format, ...) __attribute__((format(printf, 2, 3)))
|
|
{
|
|
char buf[160];
|
|
va_list args;
|
|
va_start(args, format);
|
|
int n = vsnprintf(buf, sizeof(buf), format, args);
|
|
va_end(args);
|
|
if (n < 0) {
|
|
return 0;
|
|
}
|
|
return write((const uint8_t *)buf, (size_t)n < sizeof(buf) ? (size_t)n : sizeof(buf) - 1);
|
|
}
|
|
};
|
|
|
|
class Stream : public Print {
|
|
public:
|
|
virtual int available() = 0;
|
|
virtual int read() = 0;
|
|
virtual int peek() = 0;
|
|
virtual void flush() {}
|
|
};
|