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

resolve conflicts merge

Browse source
This commit is contained in:
gullradriel 2025-11-07 21:36:41 +01:00 • committed by GitHub
parent fd7637187a
commit 344aa0c741
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,6 +200,14 @@ void RecentEntriesTable<BleRecentEntries>::draw(
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.
int hitsDigits = hitsStr.length();
uint8_t hits_spacing = 8 - hitsDigits;
@ -1041,6 +1049,11 @@ bool BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry,
if (!success && !uniqueParsing) {
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) {
if (!uniqueParsing) {
ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;