Merge remote-tracking branch 'OFW/dev' into dev [ci skip]

DarkFlippers · Oct 21, 2024 · fc16978 · fc16978
2 parents 75625ff + f8fa71c
commit fc16978
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/applications/main/nfc/plugins/supported_cards/trt.c b/applications/main/nfc/plugins/supported_cards/trt.c
@@ -40,7 +40,10 @@ static bool trt_parse(const NfcDevice* device, FuriString* parsed_data) {
         const uint8_t* full_record_pointer = &data->page[FULL_SALE_TIME_STAMP_PAGE].data[0];
         uint32_t latest_sale_record = bit_lib_get_bits_32(partial_record_pointer, 3, 20);
         uint32_t latest_sale_full_record = bit_lib_get_bits_32(full_record_pointer, 0, 27);
-        if(latest_sale_record != (latest_sale_full_record & 0xFFFFF)) break;
+        if(latest_sale_record != (latest_sale_full_record & 0xFFFFF))
+            break; // check if the copy matches
+        if((latest_sale_record == 0) || (latest_sale_full_record == 0))
+            break; // prevent false positive
 
         // Parse date
         // yyy yyyymmmm dddddhhh hhnnnnnn

diff --git a/lib/digital_signal/digital_sequence.c b/lib/digital_signal/digital_sequence.c
@@ -15,6 +15,9 @@
  * Example:
  * ./fbt --extra-define=DIGITAL_SIGNAL_DEBUG_OUTPUT_PIN=gpio_ext_pb3
  */
+#ifdef DIGITAL_SIGNAL_DEBUG_OUTPUT_PIN
+#include <furi_hal.h>
+#endif
 
 #define TAG "DigitalSequence"