mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-07-09 15:51:53 +00:00
70d4aa6be9
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
181 lines
4.7 KiB
C++
181 lines
4.7 KiB
C++
// Copyright (c) 2024 microReticulum contributors
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
#ifndef UI_LXMF_STATUSSCREEN_H
|
|
#define UI_LXMF_STATUSSCREEN_H
|
|
|
|
#ifdef ARDUINO
|
|
#include <Arduino.h>
|
|
#include <lvgl.h>
|
|
#include <functional>
|
|
#include <vector>
|
|
#include <microReticulum/Bytes.h>
|
|
#include <microReticulum/Identity.h>
|
|
|
|
namespace UI {
|
|
namespace LXMF {
|
|
|
|
/**
|
|
* Status Screen
|
|
*
|
|
* Shows network and identity information:
|
|
* - Identity hash
|
|
* - LXMF delivery destination hash
|
|
* - WiFi status and IP
|
|
* - RNS connection status
|
|
*
|
|
* Layout:
|
|
* ┌─────────────────────────────────────┐
|
|
* │ ← Status │ 32px header
|
|
* ├─────────────────────────────────────┤
|
|
* │ Identity: │
|
|
* │ a1b2c3d4e5f6... │
|
|
* │ │
|
|
* │ LXMF Address: │
|
|
* │ f7e8d9c0b1a2... │
|
|
* │ │
|
|
* │ WiFi: Connected │
|
|
* │ IP: 192.168.1.100 │
|
|
* │ RSSI: -65 dBm │
|
|
* │ │
|
|
* │ RNS: Connected │
|
|
* └─────────────────────────────────────┘
|
|
*/
|
|
class StatusScreen {
|
|
public:
|
|
using BackCallback = std::function<void()>;
|
|
using ShareCallback = std::function<void()>;
|
|
|
|
/**
|
|
* Create status screen
|
|
* @param parent Parent LVGL object
|
|
*/
|
|
StatusScreen(lv_obj_t* parent = nullptr);
|
|
|
|
/**
|
|
* Destructor
|
|
*/
|
|
~StatusScreen();
|
|
|
|
/**
|
|
* Set identity hash to display
|
|
* @param hash The identity hash
|
|
*/
|
|
void set_identity_hash(const RNS::Bytes& hash);
|
|
|
|
/**
|
|
* Set LXMF delivery destination hash
|
|
* @param hash The delivery destination hash
|
|
*/
|
|
void set_lxmf_address(const RNS::Bytes& hash);
|
|
|
|
/**
|
|
* Set RNS connection status
|
|
* @param connected Whether connected to RNS server
|
|
* @param server_name Server hostname
|
|
*/
|
|
void set_rns_status(bool connected, const String& server_name = "");
|
|
|
|
/**
|
|
* Set propagation node display string
|
|
* @param display Formatted string like "Auto (NodeName)" or "None"
|
|
*/
|
|
void set_propagation_node(const String& display);
|
|
|
|
/**
|
|
* BLE peer summary for display (matches BLEInterface::PeerSummary)
|
|
*/
|
|
struct BLEPeerInfo {
|
|
char identity[14]; // First 12 hex chars + null
|
|
char mac[18]; // "AA:BB:CC:DD:EE:FF" format
|
|
int8_t rssi;
|
|
};
|
|
static constexpr size_t MAX_BLE_PEERS = 8;
|
|
|
|
/**
|
|
* Set BLE peer info for display
|
|
* @param peers Array of peer summaries
|
|
* @param count Number of peers
|
|
*/
|
|
void set_ble_info(const BLEPeerInfo* peers, size_t count);
|
|
|
|
/**
|
|
* Refresh WiFi and connection status
|
|
*/
|
|
void refresh();
|
|
|
|
/**
|
|
* Set callback for back button
|
|
* @param callback Function to call when back is pressed
|
|
*/
|
|
void set_back_callback(BackCallback callback);
|
|
|
|
/**
|
|
* Set callback for share button
|
|
* @param callback Function to call when share is pressed
|
|
*/
|
|
void set_share_callback(ShareCallback callback);
|
|
|
|
/**
|
|
* Show the screen
|
|
*/
|
|
void show();
|
|
|
|
/**
|
|
* Hide the screen
|
|
*/
|
|
void hide();
|
|
|
|
/**
|
|
* Get the root LVGL object
|
|
*/
|
|
lv_obj_t* get_object();
|
|
|
|
private:
|
|
lv_obj_t* _screen;
|
|
lv_obj_t* _header;
|
|
lv_obj_t* _content;
|
|
lv_obj_t* _btn_back;
|
|
lv_obj_t* _btn_share;
|
|
|
|
// Labels for dynamic content
|
|
lv_obj_t* _label_uptime;
|
|
lv_obj_t* _label_identity_value;
|
|
lv_obj_t* _label_lxmf_value;
|
|
lv_obj_t* _label_wifi_status;
|
|
lv_obj_t* _label_wifi_ip;
|
|
lv_obj_t* _label_wifi_rssi;
|
|
lv_obj_t* _label_rns_status;
|
|
lv_obj_t* _label_prop_node;
|
|
|
|
// BLE peer labels (pre-allocated, hidden when unused)
|
|
lv_obj_t* _label_ble_header;
|
|
lv_obj_t* _label_ble_peers[MAX_BLE_PEERS]; // Each shows identity + rssi + mac
|
|
|
|
RNS::Bytes _identity_hash;
|
|
RNS::Bytes _lxmf_address;
|
|
bool _rns_connected;
|
|
String _rns_server;
|
|
String _prop_node_display;
|
|
|
|
// BLE peer data (cached for display)
|
|
BLEPeerInfo _ble_peers[MAX_BLE_PEERS];
|
|
size_t _ble_peer_count;
|
|
|
|
BackCallback _back_callback;
|
|
ShareCallback _share_callback;
|
|
|
|
void create_header();
|
|
void create_content();
|
|
void update_labels();
|
|
|
|
static void on_back_clicked(lv_event_t* event);
|
|
static void on_share_clicked(lv_event_t* event);
|
|
};
|
|
|
|
} // namespace LXMF
|
|
} // namespace UI
|
|
|
|
#endif // ARDUINO
|
|
#endif // UI_LXMF_STATUSSCREEN_H
|