mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2026-09-12 01:29:29 +00:00
BLE Tx App / BLE Rx Filtering. (#1543)
BLE TX app creation BLE RX and TX app improvements
This commit is contained in:
@@ -77,6 +77,7 @@ struct BleRecentEntry {
|
||||
int dbValue;
|
||||
BlePacketData packetData;
|
||||
std::string timestamp;
|
||||
std::string dataString;
|
||||
|
||||
BleRecentEntry()
|
||||
: BleRecentEntry{0} {
|
||||
@@ -87,14 +88,13 @@ struct BleRecentEntry {
|
||||
: macAddress{macAddress},
|
||||
dbValue{},
|
||||
packetData{},
|
||||
timestamp{} {
|
||||
timestamp{},
|
||||
dataString{} {
|
||||
}
|
||||
|
||||
Key key() const {
|
||||
return macAddress;
|
||||
}
|
||||
|
||||
// void update(const BlePacketData * packet);
|
||||
};
|
||||
|
||||
using BleRecentEntries = RecentEntries<BleRecentEntry>;
|
||||
@@ -151,6 +151,8 @@ class BLERxView : public View {
|
||||
|
||||
private:
|
||||
void on_data(BlePacketData* packetData);
|
||||
void on_switch_table(const std::string value);
|
||||
void updateEntry(const BlePacketData* packet, BleRecentEntry& entry);
|
||||
|
||||
NavigationView& nav_;
|
||||
RxRadioState radio_state_{
|
||||
@@ -165,6 +167,9 @@ class BLERxView : public View {
|
||||
uint32_t prev_value{0};
|
||||
uint8_t channel_number = 37;
|
||||
|
||||
std::string filterBuffer{};
|
||||
std::string filter{};
|
||||
|
||||
static constexpr auto header_height = 12 + 2 * 16;
|
||||
|
||||
OptionsField options_channel{
|
||||
@@ -209,6 +214,10 @@ class BLERxView : public View {
|
||||
{"dB", 1},
|
||||
{"Recent", 2}}};
|
||||
|
||||
Button button_message{
|
||||
{22 * 8, 3 * 8, 4 * 8, 16},
|
||||
"Filter"};
|
||||
|
||||
Console console{
|
||||
{0, 4 * 16, 240, 240}};
|
||||
|
||||
@@ -223,6 +232,7 @@ class BLERxView : public View {
|
||||
// {"Time", 8}}};
|
||||
|
||||
BleRecentEntries recent{};
|
||||
BleRecentEntries filterEntries{};
|
||||
|
||||
const RecentEntriesColumns columns{{
|
||||
{"Mac Address", 20},
|
||||
@@ -231,6 +241,7 @@ class BLERxView : public View {
|
||||
|
||||
BleRecentEntry entry_{};
|
||||
BleRecentEntriesView recent_entries_view{columns, recent};
|
||||
BleRecentEntriesView recent_entries_filter_view{columns, filterEntries};
|
||||
BleRecentEntryDetailView recent_entry_detail_view{nav_, entry_};
|
||||
|
||||
MessageHandlerRegistration message_handler_packet{
|
||||
|
||||
Reference in New Issue
Block a user