fmt

applications/mousejacker/mousejacker.c

@@ -36,7 +36,6 @@ typedef struct {
     int y;
     bool ducky_err;
     bool addr_err;
-    bool ducky_running;
 } PluginState;
 
 uint8_t addrs_count = 0;
@@ -55,7 +54,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     canvas_draw_frame(canvas, 0, 0, 128, 64);
 
     canvas_set_font(canvas, FontSecondary);
-    if(!plugin_state->addr_err && !plugin_state->ducky_err && !plugin_state->ducky_running) {
+    if(!plugin_state->addr_err && !plugin_state->ducky_err) {
         sprintf(target_text, target_fmt_text, target_address_str);
         canvas_draw_str_aligned(canvas, 7, 10, AlignLeft, AlignBottom, target_text);
         canvas_draw_str_aligned(canvas, 22, 20, AlignLeft, AlignBottom, "<- select address ->");
@@ -74,10 +73,6 @@ static void render_callback(Canvas* const canvas, void* ctx) {
             canvas, 10, 10, AlignLeft, AlignBottom, "Error: No mousejacker folder");
         canvas_draw_str_aligned(canvas, 10, 20, AlignLeft, AlignBottom, "or duckyscript file");
         canvas_draw_str_aligned(canvas, 10, 30, AlignLeft, AlignBottom, "loading error");
-    } else if(plugin_state->ducky_running) {
-        sprintf(target_text, target_fmt_text, target_address_str);
-        canvas_draw_str_aligned(canvas, 7, 10, AlignLeft, AlignBottom, target_text);
-        canvas_draw_str_aligned(canvas, 10, 30, AlignLeft, AlignBottom, "Running duckyscript...");
     }
 
     release_mutex((ValueMutex*)ctx, plugin_state);
@@ -142,13 +137,8 @@ static bool open_addrs_file(Stream* stream) {
     return result;
 }
 
-static bool process_ducky_file(
+static bool
-    ViewPort* view_port,
+    process_ducky_file(Stream* file_stream, uint8_t* addr, uint8_t addr_size, uint8_t rate) {
-    PluginState* plugin_state,
-    Stream* file_stream,
-    uint8_t* addr,
-    uint8_t addr_size,
-    uint8_t rate) {
     size_t file_size = 0;
     size_t bytes_read = 0;
     uint8_t* file_buf;
@@ -164,13 +154,9 @@ static bool process_ducky_file(
         memset(file_buf, 0, file_size);
         bytes_read = stream_read(file_stream, file_buf, file_size);
         if(bytes_read == file_size) {
-            plugin_state->ducky_running = true;
-            view_port_update(view_port);
             FURI_LOG_I(TAG, "executing ducky script");
             mj_process_ducky_script(nrf24_HANDLE, addr, addr_size, rate, (char*)file_buf);
             FURI_LOG_I(TAG, "finished execution");
-            furi_delay_ms(300);
-            plugin_state->ducky_running = false;
             loaded = true;
         } else {
             FURI_LOG_I(TAG, "load failed. file size: %d", file_size);
@@ -311,8 +297,6 @@ int32_t mousejacker_app(void* p) {
                                 LOGITECH_MAX_CHANNEL,
                                 true);
                             ducky_ok = process_ducky_file(
-                                view_port,
-                                plugin_state,
                                 file_stream,
                                 loaded_addrs[addr_idx] + 1,
                                 5,

applications/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c

@@ -40,11 +40,13 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
     view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewConsoleOutput);
 
     // Register callback to receive data
-    wifi_marauder_uart_set_handle_rx_data_cb(app->uart, wifi_marauder_console_output_handle_rx_data_cb); // setup callback for rx thread
+    wifi_marauder_uart_set_handle_rx_data_cb(
+        app->uart, wifi_marauder_console_output_handle_rx_data_cb); // setup callback for rx thread
 
     // Send command with newline '\n'
     if(app->is_command && app->selected_tx_string) {
-        wifi_marauder_uart_tx((uint8_t*)(app->selected_tx_string), strlen(app->selected_tx_string));
+        wifi_marauder_uart_tx(
+            (uint8_t*)(app->selected_tx_string), strlen(app->selected_tx_string));
         wifi_marauder_uart_tx((uint8_t*)("\n"), 1);
     }
 }

applications/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c

@@ -87,10 +87,12 @@ bool wifi_marauder_scene_start_on_event(void* context, SceneManagerEvent event)
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == WifiMarauderEventStartKeyboard) {
-            scene_manager_set_scene_state(app->scene_manager, WifiMarauderSceneStart, app->selected_menu_index);
+            scene_manager_set_scene_state(
+                app->scene_manager, WifiMarauderSceneStart, app->selected_menu_index);
             scene_manager_next_scene(app->scene_manager, WifiMarauderAppViewTextInput);
         } else if(event.event == WifiMarauderEventStartConsole) {
-            scene_manager_set_scene_state(app->scene_manager, WifiMarauderSceneStart, app->selected_menu_index);
+            scene_manager_set_scene_state(
+                app->scene_manager, WifiMarauderSceneStart, app->selected_menu_index);
             scene_manager_next_scene(app->scene_manager, WifiMarauderAppViewConsoleOutput);
         }
         consumed = true;

applications/wifi_marauder_companion/scenes/wifi_marauder_scene_text_input.c

@@ -1,6 +1,5 @@
 #include "../wifi_marauder_app_i.h"
 
-
 void wifi_marauder_scene_text_input_callback(void* context) {
     WifiMarauderApp* app = context;
 
@@ -26,7 +25,13 @@ void wifi_marauder_scene_text_input_on_enter(void* context) {
     // Setup view
     TextInput* text_input = app->text_input;
     text_input_set_header_text(text_input, "Add command arguments");
-    text_input_set_result_callback(text_input, wifi_marauder_scene_text_input_callback, app, app->text_input_store, WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE, false);
+    text_input_set_result_callback(
+        text_input,
+        wifi_marauder_scene_text_input_callback,
+        app,
+        app->text_input_store,
+        WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE,
+        false);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewTextInput);
 }

applications/wifi_marauder_companion/wifi_marauder_app.c

@@ -47,12 +47,14 @@ WifiMarauderApp* wifi_marauder_app_alloc() {
         variable_item_list_get_view(app->var_item_list));
 
     app->text_box = text_box_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewConsoleOutput, text_box_get_view(app->text_box));
+    view_dispatcher_add_view(
+        app->view_dispatcher, WifiMarauderAppViewConsoleOutput, text_box_get_view(app->text_box));
     string_init(app->text_box_store);
     string_reserve(app->text_box_store, WIFI_MARAUDER_TEXT_BOX_STORE_SIZE);
 
     app->text_input = text_input_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewTextInput, text_input_get_view(app->text_input));
+    view_dispatcher_add_view(
+        app->view_dispatcher, WifiMarauderAppViewTextInput, text_input_get_view(app->text_input));
 
     scene_manager_next_scene(app->scene_manager, WifiMarauderSceneStart);
 

applications/wifi_marauder_companion/wifi_marauder_uart.c

@@ -19,7 +19,9 @@ typedef enum {
     WorkerEvtRxDone = (1 << 1),
 } WorkerEvtFlags;
 
-void wifi_marauder_uart_set_handle_rx_data_cb(WifiMarauderUart* uart, void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void* context)) {
+void wifi_marauder_uart_set_handle_rx_data_cb(
+    WifiMarauderUart* uart,
+    void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context)) {
     furi_assert(uart);
     uart->handle_rx_data_cb = handle_rx_data_cb;
 }
