mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-09-16 18:02:36 +00:00
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
185 lines
4.8 KiB
C++
185 lines
4.8 KiB
C++
// Copyright (c) 2024 microReticulum contributors
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
#ifndef UI_LXMF_PROPAGATIONNODESSCREEN_H
|
|
#define UI_LXMF_PROPAGATIONNODESSCREEN_H
|
|
|
|
#ifdef ARDUINO
|
|
#include <Arduino.h>
|
|
#include <lvgl.h>
|
|
#include <vector>
|
|
#include <functional>
|
|
#include <microReticulum/Bytes.h>
|
|
|
|
namespace LXMF {
|
|
class PropagationNodeManager;
|
|
}
|
|
|
|
namespace UI {
|
|
namespace LXMF {
|
|
|
|
/**
|
|
* Propagation Nodes Screen
|
|
*
|
|
* Shows a list of discovered LXMF propagation nodes with selection:
|
|
* - Node name and hash
|
|
* - Hop count / reachability
|
|
* - Selection radio buttons
|
|
* - Auto-select option
|
|
*
|
|
* Layout:
|
|
* +-------------------------------------+
|
|
* | <- Prop Nodes [Sync] | 32px header
|
|
* +-------------------------------------+
|
|
* | ( ) Auto-select best node |
|
|
* +-------------------------------------+
|
|
* | (*) NodeName1 2 hops |
|
|
* | abc123... |
|
|
* +-------------------------------------+
|
|
* | ( ) NodeName2 3 hops | 168px scrollable
|
|
* | def456... disabled |
|
|
* +-------------------------------------+
|
|
*/
|
|
class PropagationNodesScreen {
|
|
public:
|
|
/**
|
|
* Node item data for display
|
|
*/
|
|
struct NodeItem {
|
|
RNS::Bytes node_hash;
|
|
String name;
|
|
String hash_display;
|
|
uint8_t hops;
|
|
uint8_t stamp_cost;
|
|
bool enabled;
|
|
bool is_selected;
|
|
};
|
|
|
|
/**
|
|
* Callback types
|
|
*/
|
|
using NodeSelectedCallback = std::function<void(const RNS::Bytes& node_hash)>;
|
|
using BackCallback = std::function<void()>;
|
|
using SyncCallback = std::function<void()>;
|
|
using AutoSelectChangedCallback = std::function<void(bool enabled)>;
|
|
|
|
/**
|
|
* Create propagation nodes screen
|
|
* @param parent Parent LVGL object (usually lv_scr_act())
|
|
*/
|
|
PropagationNodesScreen(lv_obj_t* parent = nullptr);
|
|
|
|
/**
|
|
* Destructor
|
|
*/
|
|
~PropagationNodesScreen();
|
|
|
|
/**
|
|
* Load nodes from PropagationNodeManager
|
|
* @param manager The propagation node manager
|
|
* @param selected_hash Currently selected node hash (empty for auto-select)
|
|
* @param auto_select_enabled Whether auto-select is enabled
|
|
*/
|
|
void load_nodes(::LXMF::PropagationNodeManager& manager,
|
|
const RNS::Bytes& selected_hash,
|
|
bool auto_select_enabled);
|
|
|
|
/**
|
|
* Refresh the display
|
|
*/
|
|
void refresh();
|
|
|
|
/**
|
|
* Set callback for node selection
|
|
* @param callback Function to call when a node is selected
|
|
*/
|
|
void set_node_selected_callback(NodeSelectedCallback callback);
|
|
|
|
/**
|
|
* Set callback for back button
|
|
* @param callback Function to call when back is pressed
|
|
*/
|
|
void set_back_callback(BackCallback callback);
|
|
|
|
/**
|
|
* Set callback for sync button
|
|
* @param callback Function to call when sync is pressed
|
|
*/
|
|
void set_sync_callback(SyncCallback callback);
|
|
|
|
/**
|
|
* Set callback for auto-select toggle
|
|
* @param callback Function to call when auto-select is changed
|
|
*/
|
|
void set_auto_select_changed_callback(AutoSelectChangedCallback callback);
|
|
|
|
/**
|
|
* Show the screen
|
|
*/
|
|
void show();
|
|
|
|
/**
|
|
* Hide the screen
|
|
*/
|
|
void hide();
|
|
|
|
/**
|
|
* Get the root LVGL object
|
|
* @return Root object
|
|
*/
|
|
lv_obj_t* get_object();
|
|
|
|
private:
|
|
lv_obj_t* _screen;
|
|
lv_obj_t* _header;
|
|
lv_obj_t* _list;
|
|
lv_obj_t* _btn_back;
|
|
lv_obj_t* _btn_sync;
|
|
lv_obj_t* _auto_select_row;
|
|
lv_obj_t* _auto_select_checkbox;
|
|
lv_obj_t* _empty_label;
|
|
lv_obj_t* _search_input;
|
|
|
|
std::vector<NodeItem> _nodes;
|
|
RNS::Bytes _selected_hash;
|
|
RNS::Bytes _manual_hash;
|
|
bool _auto_select_enabled;
|
|
String _search_filter;
|
|
|
|
// Callbacks
|
|
NodeSelectedCallback _node_selected_callback;
|
|
BackCallback _back_callback;
|
|
SyncCallback _sync_callback;
|
|
AutoSelectChangedCallback _auto_select_changed_callback;
|
|
|
|
// UI construction
|
|
void create_header();
|
|
void create_search_row();
|
|
void create_auto_select_row();
|
|
void create_list();
|
|
void create_node_item(const NodeItem& item, size_t index);
|
|
void create_manual_entry_item(const RNS::Bytes& hash, const String& hex_display);
|
|
void show_empty_state();
|
|
void update_selection_ui();
|
|
void apply_filter();
|
|
|
|
// Event handlers
|
|
static void on_node_clicked(lv_event_t* event);
|
|
static void on_manual_node_clicked(lv_event_t* event);
|
|
static void on_back_clicked(lv_event_t* event);
|
|
static void on_sync_clicked(lv_event_t* event);
|
|
static void on_auto_select_changed(lv_event_t* event);
|
|
static void on_search_changed(lv_event_t* event);
|
|
|
|
// Utility
|
|
static String format_hash(const RNS::Bytes& hash);
|
|
static String format_hops(uint8_t hops);
|
|
static bool is_valid_hex(const String& str);
|
|
};
|
|
|
|
} // namespace LXMF
|
|
} // namespace UI
|
|
|
|
#endif // ARDUINO
|
|
#endif // UI_LXMF_PROPAGATIONNODESSCREEN_H
|