mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-3351] github: re-enabled f18 build (#2743)

Browse Source 
* github: re-enabled f18 build
* scripts: storage: better transfer logging
* Fix PVS warnings

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger
2023-06-08 15:16:01 +09:00
committed by GitHub
co-authored by あく
parent c186d2b0cc
commit 3226254876
7 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/nfc_device.c
+1 -1
View File
@@ -808,7 +808,7 @@ static bool nfc_device_save_slix2_data(FlipperFormat* file, NfcDevice* dev) {
return saved;
}
bool nfc_device_load_slix2_data(FlipperFormat* file, NfcDevice* dev) {
bool nfc_device_load_slix2_data(FlipperFormat* file, NfcDevice* dev) { // -V524
bool parsed = false;
NfcVSlixData* data = &dev->dev_data.nfcv_data.sub_data.slix;
memset(data, 0, sizeof(NfcVSlixData));
lib/nfc/nfc_worker.c
+8 -8
View File
@@ -297,10 +297,10 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
ret = slix_unlock(nfcv_data, 4);
} else {
key = 0x7FFD6E5B;
key_data[0] = key >> 24;
key_data[1] = key >> 16;
key_data[2] = key >> 8;
key_data[3] = key >> 0;
key_data[0] = (key >> 24) & 0xFF;
key_data[1] = (key >> 16) & 0xFF;
key_data[2] = (key >> 8) & 0xFF;
key_data[3] = (key >> 0) & 0xFF;
ret = slix_unlock(nfcv_data, 4);
if(ret != ERR_NONE) {
@@ -317,10 +317,10 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
}
key = 0x0F0F0F0F;
key_data[0] = key >> 24;
key_data[1] = key >> 16;
key_data[2] = key >> 8;
key_data[3] = key >> 0;
key_data[0] = (key >> 24) & 0xFF;
key_data[1] = (key >> 16) & 0xFF;
key_data[2] = (key >> 8) & 0xFF;
key_data[3] = (key >> 0) & 0xFF;
ret = slix_unlock(nfcv_data, 4);
}
}
lib/nfc/protocols/nfcv.c
+2 -2
View File
@@ -438,7 +438,7 @@ void nfcv_emu_send(
furi_assert(nfcv);
/* picked default value (0) to match the most common format */
if(!flags) {
if(flags == NfcVSendFlagsNormal) {
flags = NfcVSendFlagsSof | NfcVSendFlagsCrc | NfcVSendFlagsEof |
NfcVSendFlagsOneSubcarrier | NfcVSendFlagsHighRate;
}
@@ -1326,7 +1326,7 @@ bool nfcv_emu_loop(
bits_received += 2;
if(periods == 1) {
byte_value |= 0x00 << 6;
byte_value |= 0x00 << 6; // -V684
periods_previous = 6;
} else if(periods == 3) {
byte_value |= 0x01 << 6;
lib/nfc/protocols/slix.c
+1 -1
View File
@@ -381,7 +381,7 @@ void slix_prepare(NfcVData* nfcv_data) {
ctx->emu_protocol_filter = &slix_protocol_filter;
}
bool slix2_protocol_filter(
bool slix2_protocol_filter( // -V524
FuriHalNfcTxRxContext* tx_rx,
FuriHalNfcDevData* nfc_data,
void* nfcv_data_in) {