@@ -48,8 +50,7 @@ static int32_t uart_worker(void* context) {
         furi_check((events & FuriFlagError) == 0);
         if(events & WorkerEvtStop) break;
         if(events & WorkerEvtRxDone) {
-            size_t len =
+            size_t len = xStreamBufferReceive(uart->rx_stream, uart->rx_buf, RX_BUF_SIZE, 0);
-                xStreamBufferReceive(uart->rx_stream, uart->rx_buf, RX_BUF_SIZE, 0);
             if(len > 0) {
                 if(uart->handle_rx_data_cb) uart->handle_rx_data_cb(uart->rx_buf, len, uart->app);
             }

applications/wifi_marauder_companion/wifi_marauder_uart.h

@@ -6,7 +6,9 @@
 
 typedef struct WifiMarauderUart WifiMarauderUart;
 
-void wifi_marauder_uart_set_handle_rx_data_cb(WifiMarauderUart* uart, void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void* context));
+void wifi_marauder_uart_set_handle_rx_data_cb(
+    WifiMarauderUart* uart,
+    void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context));
 void wifi_marauder_uart_tx(uint8_t* data, size_t len);
 WifiMarauderUart* wifi_marauder_uart_init(WifiMarauderApp* app);
 void wifi_marauder_uart_free(WifiMarauderUart* uart);

