mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 18:50:14 +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
97 lines
3.5 KiB
C
97 lines
3.5 KiB
C
/*
|
|
* SPDX-License-Identifier: MIT
|
|
* ZephCore BLE Adapter — NUS service, advertising, security, TX/RX
|
|
*
|
|
* One companion transport among several: CompanionInterfaces.h wraps it as a
|
|
* BaseSerialInterface for the MultiSerialInterface. Nothing here knows about
|
|
* the other transports.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <zephyr/kernel.h>
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <stddef.h>
|
|
|
|
#include "companion_framing.h" /* MAX_FRAME_SIZE, struct frame, companion_link_cbs */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct ble_callbacks {
|
|
/* Frame waiting (zephcore_ble_recv), TX drained, (dis)connected. Raised
|
|
* from the BT and system work queue threads: post events only. */
|
|
struct companion_link_cbs link;
|
|
/* Buttonless DFU control-point write — defer reboot into the
|
|
* bootloader's BLE OTA mode. May be NULL (feature disabled). */
|
|
void (*on_dfu_request)(void);
|
|
};
|
|
|
|
/** Register callbacks and auth handlers. Call before bt_enable(). */
|
|
void zephcore_ble_init(const struct ble_callbacks *cbs);
|
|
|
|
/** Load settings, build adv data, start advertising if enabled. Call from bt_ready(). */
|
|
void zephcore_ble_start(const char *device_name);
|
|
|
|
/** Queue a frame for BLE TX. Returns bytes queued, or 0 on failure. */
|
|
size_t zephcore_ble_send(const uint8_t *data, uint16_t len);
|
|
|
|
/** Take the next received frame into dest (MAX_FRAME_SIZE). Returns its length, 0 if none. */
|
|
size_t zephcore_ble_recv(uint8_t *dest);
|
|
|
|
/** Enable/disable BLE. Disabling disconnects and stops advertising. Before
|
|
* zephcore_ble_start() this only records the wish, which start() honours. */
|
|
void zephcore_ble_set_enabled(bool enable);
|
|
|
|
/** True if BLE is enabled */
|
|
bool zephcore_ble_is_enabled(void);
|
|
|
|
/** True when a secured client is connected: frames can be exchanged. */
|
|
bool zephcore_ble_is_active(void);
|
|
|
|
/** True if BLE has a connection (secured or not). */
|
|
bool zephcore_ble_is_connected(void);
|
|
|
|
/** True while senders should hold off: TX congested, or the queue at its 2/3 high-water mark. */
|
|
bool zephcore_ble_is_write_busy(void);
|
|
|
|
/** True when every queued frame has been transmitted and link-layer acked:
|
|
* send queue empty, nothing in flight, no retry or overflow frame held back.
|
|
* True when disconnected (nothing to wait for). Reboot-class CLI commands
|
|
* poll this so a reset cannot cut off a reply or delivery-ack mid-flight. */
|
|
bool zephcore_ble_tx_idle(void);
|
|
|
|
/** True if the controller is currently broadcasting advertising PDUs.
|
|
* Returns FALSE during an active connection (Zephyr stops adv when the
|
|
* BT_MAX_CONN=1 slot is consumed) and FALSE after any explicit stop.
|
|
* Companion main loop polls this each housekeeping tick (~5s) and calls
|
|
* zephcore_ble_set_enabled(true) if adv ever stops outside a connection. */
|
|
bool zephcore_ble_is_advertising(void);
|
|
|
|
void zephcore_ble_set_passkey(uint32_t passkey);
|
|
uint32_t zephcore_ble_get_passkey(void);
|
|
|
|
/**
|
|
* Apply deferred connection parameters.
|
|
* Call after the initial app sync is complete (channels + contacts +
|
|
* offline messages) so the param negotiation doesn't disrupt throughput
|
|
* during the sync burst.
|
|
*/
|
|
void zephcore_ble_conn_params_ready(void);
|
|
|
|
/**
|
|
* Rebuild advertising payload + GATT device name from a new prefs name.
|
|
* If currently advertising (no active connection), stops and restarts
|
|
* adv so the new name is published immediately. If connected, the new
|
|
* payload takes effect on the next adv cycle after disconnect.
|
|
*
|
|
* Call from CMD_SET_ADVERT_NAME handler after persisting prefs.
|
|
*/
|
|
void zephcore_ble_update_name(const char *new_name);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|