mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-07-12 17:19:08 +00:00
feat: graft pyxis onto upstream microReticulum 0.4.1
Repins microReticulum + microLXMF onto the upstream-0.4.1 graft and adapts pyxis to the new src/microReticulum/ layout and 0.4.x APIs. The far-diverged 0.3.0 fork's Resource/Transport/Identity work is subsumed by upstream's reimplementation; only the still-needed fixes ride on the pinned branches (PKCS7/HMAC/X25519 crypto -- proven byte-identical to python RNS 1.3.1 -- Packet link-proof callback, Identity short-sig guard, and the bz2 layer + decompress-on-receive in Resource::assemble()). Consumer-side changes: - platformio.ini: pin microReticulum @2f21fee (pyxis-fixes-on-0.4.1) and microLXMF @33760d0 (chore/microreticulum-0.4.1-layout); bump microStore ceea8f5 -> c5fb69d (0.4.x requires the new BasicFileStore::init API); -std=gnu++11 -> gnu++17 (upstream requires C++17). - Namespace all microReticulum includes (angle + quote) to <microReticulum/...> for the relocated layout; shim-local Utilities/Stream.h|Print.h preserved. - Interface::send_outgoing now returns bool: update TCP/BLE/SX1262/Auto overrides with correct success/failure returns. - SDArchiveFileSystem::init(bool reformatOnFail=true) to match new microStore. - Static Transport::get_path_table() -> path_table(); instance getter unchanged. - Remove duplicate shim Cryptography/BZ2 (microReticulum provides it now; keep lib/libbz2 as the ESP32 bzlib provider). - patch_littlefs_paths.py: normalize microStore's LittleFS adapter paths to a leading "/" -- ESP32 Arduino LittleFS rejects "./"-prefixed paths, which silently broke the path store (no peer paths learned, all messaging blocked). Validated on T-Deck Plus: builds (RAM 27.5% / Flash 77.7%), boots stable (no WDT/panic), and a full on-device LXMF e2e (DIRECT + OPPORTUNISTIC + bz2-compressed-Resource receive) passes 5/5. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UWZuYkHBRqNb6BZHV8sTG5
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
*/
|
||||
|
||||
#include "BLEInterface.h"
|
||||
#include "Log.h"
|
||||
#include "Utilities/OS.h"
|
||||
#include <microReticulum/Log.h>
|
||||
#include <microReticulum/Utilities/OS.h>
|
||||
|
||||
#ifdef ARDUINO
|
||||
#include <Arduino.h>
|
||||
@@ -311,9 +311,9 @@ void BLEInterface::loop() {
|
||||
// Data Transfer
|
||||
//=============================================================================
|
||||
|
||||
void BLEInterface::send_outgoing(const Bytes& data) {
|
||||
bool BLEInterface::send_outgoing(const Bytes& data) {
|
||||
if (!_platform || !_platform->isRunning()) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Non-blocking lock: if BLE task holds _mutex (maintenance, connect, etc.),
|
||||
@@ -321,7 +321,7 @@ void BLEInterface::send_outgoing(const Bytes& data) {
|
||||
// retransmission at the transport layer.
|
||||
if (!_mutex.try_lock()) {
|
||||
TRACE("BLEInterface: send_outgoing skipped - BLE task busy");
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
std::lock_guard<std::recursive_mutex> lock(_mutex, std::adopt_lock);
|
||||
|
||||
@@ -330,7 +330,7 @@ void BLEInterface::send_outgoing(const Bytes& data) {
|
||||
|
||||
if (connected_peers.empty()) {
|
||||
TRACE("BLEInterface: No connected peers, dropping packet");
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Count peers with identity
|
||||
@@ -352,6 +352,7 @@ void BLEInterface::send_outgoing(const Bytes& data) {
|
||||
|
||||
// Track outgoing stats
|
||||
handle_outgoing(data);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool BLEInterface::sendToPeer(const Bytes& peer_identity, const Bytes& data) {
|
||||
|
||||
Reference in New Issue
Block a user