lib/drivers/nrf24.h

@@ -42,10 +42,8 @@ extern "C" {
 #define nrf24_CE_PIN &gpio_ext_pb2
 #define nrf24_HANDLE &furi_hal_spi_bus_handle_external
 
-
 /* Low level API */
 
-
 /** Write device register
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -56,7 +54,6 @@ extern "C" {
  */
 uint8_t nrf24_write_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t data);
 
-
 /** Write buffer to device register
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -68,7 +65,6 @@ uint8_t nrf24_write_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t data);
  */
 uint8_t nrf24_write_buf_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size);
 
-
 /** Read device register
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -79,7 +75,6 @@ uint8_t nrf24_write_buf_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* d
  */
 uint8_t nrf24_read_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size);
 
-
 /** Power up the radio for operation
  * 
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -88,7 +83,6 @@ uint8_t nrf24_read_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data,
  */
 uint8_t nrf24_power_up(FuriHalSpiBusHandle* handle);
 
-
 /** Power down the radio
  * 
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -97,7 +91,6 @@ uint8_t nrf24_power_up(FuriHalSpiBusHandle* handle);
  */
 uint8_t nrf24_set_idle(FuriHalSpiBusHandle* handle);
 
-
 /** Sets the radio to RX mode
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -106,7 +99,6 @@ uint8_t nrf24_set_idle(FuriHalSpiBusHandle* handle);
  */
 uint8_t nrf24_set_rx_mode(FuriHalSpiBusHandle* handle);
 
-
 /** Sets the radio to TX mode
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -124,7 +116,6 @@ uint8_t nrf24_set_tx_mode(FuriHalSpiBusHandle* handle);
  */
 void nrf24_init();
 
-
 /** Send flush rx command
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -141,7 +132,6 @@ uint8_t nrf24_flush_rx(FuriHalSpiBusHandle* handle);
  */
 uint8_t nrf24_flush_tx(FuriHalSpiBusHandle* handle);
 
-
 /** Gets the RX packet length in data pipe 0
  * 
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -150,7 +140,6 @@ uint8_t nrf24_flush_tx(FuriHalSpiBusHandle* handle);
  */
 uint8_t nrf24_get_packetlen(FuriHalSpiBusHandle* handle);
 
-
 /** Sets the RX packet length in data pipe 0
  * 
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -160,7 +149,6 @@ uint8_t nrf24_get_packetlen(FuriHalSpiBusHandle* handle);
  */
 uint8_t nrf24_set_packetlen(FuriHalSpiBusHandle* handle, uint8_t len);
 
-
 /** Gets configured length of MAC address
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -212,7 +200,6 @@ uint8_t nrf24_set_rate(FuriHalSpiBusHandle* handle, uint32_t rate);
  */
 uint8_t nrf24_get_chan(FuriHalSpiBusHandle* handle);
 
-
 /** Sets the channel
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -222,7 +209,6 @@ uint8_t nrf24_get_chan(FuriHalSpiBusHandle* handle);
  */
 uint8_t nrf24_set_chan(FuriHalSpiBusHandle* handle, uint8_t chan);
 
-
 /** Gets the source mac address
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -232,7 +218,6 @@ uint8_t nrf24_set_chan(FuriHalSpiBusHandle* handle, uint8_t chan);
  */
 uint8_t nrf24_get_src_mac(FuriHalSpiBusHandle* handle, uint8_t* mac);
 
-
 /** Sets the source mac address
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -243,7 +228,6 @@ uint8_t nrf24_get_src_mac(FuriHalSpiBusHandle* handle, uint8_t *mac);
  */
 uint8_t nrf24_set_src_mac(FuriHalSpiBusHandle* handle, uint8_t* mac, uint8_t size);
 
-
 /** Gets the dest mac address
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -253,7 +237,6 @@ uint8_t nrf24_set_src_mac(FuriHalSpiBusHandle* handle, uint8_t* mac, uint8_t siz
  */
 uint8_t nrf24_get_dst_mac(FuriHalSpiBusHandle* handle, uint8_t* mac);
 
-
 /** Sets the dest mac address
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -264,7 +247,6 @@ uint8_t nrf24_get_dst_mac(FuriHalSpiBusHandle* handle, uint8_t *mac);
  */
 uint8_t nrf24_set_dst_mac(FuriHalSpiBusHandle* handle, uint8_t* mac, uint8_t size);
 
