From ea2757908b68948b2217af90419f6e3deaa7f19d Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Sun, 20 Oct 2024 08:31:40 -0700 Subject: [PATCH 1/3] lib: digital_signal: digital_sequence: add furi_hal.h wrapped in ifdefs (#3964) Per the comment at the top of the file, defining DIGITAL_SIGNAL_DEBUG_OUTPUT_PIN to be a GpioPin variable name should allow additional debug output on that pin. However, this would not work without modifying the file as well to add the furi_hal.h header. Wrap including that header in the same macro define to automatically include it when used. Fixes: d92b0a82cc4c ("NFC refactoring (#3050)") Signed-off-by: Kris Bahnsen Co-authored-by: hedger --- lib/digital_signal/digital_sequence.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/digital_signal/digital_sequence.c b/lib/digital_signal/digital_sequence.c index f93ce6d95..14cb3aab2 100644 --- 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 +#endif #define TAG "DigitalSequence" From 1822221c69fe1c95a2c3b4d91f2c3b352eb8002f Mon Sep 17 00:00:00 2001 From: Ruslan Nadyrshin <110516632+rnadyrshin@users.noreply.github.com> Date: Sun, 20 Oct 2024 19:40:20 +0400 Subject: [PATCH 2/3] Minor change in the dev docs (#3962) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The main page title of the Dev docs has been changed Co-authored-by: あく --- documentation/doxygen/index.dox | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/documentation/doxygen/index.dox b/documentation/doxygen/index.dox index 7bd9024a1..9587afd8b 100644 --- a/documentation/doxygen/index.dox +++ b/documentation/doxygen/index.dox @@ -1,7 +1,8 @@ /** -@mainpage Overview +@mainpage notitle +## Welcome to Flipper Developer Documentation! -Welcome to the Flipper Developer Documentation! +--- This documentation is intended for developers interested in modifying the Flipper Zero firmware, creating Apps and JavaScript programs, or working on external hardware modules for the device. From f8fa71c575b2bf14d26c0ab6f5a4b0e4d6fb99d9 Mon Sep 17 00:00:00 2001 From: Zinong Li <131403964+zinongli@users.noreply.github.com> Date: Sun, 20 Oct 2024 23:58:33 +0800 Subject: [PATCH 3/3] NFC TRT Parser: Additional checks to prevent false positives (#3966) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * additional checks to prevent false positives * Update trt.c Co-authored-by: あく --- applications/main/nfc/plugins/supported_cards/trt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/applications/main/nfc/plugins/supported_cards/trt.c b/applications/main/nfc/plugins/supported_cards/trt.c index 5407ab1f7..793ad7f2d 100644 --- 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