Merge remote-tracking branch 'OFW/dev' into dev

lib/nfc/SConscript

@@ -63,6 +63,7 @@ env.Append(
         File("protocols/st25tb/st25tb_poller_sync.h"),
         # Misc
         File("helpers/nfc_util.h"),
+        File("helpers/felica_crc.h"),
         File("helpers/iso14443_crc.h"),
         File("helpers/iso13239_crc.h"),
         File("helpers/nfc_data_generator.h"),

lib/nfc/protocols/felica/felica.c

@@ -104,6 +104,7 @@ bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
                 break;
             }
         }
+        furi_string_free(temp_str);
     } while(false);
 
     return parsed;

lib/nfc/protocols/felica/felica.h

@@ -155,15 +155,13 @@ typedef struct {
     FelicaFSUnion data;
 } FelicaData;
 
-#pragma pack(push, 1)
-typedef struct {
+typedef struct FURI_PACKED {
     uint8_t code;
     FelicaIDm idm;
     uint8_t service_num;
     uint16_t service_code;
     uint8_t block_count;
 } FelicaCommandHeader;
-#pragma pack(pop)
 
 typedef struct {
     uint8_t length;

lib/nfc/protocols/mf_ultralight/mf_ultralight_poller_sync.c

@@ -248,7 +248,8 @@ static NfcCommand mf_ultralight_poller_read_callback(NfcGenericEvent event, void
         poller_context->error = MfUltralightErrorNone;
         command = NfcCommandStop;
     } else if(mfu_event->type == MfUltralightPollerEventTypeReadFailed) {
-        poller_context->error = mfu_event->data->error;
+        poller_context->error = mf_ultralight_process_error(
+            mfu_poller->iso14443_3a_poller->iso14443_3a_event_data.error);
         command = NfcCommandStop;
     } else if(mfu_event->type == MfUltralightPollerEventTypeAuthRequest) {
         if(poller_context->auth_context != NULL) {

lib/toolbox/cli/shell/cli_shell.c

@@ -442,7 +442,6 @@ static int32_t cli_shell_thread(void* context) {
 // ==========
 // Public API
 // ==========
-
 CliShell* cli_shell_alloc(
     CliShellMotd motd,
     void* context,