Ver Fonte

bump versions for catalog apps

MX há 1 ano atrás
pai
commit
f739306e76

+ 1 - 1
application.fam

@@ -10,6 +10,6 @@ App(
     fap_category="GPIO",
     fap_category="GPIO",
     fap_icon_assets="assets",
     fap_icon_assets="assets",
     fap_author="@cool4uma & @rnadyrshin & (some fixes by @xMasterX)",
     fap_author="@cool4uma & @rnadyrshin & (some fixes by @xMasterX)",
-    fap_version="1.3",
+    fap_version="1.4",
     fap_description="Control various devices via the Flipper Zero UART interface.",
     fap_description="Control various devices via the Flipper Zero UART interface.",
 )
 )

+ 4 - 2
scenes/uart_terminal_scene_help.c

@@ -12,8 +12,10 @@ void uart_terminal_scene_help_on_enter(void* context) {
 
 
     FuriString* temp_str;
     FuriString* temp_str;
     temp_str = furi_string_alloc();
     temp_str = furi_string_alloc();
-    furi_string_printf(temp_str, "\nUART terminal for Flipper\n\nI'm in github: cool4uma\n\nThis app is a modified\nWiFi Marauder companion,\nThanks 0xchocolate(github)\nfor great code and app.\n\n");
-    furi_string_cat_printf( temp_str, "Press BACK to return\n");
+    furi_string_printf(
+        temp_str,
+        "\nUART terminal for Flipper\n\nI'm in github: cool4uma\n\nThis app is a modified\nWiFi Marauder companion,\nThanks 0xchocolate(github)\nfor great code and app.\n\n");
+    furi_string_cat_printf(temp_str, "Press BACK to return\n");
 
 
     widget_add_text_box_element(
     widget_add_text_box_element(
         app->widget,
         app->widget,

+ 7 - 3
scenes/uart_terminal_scene_setup.c

@@ -1,6 +1,6 @@
 #include "../uart_terminal_app_i.h"
 #include "../uart_terminal_app_i.h"
 
 
-#define MAX_OPTIONS		25
+#define MAX_OPTIONS 25
 
 
 typedef struct {
 typedef struct {
     const char* item_string;
     const char* item_string;
@@ -11,7 +11,10 @@ typedef struct {
 // SETUP_MENU_ITEMS defined in uart_terminal_app_i.h - if you add an entry here, increment it!
 // SETUP_MENU_ITEMS defined in uart_terminal_app_i.h - if you add an entry here, increment it!
 static const UART_Terminal_Setup_Item items[SETUP_MENU_ITEMS] = {
 static const UART_Terminal_Setup_Item items[SETUP_MENU_ITEMS] = {
     {"UART Pins", 2, {"13,14", "15,16"}},
     {"UART Pins", 2, {"13,14", "15,16"}},
-    {"Baudrate", 25, {"75", "110", "150", "300", "600", "1200", "1800", "2400", "4800", "7200", "9600", "14400", "19200", "31250", "38400", "56000", "57600", "76800", "115200", "128000", "230400", "250000", "256000", "460800", "921600"}},
+    {"Baudrate", 25, {"75",     "110",    "150",    "300",   "600",    "1200",   "1800",
+                      "2400",   "4800",   "7200",   "9600",  "14400",  "19200",  "31250",
+                      "38400",  "56000",  "57600",  "76800", "115200", "128000", "230400",
+                      "250000", "256000", "460800", "921600"}},
     {"HEX mode", 2, {"OFF", "ON"}},
     {"HEX mode", 2, {"OFF", "ON"}},
 };
 };
 
 
@@ -97,7 +100,8 @@ bool uart_terminal_scene_setup_on_event(void* context, SceneManagerEvent event)
     if(event.type == SceneManagerEventTypeCustom) {
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {
     } else if(event.type == SceneManagerEventTypeTick) {
-        app->setup_selected_menu_index = variable_item_list_get_selected_item_index(app->setup_var_item_list);
+        app->setup_selected_menu_index =
+            variable_item_list_get_selected_item_index(app->setup_var_item_list);
         consumed = true;
         consumed = true;
     }
     }
 
 

+ 21 - 11
scenes/uart_terminal_scene_start.c

@@ -1,7 +1,15 @@
 #include "../uart_terminal_app_i.h"
 #include "../uart_terminal_app_i.h"
 
 
 // Command action type
 // Command action type
-typedef enum { NO_ACTION = 0, OPEN_SETUP, OPEN_PORT, SEND_CMD, SEND_AT_CMD, SEND_FAST_CMD, OPEN_HELP } ActionType;
+typedef enum {
+    NO_ACTION = 0,
+    OPEN_SETUP,
+    OPEN_PORT,
+    SEND_CMD,
+    SEND_AT_CMD,
+    SEND_FAST_CMD,
+    OPEN_HELP
+} ActionType;
 // Command availability in different modes
 // Command availability in different modes
 typedef enum { OFF = 0, TEXT_MODE = 1, HEX_MODE = 2, BOTH_MODES = 3 } ModeMask;
 typedef enum { OFF = 0, TEXT_MODE = 1, HEX_MODE = 2, BOTH_MODES = 3 } ModeMask;
 
 
@@ -24,14 +32,16 @@ static const UART_TerminalItem items[START_MENU_ITEMS] = {
     {"Send packet", {""}, 1, SEND_CMD, HEX_MODE},
     {"Send packet", {""}, 1, SEND_CMD, HEX_MODE},
     {"Send command", {""}, 1, SEND_CMD, TEXT_MODE},
     {"Send command", {""}, 1, SEND_CMD, TEXT_MODE},
     {"Send AT command", {""}, 1, SEND_AT_CMD, TEXT_MODE},
     {"Send AT command", {""}, 1, SEND_AT_CMD, TEXT_MODE},
-    {"Fast cmd", 
+    {"Fast cmd",
      {"help", "uptime", "date", "df -h", "ps", "dmesg", "reboot", "poweroff"},
      {"help", "uptime", "date", "df -h", "ps", "dmesg", "reboot", "poweroff"},
-     8, SEND_FAST_CMD, TEXT_MODE},
+     8,
+     SEND_FAST_CMD,
+     TEXT_MODE},
     {"Help", {""}, 1, OPEN_HELP, BOTH_MODES},
     {"Help", {""}, 1, OPEN_HELP, BOTH_MODES},
 };
 };
 
 
 static uint8_t menu_items_num = 0;
 static uint8_t menu_items_num = 0;
-static uint8_t item_indexes[START_MENU_ITEMS] = { 0 };
+static uint8_t item_indexes[START_MENU_ITEMS] = {0};
 
 
 static void uart_terminal_scene_start_var_list_enter_callback(void* context, uint32_t index) {
 static void uart_terminal_scene_start_var_list_enter_callback(void* context, uint32_t index) {
     furi_assert(context);
     furi_assert(context);
@@ -49,8 +59,7 @@ static void uart_terminal_scene_start_var_list_enter_callback(void* context, uin
     app->is_custom_tx_string = false;
     app->is_custom_tx_string = false;
     app->selected_menu_index = index;
     app->selected_menu_index = index;
 
 
-    switch (item->action)
-    {
+    switch(item->action) {
     case OPEN_SETUP:
     case OPEN_SETUP:
         view_dispatcher_send_custom_event(app->view_dispatcher, UART_TerminalEventSetup);
         view_dispatcher_send_custom_event(app->view_dispatcher, UART_TerminalEventSetup);
         return;
         return;
@@ -64,10 +73,11 @@ static void uart_terminal_scene_start_var_list_enter_callback(void* context, uin
         }
         }
 
 
         if(app->hex_mode) {
         if(app->hex_mode) {
-            view_dispatcher_send_custom_event(app->view_dispatcher, UART_TerminalEventStartKeyboardHex);
-        }
-        else {
-            view_dispatcher_send_custom_event(app->view_dispatcher, UART_TerminalEventStartKeyboardText);
+            view_dispatcher_send_custom_event(
+                app->view_dispatcher, UART_TerminalEventStartKeyboardHex);
+        } else {
+            view_dispatcher_send_custom_event(
+                app->view_dispatcher, UART_TerminalEventStartKeyboardText);
         }
         }
         return;
         return;
     case OPEN_PORT:
     case OPEN_PORT:
@@ -136,7 +146,7 @@ void uart_terminal_scene_start_on_enter(void* context) {
     variable_item_list_set_selected_item(
     variable_item_list_set_selected_item(
         var_item_list, scene_manager_get_scene_state(app->scene_manager, UART_TerminalSceneStart));
         var_item_list, scene_manager_get_scene_state(app->scene_manager, UART_TerminalSceneStart));
 
 
-	view_dispatcher_switch_to_view(app->view_dispatcher, UART_TerminalAppViewVarItemList);
+    view_dispatcher_switch_to_view(app->view_dispatcher, UART_TerminalAppViewVarItemList);
 }
 }
 
 
 bool uart_terminal_scene_start_on_event(void* context, SceneManagerEvent event) {
 bool uart_terminal_scene_start_on_event(void* context, SceneManagerEvent event) {

+ 1 - 2
uart_hex_input.c

@@ -210,8 +210,7 @@ static void uart_hex_input_view_draw_callback(Canvas* canvas, void* _model) {
     }
     }
 }
 }
 
 
-static void
-    uart_hex_input_handle_up(UART_TextInput* uart_text_input, UART_TextInputModel* model) {
+static void uart_hex_input_handle_up(UART_TextInput* uart_text_input, UART_TextInputModel* model) {
     UNUSED(uart_text_input);
     UNUSED(uart_text_input);
     if(model->selected_row > 0) {
     if(model->selected_row > 0) {
         model->selected_row--;
         model->selected_row--;

+ 4 - 4
uart_terminal_app.c

@@ -62,7 +62,8 @@ UART_TerminalApp* uart_terminal_app_alloc() {
     }
     }
 
 
     app->widget = widget_alloc();
     app->widget = widget_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, UART_TerminalAppViewHelp, widget_get_view(app->widget));
+    view_dispatcher_add_view(
+        app->view_dispatcher, UART_TerminalAppViewHelp, widget_get_view(app->widget));
 
 
     app->text_box = text_box_alloc();
     app->text_box = text_box_alloc();
     view_dispatcher_add_view(
     view_dispatcher_add_view(
@@ -80,8 +81,7 @@ UART_TerminalApp* uart_terminal_app_alloc() {
     view_dispatcher_add_view(
     view_dispatcher_add_view(
         app->view_dispatcher,
         app->view_dispatcher,
         UART_TerminalAppViewHexInput,
         UART_TerminalAppViewHexInput,
-        uart_text_input_get_view(app->hex_input)
-        );
+        uart_text_input_get_view(app->hex_input));
 
 
     app->setup_selected_option_index[BAUDRATE_ITEM_IDX] = DEFAULT_BAUDRATE_OPT_IDX;
     app->setup_selected_option_index[BAUDRATE_ITEM_IDX] = DEFAULT_BAUDRATE_OPT_IDX;
 
 
@@ -99,7 +99,7 @@ void uart_terminal_app_free(UART_TerminalApp* app) {
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewConsoleOutput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewConsoleOutput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewTextInput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewTextInput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewHexInput);
     view_dispatcher_remove_view(app->view_dispatcher, UART_TerminalAppViewHexInput);
-    
+
     text_box_free(app->text_box);
     text_box_free(app->text_box);
     furi_string_free(app->text_box_store);
     furi_string_free(app->text_box_store);
     uart_text_input_free(app->text_input);
     uart_text_input_free(app->text_input);