Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FL-3637] NFC RC fixes #3165

Merged
merged 12 commits into from
Oct 28, 2023
Merged

[FL-3637] NFC RC fixes #3165

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
49d9ed7
firmware: remove nfc lib build settings section
gornekich Oct 24, 2023
45448c9
furi hal nfc: fix nfc irq gpio deinit
gornekich Oct 24, 2023
2eeea83
lib nfc: remove deprecated exception from sources
gornekich Oct 24, 2023
695385e
nfc: use ASK demodulator in transparent mode
gornekich Oct 24, 2023
528f284
mf ultralight: add upper page bound for NTAGI2C1K
gornekich Oct 24, 2023
8cd34a1
furi hal nfc: set event if nfc event was started
gornekich Oct 24, 2023
df36498
nfc: fix PVS warnings
gornekich Oct 24, 2023
987f7f6
lib signal reader: remove gpio pull setting in alloc
gornekich Oct 25, 2023
455316c
furi: added math.h include for compatibility with existing apps
hedger Oct 27, 2023
e5f5596
Merge branch 'dev' into gornek/3637_nfc_rc_fixes
skotopes Oct 28, 2023
9bf740b
nfc: remove resolved TODO in mf desfire poller
gornekich Oct 28, 2023
830f7e4
Bump api symbols for new SDK with math.h fix
skotopes Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions firmware.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,6 @@ env = ENV.Clone(
"FURI_DEBUG" if ENV["DEBUG"] else "FURI_NDEBUG",
],
},
"nfc": {
"CCFLAGS": [
"-Og",
],
"CPPDEFINES": [
"NDEBUG",
"FURI_DEBUG",
],
},
},
FW_API_TABLE=None,
_APP_ICONS=None,
Expand Down
5 changes: 3 additions & 2 deletions firmware/targets/f7/furi_hal/furi_hal_nfc_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ FuriHalNfcError furi_hal_nfc_event_stop() {

void furi_hal_nfc_event_set(FuriHalNfcEventInternalType event) {
furi_assert(furi_hal_nfc_event);
furi_assert(furi_hal_nfc_event->thread);

furi_thread_flags_set(furi_hal_nfc_event->thread, event);
if(furi_hal_nfc_event->thread) {
furi_thread_flags_set(furi_hal_nfc_event->thread, event);
}
}

FuriHalNfcError furi_hal_nfc_abort() {
Expand Down
2 changes: 1 addition & 1 deletion firmware/targets/f7/furi_hal/furi_hal_nfc_irq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ void furi_hal_nfc_init_gpio_isr() {
}

void furi_hal_nfc_deinit_gpio_isr() {
furi_hal_gpio_init(&gpio_nfc_irq_rfid_pull, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
furi_hal_gpio_remove_int_callback(&gpio_nfc_irq_rfid_pull);
furi_hal_gpio_init(&gpio_nfc_irq_rfid_pull, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
}
2 changes: 1 addition & 1 deletion firmware/targets/f7/furi_hal/furi_hal_nfc_iso15693.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static FuriHalNfcIso15693Listener* furi_hal_nfc_iso15693_listener_alloc() {

instance->signal = iso15693_signal_alloc(&gpio_spi_r_mosi);
instance->parser =
iso15693_parser_alloc(&gpio_spi_r_miso, FURI_HAL_NFC_ISO15693_MAX_FRAME_SIZE);
iso15693_parser_alloc(&gpio_nfc_irq_rfid_pull, FURI_HAL_NFC_ISO15693_MAX_FRAME_SIZE);

return instance;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/nfc/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ env.Append(
libenv = env.Clone(FW_LIB_NAME="nfc")
libenv.ApplyLibFlags()

sources = libenv.GlobRecursive("*.c*", exclude="deprecated/*c")
sources = libenv.GlobRecursive("*.c*")

lib = libenv.StaticLibrary("${FW_LIB_NAME}", sources)
libenv.Install("${LIB_DIST_DIR}", lib)
Expand Down
3 changes: 2 additions & 1 deletion lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ MfDesfireError mf_desfire_poller_async_read_file_value(
return error;
}

MfDesfireError mf_desfire_poller_async_read_file_records(
// TODO FL-3639: this function is equal to mf_desfire_poller_async_read_file_data()
MfDesfireError mf_desfire_poller_async_read_file_records( //-V524
MfDesfirePoller* instance,
MfDesfireFileId id,
uint32_t offset,
Expand Down
2 changes: 1 addition & 1 deletion lib/nfc/protocols/mf_ultralight/mf_ultralight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ bool mf_ultralight_load(MfUltralightData* data, FlipperFormat* ff, uint32_t vers
uint32_t pages_total = 0;
if(!flipper_format_read_uint32(ff, MF_ULTRALIGHT_PAGES_TOTAL_KEY, &pages_total, 1)) break;
uint32_t pages_read = 0;
if(data_format_version < mf_ultralight_data_format_version) {
if(data_format_version < mf_ultralight_data_format_version) { //-V547
pages_read = pages_total;
} else {
if(!flipper_format_read_uint32(ff, MF_ULTRALIGHT_PAGES_READ_KEY, &pages_read, 1))
Expand Down
2 changes: 2 additions & 0 deletions lib/nfc/protocols/mf_ultralight/mf_ultralight_listener_i.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,8 @@ static uint16_t mf_ultralight_get_upper_page_bound(MfUltralightType type) {
upper_page_bound = 511;
else if(type == MfUltralightTypeNTAGI2C2K)
upper_page_bound = 479;
else if(type == MfUltralightTypeNTAGI2C1K)
upper_page_bound = 225;
else {
upper_page_bound = mf_ultralight_get_config_page_num(type) - 2;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/signal_reader/parsers/iso15693/iso15693_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Iso15693Parser* iso15693_parser_alloc(const GpioPin* pin, size_t max_frame_size)
signal_reader_set_sample_rate(
instance->signal_reader, SignalReaderTimeUnit64Mhz, ISO15693_PARSER_BITRATE_F64MHZ);
signal_reader_set_pull(instance->signal_reader, GpioPullDown);
signal_reader_set_polarity(instance->signal_reader, SignalReaderPolarityInverted);
signal_reader_set_polarity(instance->signal_reader, SignalReaderPolarityNormal);
signal_reader_set_trigger(instance->signal_reader, SignalReaderTriggerRisingFallingEdge);

return instance;
Expand Down
2 changes: 1 addition & 1 deletion lib/signal_reader/signal_reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SignalReader* signal_reader_alloc(const GpioPin* gpio_pin, uint32_t size) {
SignalReader* instance = malloc(sizeof(SignalReader));

instance->pin = gpio_pin;
instance->pull = GpioPullNo;
instance->pull = GpioPullDown;
skotopes marked this conversation as resolved.
Show resolved Hide resolved

instance->buffer_size = size;
instance->gpio_buffer = malloc(sizeof(uint16_t) * size * 8);
Expand Down