Added Sorting to BLE app (#1527)

* First BLE work

* Adding new fsk proc WIP

* Reverting ble stuff

* Initial compile working

* more work.

* Adding waterfall for debug

* more edits to debug

* Work to get widgets to show.

* cleanup before attempting diff fsk modulation method

* Temporary debug to learn how decimation scales.

* Tab view for console and spectrum. Spectrum still not working right.

* Fixed spectrum offset.

* Added audio sampling rate increments to freqman

* Added overriding range for frequency field and working off  deviation

* BLE cleanup. Got PDU parsing.

* Parsing CRC

* forgot :

* Removing AA again because cluttering UI

* fix compile

* attempt at throttling.

* WIP changes.

* Decimating by 4 to handle issue with overloading.

* Attempt to parse MAC still needs work.

* Small fixes. MAC still wrong.

* Fixed invalid indexing on Symbols.

* List view of BLE Mac Addresses

* Added Channel Option and improved GUI header.

* renaming to dB and fixing some warnings.

* Advertisements only.

* Initial cut of BLE Advertisement scan app.

* Copyrights

* formatting correctly in association to clang13

* Fixing warning and hiding fsk rx.

* spacing

* Removing some cmake install files that weren't suppose to be there.

* missed some.

* Added name to about.

* Edits for PR review pt.1

* Refactor ORing with 0 doesn't make sense.

* remove  parenthesis

* More PR Review changes.

* Fix compiler error.

* PR Review edits.

* PR review changes.

* Fixes.

* Unneeded ;

* Update ui_about_simple.cpp

* Disabling frequency stepping.

* removing unused label

* Fixing something that got messed up in merge?

* removing file that got added.

* editing labels.

* Added sort functionality.

* removed unused code.

---------

Co-authored-by: jLynx <admin@jlynx.net>
This commit is contained in:
Netro
2023-10-24 18:08:45 -04:00
committed by GitHub
parent 80bfcd5eb1
commit 15c338e5b3
5 changed files with 114 additions and 45 deletions
+28 -16
View File
@@ -76,6 +76,7 @@ struct BleRecentEntry {
uint64_t macAddress;
int dbValue;
BlePacketData packetData;
std::string timestamp;
BleRecentEntry()
: BleRecentEntry{0} {
@@ -85,7 +86,8 @@ struct BleRecentEntry {
const uint64_t macAddress)
: macAddress{macAddress},
dbValue{},
packetData{} {
packetData{},
timestamp{} {
}
Key key() const {
@@ -165,6 +167,17 @@ class BLERxView : public View {
static constexpr auto header_height = 12 + 2 * 16;
OptionsField options_channel{
{0 * 8, 0 * 8},
5,
{{"Ch.37 ", 37},
{"Ch.38", 38},
{"Ch.39", 39}}};
RxFrequencyField field_frequency{
{6 * 8, 0 * 16},
nav_};
RFAmpField field_rf_amp{
{16 * 8, 0 * 16}};
@@ -180,26 +193,25 @@ class BLERxView : public View {
Channel channel{
{24 * 8, 5, 6 * 8, 4}};
RxFrequencyField field_frequency{
{6 * 8, 0 * 16},
nav_};
Checkbox check_log{
{0 * 8, 3 * 8},
3,
"Log",
true};
OptionsField options_region{
{0 * 8, 0 * 8},
5,
{{"Ch.37 ", 37},
{"Ch.38", 38},
{"Ch.39", 39}}};
Labels label_sort{
{{6 * 8, 3 * 8}, "Sort:", Color::light_grey()}};
OptionsField options_sort{
{12 * 8, 3 * 8},
6,
{{"MAC", 0},
{"dB", 1},
{"Recent", 2}}};
Console console{
{0, 4 * 16, 240, 240}};
Checkbox check_log{
{0 * 8, 1 * 16},
3,
"LOG",
false};
std::string str_log{""};
bool logging{false};