-
 /** Reads RX packet
  *
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -274,8 +256,8 @@ uint8_t nrf24_set_dst_mac(FuriHalSpiBusHandle* handle, uint8_t* mac, uint8_t siz
  * 
  * @return     device status
  */
-uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* packetsize, bool full);
+uint8_t
-
+    nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* packetsize, bool full);
 
 /** Sends TX packet
  *
@@ -288,7 +270,6 @@ uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* pa
  */
 uint8_t nrf24_txpacket(FuriHalSpiBusHandle* handle, uint8_t* payload, uint8_t size, bool ack);
 
-
 /** Configure the radio
  * This is not comprehensive, but covers a lot of the common configuration options that may be changed
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -301,7 +282,15 @@ uint8_t nrf24_txpacket(FuriHalSpiBusHandle* handle, uint8_t* payload, uint8_t si
  * @param      disable_aa - if true, disable ShockBurst
  * 
  */
-void nrf24_configure(FuriHalSpiBusHandle* handle, uint8_t rate, uint8_t* srcmac, uint8_t* dstmac, uint8_t maclen, uint8_t channel, bool noack, bool disable_aa);
+void nrf24_configure(
+    FuriHalSpiBusHandle* handle,
+    uint8_t rate,
+    uint8_t* srcmac,
+    uint8_t* dstmac,
+    uint8_t maclen,
+    uint8_t channel,
+    bool noack,
+    bool disable_aa);
 
 /** Configures the radio for "promiscuous mode" and primes it for rx
  * This is not an actual mode of the nrf24, but this function exploits a few bugs in the chip that allows it to act as if it were.
@@ -312,7 +301,6 @@ void nrf24_configure(FuriHalSpiBusHandle* handle, uint8_t rate, uint8_t* srcmac,
  */
 void nrf24_init_promisc_mode(FuriHalSpiBusHandle* handle, uint8_t channel, uint8_t rate);
 
-
 /** Listens for a packet and returns first possible address sniffed
  * Call this only after calling nrf24_init_promisc_mode
  * @param      handle  - pointer to FuriHalSpiHandle
@@ -336,8 +324,15 @@ bool nrf24_sniff_address(FuriHalSpiBusHandle* handle, uint8_t maclen, uint8_t* a
  * 
  * @return     channel that the address is listening on, if this value is above the max_channel param, it failed
  */
-uint8_t nrf24_find_channel(FuriHalSpiBusHandle* handle, uint8_t* srcmac, uint8_t* dstmac, uint8_t maclen, uint8_t rate, uint8_t min_channel, uint8_t max_channel, bool autoinit);
+uint8_t nrf24_find_channel(
-
+    FuriHalSpiBusHandle* handle,
+    uint8_t* srcmac,
+    uint8_t* dstmac,
+    uint8_t maclen,
+    uint8_t rate,
+    uint8_t min_channel,
+    uint8_t max_channel,
+    bool autoinit);
 
 /** Converts 64 bit value into uint8_t array
  * @param      val  - 64-bit integer
@@ -346,7 +341,6 @@ uint8_t nrf24_find_channel(FuriHalSpiBusHandle* handle, uint8_t* srcmac, uint8_t
  */
 void int64_to_bytes(uint64_t val, uint8_t* out, bool bigendian);
 
-
 /** Converts 32 bit value into uint8_t array
  * @param      val  - 32-bit integer
  * @param[out] out - bytes out
@@ -354,7 +348,6 @@ void int64_to_bytes(uint64_t val, uint8_t* out, bool bigendian);
  */
 void int32_to_bytes(uint32_t val, uint8_t* out, bool bigendian);
 
-
 /** Converts uint8_t array into 32 bit value
  * @param      bytes  - uint8_t array
  * @param      bigendian - if true, convert as big endian, otherwise little endian

lib/subghz/types.h

@@ -31,8 +31,10 @@ typedef void* (*SubGhzAlloc)(SubGhzEnvironment* environment);
 typedef void (*SubGhzFree)(void* context);
 
 // Serialize and Deserialize
-typedef bool (
+typedef bool (*SubGhzSerialize)(
-    *SubGhzSerialize)(void* context, FlipperFormat* flipper_format, SubGhzPresetDefinition* preset);
+    void* context,
+    FlipperFormat* flipper_format,
+    SubGhzPresetDefinition* preset);
 typedef bool (*SubGhzDeserialize)(void* context, FlipperFormat* flipper_format);
 
 // Decoder specific