diff --git a/applications/plugins/nrf24scan/nrf24scan.c b/applications/plugins/nrf24scan/nrf24scan.c index 02447dc2c..a8693656a 100644 --- a/applications/plugins/nrf24scan/nrf24scan.c +++ b/applications/plugins/nrf24scan/nrf24scan.c @@ -18,7 +18,7 @@ #define MAX_ADDR 6 #define SCAN_APP_PATH_FOLDER "/ext/nrf24scan" -#define ADDR_FILENAME \ +#define ADDR_FILENAME \ "addr.txt" // File format (1 parameter per line): \ // Rate: 0/1/2 - rate in Mbps (=0.25/1/2) \ // Ch: 0..125 - default channel \ diff --git a/lib/nfc/protocols/nfcv.c b/lib/nfc/protocols/nfcv.c index 295a6fe8d..75ba1e6f9 100644 --- a/lib/nfc/protocols/nfcv.c +++ b/lib/nfc/protocols/nfcv.c @@ -276,10 +276,16 @@ void nfcv_emu_alloc(NfcVData* data) { data->emulation.nfcv_signal, NFCV_SIG_EOF, data->emulation.nfcv_resp_eof); } -static void nfcv_emu_send(FuriHalNfcTxRxContext* tx_rx, NfcVData* nfcv, uint8_t* data, uint8_t length, NfcVSendFlags flags) { +static void nfcv_emu_send( + FuriHalNfcTxRxContext* tx_rx, + NfcVData* nfcv, + uint8_t* data, + uint8_t length, + NfcVSendFlags flags) { /* picked default value (0) to match the most common format */ if(!flags) { - flags = NfcVSendFlagsSof | NfcVSendFlagsCrc | NfcVSendFlagsEof | NfcVSendFlagsOneSubcarrier | NfcVSendFlagsHighRate; + flags = NfcVSendFlagsSof | NfcVSendFlagsCrc | NfcVSendFlagsEof | + NfcVSendFlagsOneSubcarrier | NfcVSendFlagsHighRate; } if(flags & NfcVSendFlagsCrc) { @@ -462,7 +468,8 @@ void nfcv_emu_handle_packet( &response_buffer[1], &nfcv_data->data[nfcv_data->block_size * block], nfcv_data->block_size); - nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1 + nfcv_data->block_size, response_flags); + nfcv_emu_send( + tx_rx, nfcv_data, response_buffer, 1 + nfcv_data->block_size, response_flags); } snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "READ BLOCK %d", block); break; diff --git a/lib/nfc/protocols/nfcv.h b/lib/nfc/protocols/nfcv.h index c7691c1af..e92be168c 100644 --- a/lib/nfc/protocols/nfcv.h +++ b/lib/nfc/protocols/nfcv.h @@ -99,14 +99,14 @@ typedef struct { } NfcVSlixData; typedef enum { - NfcVSendFlagsNormal = 0, - NfcVSendFlagsSof = 1<<0, - NfcVSendFlagsCrc = 1<<1, - NfcVSendFlagsEof = 1<<2, - NfcVSendFlagsOneSubcarrier = 0, - NfcVSendFlagsTwoSubcarrier = 1<<3, - NfcVSendFlagsLowRate = 0, - NfcVSendFlagsHighRate = 1<<4 + NfcVSendFlagsNormal = 0, + NfcVSendFlagsSof = 1 << 0, + NfcVSendFlagsCrc = 1 << 1, + NfcVSendFlagsEof = 1 << 2, + NfcVSendFlagsOneSubcarrier = 0, + NfcVSendFlagsTwoSubcarrier = 1 << 3, + NfcVSendFlagsLowRate = 0, + NfcVSendFlagsHighRate = 1 << 4 } NfcVSendFlags; typedef struct { diff --git a/lib/nfc/protocols/slix.c b/lib/nfc/protocols/slix.c index ea799b149..1182235b1 100644 --- a/lib/nfc/protocols/slix.c +++ b/lib/nfc/protocols/slix.c @@ -10,22 +10,17 @@ uint8_t slix_get_ti(FuriHalNfcDevData* nfc_data) { return (nfc_data->uid[3] >> 3) & 3; } - bool slix_check_card_type(FuriHalNfcDevData* nfc_data) { - if((nfc_data->uid[0] == 0xE0) - && (nfc_data->uid[1] == 0x04) - && (nfc_data->uid[2] == 0x01) - && slix_get_ti(nfc_data) == 2) { + if((nfc_data->uid[0] == 0xE0) && (nfc_data->uid[1] == 0x04) && (nfc_data->uid[2] == 0x01) && + slix_get_ti(nfc_data) == 2) { return true; } return false; } bool slix2_check_card_type(FuriHalNfcDevData* nfc_data) { - if((nfc_data->uid[0] == 0xE0) - && (nfc_data->uid[1] == 0x04) - && (nfc_data->uid[2] == 0x01) - && slix_get_ti(nfc_data) == 1) { + if((nfc_data->uid[0] == 0xE0) && (nfc_data->uid[1] == 0x04) && (nfc_data->uid[2] == 0x01) && + slix_get_ti(nfc_data) == 1) { return true; } return false;