mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-08-27 21:19:56 +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:
co-authored by
Claude Opus 4.8
parent
95fe121a35
commit
70d4aa6be9
+9
-9
@@ -16,8 +16,8 @@
|
||||
#include <soc/rtc_cntl_reg.h>
|
||||
|
||||
// Reticulum
|
||||
#include <Reticulum.h>
|
||||
#include <Utilities/OS.h>
|
||||
#include <microReticulum/Reticulum.h>
|
||||
#include <microReticulum/Utilities/OS.h>
|
||||
|
||||
// Filesystem
|
||||
// Was: <UniversalFileSystem.h> (pyxis-provided RNS::FileSystem wrapper).
|
||||
@@ -30,10 +30,10 @@
|
||||
// LittleFS reuses the same partition (label "spiffs") and reformats it
|
||||
// on first boot.
|
||||
#include <microStore/Adapters/LittleFSFileSystem.h>
|
||||
#include <Identity.h>
|
||||
#include <Destination.h>
|
||||
#include <Transport.h>
|
||||
#include <Interface.h>
|
||||
#include <microReticulum/Identity.h>
|
||||
#include <microReticulum/Destination.h>
|
||||
#include <microReticulum/Transport.h>
|
||||
#include <microReticulum/Interface.h>
|
||||
|
||||
// TCP Client Interface
|
||||
#include "TCPClientInterface.h"
|
||||
@@ -76,7 +76,7 @@
|
||||
#include "Tone.h"
|
||||
|
||||
// Logging
|
||||
#include <Log.h>
|
||||
#include <microReticulum/Log.h>
|
||||
|
||||
// SD Card access and logging
|
||||
#include <Hardware/TDeck/SDAccess.h>
|
||||
@@ -1742,7 +1742,7 @@ static void handle_test_hook_command(const String& line) {
|
||||
Serial.println("T:OK announced");
|
||||
}
|
||||
else if (cmd == "T:PATHS") {
|
||||
const auto& path_table = RNS::Transport::get_path_table();
|
||||
const auto& path_table = RNS::Transport::path_table();
|
||||
Serial.print("T:OK count=");
|
||||
Serial.println(String((unsigned)path_table.size()));
|
||||
for (const auto& kv : path_table) {
|
||||
@@ -1757,7 +1757,7 @@ static void handle_test_hook_command(const String& line) {
|
||||
// Diagnostic: also dump whether the in-memory _path_table has it,
|
||||
// and the size of each store. They should match when the dual-
|
||||
// write fix is working.
|
||||
const auto& mem_table = RNS::Transport::get_path_table();
|
||||
const auto& mem_table = RNS::Transport::path_table();
|
||||
bool mem_has = (mem_table.find(dest) != mem_table.end());
|
||||
Serial.print("T:OK ");
|
||||
Serial.print(has ? "1" : "0");
|
||||
|
||||
Reference in New Issue
Block a user