mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-06-23 16:01:47 +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
145 lines
4.1 KiB
C++
145 lines
4.1 KiB
C++
/**
|
|
* @file BLEOperationQueue.h
|
|
* @brief GATT operation queue for serializing BLE operations
|
|
*
|
|
* BLE stacks typically do not queue operations internally - attempting to
|
|
* perform multiple GATT operations simultaneously leads to failures or
|
|
* undefined behavior. This queue ensures operations are processed one at
|
|
* a time in order.
|
|
*
|
|
* Platform implementations inherit from this class and implement
|
|
* executeOperation() to perform the actual BLE stack calls.
|
|
*/
|
|
#pragma once
|
|
|
|
#include "BLETypes.h"
|
|
#include <microReticulum/Bytes.h>
|
|
#include <microReticulum/Utilities/OS.h>
|
|
|
|
#include <queue>
|
|
#include <functional>
|
|
|
|
namespace RNS { namespace BLE {
|
|
|
|
/**
|
|
* @brief Base class for GATT operation queuing
|
|
*
|
|
* Subclasses must implement executeOperation() to perform the actual
|
|
* BLE stack calls. Call process() from the main loop to execute queued
|
|
* operations, and complete() from BLE callbacks to signal completion.
|
|
*/
|
|
class BLEOperationQueue {
|
|
public:
|
|
BLEOperationQueue();
|
|
virtual ~BLEOperationQueue() = default;
|
|
|
|
/**
|
|
* @brief Add operation to queue
|
|
*
|
|
* @param op Operation to queue
|
|
*/
|
|
void enqueue(GATTOperation op);
|
|
|
|
/**
|
|
* @brief Process queue - call from loop()
|
|
*
|
|
* Starts the next operation if none is in progress.
|
|
* @return true if an operation was started
|
|
*/
|
|
bool process();
|
|
|
|
/**
|
|
* @brief Mark current operation complete
|
|
*
|
|
* Call this from BLE callbacks when an operation completes.
|
|
*
|
|
* @param result Operation result
|
|
* @param response_data Response data (for reads)
|
|
*/
|
|
void complete(OperationResult result, const Bytes& response_data = Bytes());
|
|
|
|
/**
|
|
* @brief Check if operation is in progress
|
|
*/
|
|
bool isBusy() const { return _has_current_op; }
|
|
|
|
/**
|
|
* @brief Get current operation (if any)
|
|
* @return Pointer to current operation, or nullptr if none
|
|
*/
|
|
const GATTOperation* currentOperation() const {
|
|
return _has_current_op ? &_current_op : nullptr;
|
|
}
|
|
|
|
/**
|
|
* @brief Clear all pending operations for a connection
|
|
*
|
|
* Call this when a connection is terminated to remove orphaned operations.
|
|
*
|
|
* @param conn_handle Connection handle
|
|
*/
|
|
void clearForConnection(uint16_t conn_handle);
|
|
|
|
/**
|
|
* @brief Clear entire queue
|
|
*/
|
|
void clear();
|
|
|
|
/**
|
|
* @brief Get queue depth
|
|
*/
|
|
size_t depth() const { return _queue.size(); }
|
|
|
|
/**
|
|
* @brief Set operation timeout
|
|
* @param timeout_ms Timeout in milliseconds
|
|
*/
|
|
void setTimeout(uint32_t timeout_ms) { _default_timeout_ms = timeout_ms; }
|
|
|
|
protected:
|
|
/**
|
|
* @brief Execute a single operation - implement in subclass
|
|
*
|
|
* Subclasses must implement this to call platform-specific BLE APIs.
|
|
* Return true if the operation was started successfully.
|
|
* Call complete() from the BLE callback when the operation finishes.
|
|
*
|
|
* @param op Operation to execute
|
|
* @return true if operation was started
|
|
*/
|
|
virtual bool executeOperation(const GATTOperation& op) = 0;
|
|
|
|
private:
|
|
/**
|
|
* @brief Check for timeout on current operation
|
|
*/
|
|
void checkTimeout();
|
|
|
|
std::queue<GATTOperation> _queue;
|
|
GATTOperation _current_op;
|
|
bool _has_current_op = false;
|
|
uint32_t _default_timeout_ms = 5000;
|
|
};
|
|
|
|
/**
|
|
* @brief Helper class for building GATT operations
|
|
*/
|
|
class GATTOperationBuilder {
|
|
public:
|
|
GATTOperationBuilder& read(uint16_t conn_handle, uint16_t char_handle);
|
|
GATTOperationBuilder& write(uint16_t conn_handle, uint16_t char_handle, const Bytes& data);
|
|
GATTOperationBuilder& writeNoResponse(uint16_t conn_handle, uint16_t char_handle, const Bytes& data);
|
|
GATTOperationBuilder& enableNotify(uint16_t conn_handle);
|
|
GATTOperationBuilder& disableNotify(uint16_t conn_handle);
|
|
GATTOperationBuilder& requestMTU(uint16_t conn_handle, uint16_t mtu);
|
|
GATTOperationBuilder& withTimeout(uint32_t timeout_ms);
|
|
GATTOperationBuilder& withCallback(std::function<void(OperationResult, const Bytes&)> callback);
|
|
|
|
GATTOperation build();
|
|
|
|
private:
|
|
GATTOperation _op;
|
|
};
|
|
|
|
}} // namespace RNS::BLE
|