Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-11-29 07:56:43 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2859 from portapack-mayhem/next

Browse source 
V2.3.1
This commit is contained in:
jLynx 2025-11-08 10:35:16 +13:00 • committed by GitHub
commit fe9448f149
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/version.txt vendored
View file

@ -1 +1 @@
v2.3.0 v2.3.1

13
firmware/application/apps/ble_rx_app.cpp
View file

@ -200,14 +200,6 @@ void RecentEntriesTable<BleRecentEntries>::draw(
hitsStr = to_string_dec_int(entry.numHits); hitsStr = to_string_dec_int(entry.numHits);
} }
std::string hitsStr;
if (!entry.informationString.empty()) {
hitsStr = entry.informationString;
} else {
hitsStr = to_string_dec_int(entry.numHits);
}
// Pushing single digit values down right justified. // Pushing single digit values down right justified.
int hitsDigits = hitsStr.length(); int hitsDigits = hitsStr.length();
uint8_t hits_spacing = 8 - hitsDigits; uint8_t hits_spacing = 8 - hitsDigits;
@ -1049,11 +1041,6 @@ bool BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry,
if (!success && !uniqueParsing) { if (!success && !uniqueParsing) {
success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString); success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
} }
if (!success && !uniqueParsing) {
success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
}
} else if (pdu_type == ADV_DIRECT_IND || pdu_type == SCAN_REQ) { } else if (pdu_type == ADV_DIRECT_IND || pdu_type == SCAN_REQ) {
if (!uniqueParsing) { if (!uniqueParsing) {
ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data; ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;

7
firmware/application/apps/ble_rx_app.hpp
View file

@ -175,13 +175,6 @@ class BleRecentEntryDetailView : public View {
{7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)}, {7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)},
"-"}; "-"};
Labels label_vendor{
{{0 * 8, 2 * 16}, "Vendor:", Theme::getInstance()->fg_light->foreground}};
Text text_vendor{
{7 * 8, 2 * 16, 23 * 8, 16},
"-"};
Labels labels{ Labels labels{
{{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground}, {{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground},
{{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground}, {{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground},

2
firmware/application/apps/ble_tx_app.hpp
View file

@ -293,7 +293,7 @@ class BLETxView : public View {
{{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}}; {{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};
TextViewer dataEditView{ TextViewer dataEditView{
{0, 9 * 18, screen_width, screen_height - 80}}; {0, 9 * 18, 240, 240}};
Button button_clear_marked{ Button button_clear_marked{
{UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)}, {UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)},

2
firmware/application/external/tetris/ui_tetris.hpp vendored
View file

@ -154,7 +154,7 @@ class TetrisView : public View {
NavigationView& nav_; NavigationView& nav_;
Button dummy{ Button dummy{
{screen_width, 0, 0, 0}, {240, 0, 0, 0},
""}; ""};
MessageHandlerRegistration message_handler_frame_sync{ MessageHandlerRegistration message_handler_frame_sync{

4
firmware/common/ui_widget.hpp
View file

@ -994,10 +994,6 @@ class Waveform : public Widget {
void set_paused(bool paused); void set_paused(bool paused);
bool is_clickable() const; bool is_clickable() const;
bool is_paused() const;
void set_paused(bool paused);
bool is_clickable() const;
void paint(Painter& painter) override; void paint(Painter& painter) override;
bool on_key(const KeyEvent key) override; bool on_key(const KeyEvent key) override;
bool on_touch(const TouchEvent event) override; bool on_touch(const TouchEvent event) override;