Skip to content

Commit fc16978

Browse files
committed
Merge remote-tracking branch 'OFW/dev' into dev [ci skip]
2 parents 75625ff + f8fa71c commit fc16978

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

applications/main/nfc/plugins/supported_cards/trt.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ static bool trt_parse(const NfcDevice* device, FuriString* parsed_data) {
4040
const uint8_t* full_record_pointer = &data->page[FULL_SALE_TIME_STAMP_PAGE].data[0];
4141
uint32_t latest_sale_record = bit_lib_get_bits_32(partial_record_pointer, 3, 20);
4242
uint32_t latest_sale_full_record = bit_lib_get_bits_32(full_record_pointer, 0, 27);
43-
if(latest_sale_record != (latest_sale_full_record & 0xFFFFF)) break;
43+
if(latest_sale_record != (latest_sale_full_record & 0xFFFFF))
44+
break; // check if the copy matches
45+
if((latest_sale_record == 0) || (latest_sale_full_record == 0))
46+
break; // prevent false positive
4447

4548
// Parse date
4649
// yyy yyyymmmm dddddhhh hhnnnnnn

lib/digital_signal/digital_sequence.c

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
* Example:
1616
* ./fbt --extra-define=DIGITAL_SIGNAL_DEBUG_OUTPUT_PIN=gpio_ext_pb3
1717
*/
18+
#ifdef DIGITAL_SIGNAL_DEBUG_OUTPUT_PIN
19+
#include <furi_hal.h>
20+
#endif
1821

1922
#define TAG "DigitalSequence"
2023

0 commit comments

Comments
 (0)