Merge branch 'main' into dev

lib/led/nfc_playlist_led.c

@@ -4,25 +4,25 @@ NotificationMessage blink_message_normal = {
    .type = NotificationMessageTypeLedBlinkStart,
    .data.led_blink.color = LightBlue | LightGreen,
    .data.led_blink.on_time = 10,
-   .data.led_blink.period = 100,
+   .data.led_blink.period = 100
 };
 const NotificationSequence blink_sequence_normal = {
    &blink_message_normal,
    &message_do_not_reset,
-   NULL,
+   NULL
 };
 
 NotificationMessage blink_message_error = {
    .type = NotificationMessageTypeLedBlinkStart,
    .data.led_blink.color = LightRed,
    .data.led_blink.on_time = 10,
-   .data.led_blink.period = 100,
+   .data.led_blink.period = 100
 };
 
 const NotificationSequence blink_sequence_error = {
    &blink_message_error,
    &message_do_not_reset,
-   NULL,
+   NULL
 };
 
 void start_blink(NfcPlaylist* nfc_playlist, int state) {

lib/worker/nfc_playlist_worker.c

@@ -1,80 +1,79 @@
 #include "nfc_playlist_worker.h"
 
 NfcPlaylistWorker* nfc_playlist_worker_alloc() {
-    NfcPlaylistWorker* nfc_playlist_worker = malloc(sizeof(NfcPlaylistWorker));
-    // Worker thread attributes
-    nfc_playlist_worker->thread = furi_thread_alloc_ex(
-        "NfcPlaylistWorker", 8192, nfc_playlist_worker_task, nfc_playlist_worker);
-    nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
+   NfcPlaylistWorker* nfc_playlist_worker = malloc(sizeof(NfcPlaylistWorker));
 
-    nfc_playlist_worker->nfc = nfc_alloc();
-    nfc_playlist_worker->nfc_device = nfc_device_alloc();
+   nfc_playlist_worker->thread = furi_thread_alloc_ex("NfcPlaylistWorker", 8192, nfc_playlist_worker_task, nfc_playlist_worker);
+   nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
 
-    return nfc_playlist_worker;
+   nfc_playlist_worker->nfc = nfc_alloc();
+   nfc_playlist_worker->nfc_device = nfc_device_alloc();
+
+   return nfc_playlist_worker;
 }
 
 void nfc_playlist_worker_free(NfcPlaylistWorker* nfc_playlist_worker) {
-    furi_assert(nfc_playlist_worker);
-    furi_thread_free(nfc_playlist_worker->thread);
+   furi_assert(nfc_playlist_worker);
+   furi_thread_free(nfc_playlist_worker->thread);
 
-    nfc_free(nfc_playlist_worker->nfc);
-    nfc_device_free(nfc_playlist_worker->nfc_device);
+   nfc_free(nfc_playlist_worker->nfc);
+   nfc_device_free(nfc_playlist_worker->nfc_device);
 
-    free(nfc_playlist_worker);
+   free(nfc_playlist_worker);
 }
 
 void nfc_playlist_worker_stop(NfcPlaylistWorker* nfc_playlist_worker) {
-    furi_assert(nfc_playlist_worker);
-    if(nfc_playlist_worker->state != NfcPlaylistWorkerState_Stopped) {
-        nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
-        furi_thread_join(nfc_playlist_worker->thread);
-    }
+   furi_assert(nfc_playlist_worker);
+   if (nfc_playlist_worker->state != NfcPlaylistWorkerState_Stopped) {
+      nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
+      furi_thread_join(nfc_playlist_worker->thread);
+   }
 }
 
 void nfc_playlist_worker_start(NfcPlaylistWorker* nfc_playlist_worker) {
-    furi_assert(nfc_playlist_worker);
-    nfc_playlist_worker->state = NfcPlaylistWorkerState_Emulating;
-    furi_thread_start(nfc_playlist_worker->thread);
+   furi_assert(nfc_playlist_worker);
+   nfc_playlist_worker->state = NfcPlaylistWorkerState_Emulating;
+   furi_thread_start(nfc_playlist_worker->thread);
 }
 
 int32_t nfc_playlist_worker_task(void* context) {
-    NfcPlaylistWorker* nfc_playlist_worker = context;
+   NfcPlaylistWorker* nfc_playlist_worker = context;
 
-    if(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
+   if (nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
 
-        nfc_playlist_worker->nfc_listener =
-            nfc_listener_alloc(nfc_playlist_worker->nfc,
-                nfc_playlist_worker->nfc_protocol,
-                nfc_device_get_data(nfc_playlist_worker->nfc_device, nfc_playlist_worker->nfc_protocol)
-            );
-        nfc_listener_start(nfc_playlist_worker->nfc_listener, NULL, NULL);
+      nfc_playlist_worker->nfc_listener =
+         nfc_listener_alloc(nfc_playlist_worker->nfc,
+            nfc_playlist_worker->nfc_protocol,
+            nfc_device_get_data(nfc_playlist_worker->nfc_device, nfc_playlist_worker->nfc_protocol)
+         );
+      nfc_listener_start(nfc_playlist_worker->nfc_listener, NULL, NULL);
 
-        while(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
-            furi_delay_ms(50);
-        }
+      while(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
+         furi_delay_ms(50);
+      }
 
-        nfc_listener_stop(nfc_playlist_worker->nfc_listener);
-        nfc_listener_free(nfc_playlist_worker->nfc_listener);
-    }
+      nfc_listener_stop(nfc_playlist_worker->nfc_listener);
+      nfc_listener_free(nfc_playlist_worker->nfc_listener);
+   }
 
-    nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
+   nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
 
-    return 0;
+   return 0;
 }
 
 bool nfc_playlist_worker_is_emulating(NfcPlaylistWorker* nfc_playlist_worker) {
-    if(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
-        return true;
-    }
-    return false;
+   if (nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
+      return true;
+   }
+   return false;
 }
 
 void nfc_playlist_worker_set_nfc_data(NfcPlaylistWorker* nfc_playlist_worker, char* file_path) {
-    nfc_device_clear(nfc_playlist_worker->nfc_device);
-    nfc_device_load(nfc_playlist_worker->nfc_device, file_path);
-    nfc_playlist_worker->nfc_protocol = nfc_device_get_protocol(nfc_playlist_worker->nfc_device);
+   nfc_device_clear(nfc_playlist_worker->nfc_device);
+   nfc_device_load(nfc_playlist_worker->nfc_device, file_path);
+   nfc_playlist_worker->nfc_protocol = nfc_device_get_protocol(nfc_playlist_worker->nfc_device);
 }
 
 NfcDeviceData* nfc_playlist_worker_get_nfc_data(NfcPlaylistWorker* nfc_playlist_worker) {
-    return nfc_playlist_worker->nfc_data;
+   return nfc_playlist_worker->nfc_data;
 }

nfc_playlist.c

@@ -68,7 +68,7 @@ static NfcPlaylist* nfc_playlist_alloc() {
    nfc_playlist->file_browser = file_browser_alloc(nfc_playlist->settings.file_path);
    nfc_playlist->text_input = text_input_alloc();
    nfc_playlist->popup = popup_alloc();
-
+  
    view_dispatcher_set_event_callback_context(nfc_playlist->view_dispatcher, nfc_playlist);
    view_dispatcher_set_custom_event_callback(nfc_playlist->view_dispatcher, nfc_playlist_custom_callback);
    view_dispatcher_set_navigation_event_callback(nfc_playlist->view_dispatcher, nfc_playlist_back_event_callback);

scences/main_menu.c

@@ -74,7 +74,6 @@ void nfc_playlist_main_menu_scene_on_enter(void* context) {
       NfcPlaylistMenuSelection_Settings,
       nfc_playlist_main_menu_menu_callback,
       nfc_playlist);
-
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Menu);
 }