Просмотр исходного кода

Making all code exactly as the one in Momentum-Apps

eried 9 месяцев назад
Родитель
Сommit
a8dbfb30ca

+ 1 - 1
scenes/wifi_marauder_scene_settings_init.c

@@ -4,7 +4,7 @@ const char* Y = "Y";
 const char* N = "N";
 
 #define PROMPT_PCAPS 0
-#define PROMPT_LOGS 1
+#define PROMPT_LOGS  1
 
 void wifi_marauder_scene_settings_init_widget_callback(
     GuiButtonType result,

+ 11 - 3
scenes/wifi_marauder_scene_start.c

@@ -5,12 +5,20 @@
 // For each command, define whether additional arguments are needed
 // (enabling text input to fill them out), and whether the console
 // text box should focus at the start of the output or the end
-typedef enum { NO_ARGS = 0, INPUT_ARGS, TOGGLE_ARGS } InputArgs;
+typedef enum {
+    NO_ARGS = 0,
+    INPUT_ARGS,
+    TOGGLE_ARGS
+} InputArgs;
 
-typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE } FocusConsole;
+typedef enum {
+    FOCUS_CONSOLE_END = 0,
+    FOCUS_CONSOLE_START,
+    FOCUS_CONSOLE_TOGGLE
+} FocusConsole;
 
 #define SHOW_STOPSCAN_TIP (true)
-#define NO_TIP (false)
+#define NO_TIP            (false)
 
 #define MAX_OPTIONS (9)
 typedef struct {

+ 1 - 1
scenes/wifi_marauder_scene_user_input.c

@@ -108,7 +108,7 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
                 *app->user_input_string_reference,
                 strlen(*app->user_input_string_reference) + 1);
         }
-        text_input_add_illegal_symbols(app->text_input);
+        text_input_show_illegal_symbols(app->text_input, true);
         break;
     // Loads the numerical value of the reference
     case WifiMarauderUserInputTypeNumber:

+ 5 - 4
script/cJSON.c

@@ -160,8 +160,8 @@ static void* CJSON_CDECL internal_realloc(void* pointer, size_t size) {
     return realloc(pointer, size);
 }
 #else
-#define internal_malloc malloc
-#define internal_free free
+#define internal_malloc  malloc
+#define internal_free    free
 #define internal_realloc realloc
 #endif
 
@@ -270,7 +270,7 @@ typedef struct {
     ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
 #define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
 /* get a pointer to the buffer at the position */
-#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
+#define buffer_at_offset(buffer)              ((buffer)->content + (buffer)->offset)
 
 /* Converts an array of characters to double. Alternative implementation of strtod() */
 double string_to_double(const char* str, char** endptr) {
@@ -278,7 +278,8 @@ double string_to_double(const char* str, char** endptr) {
     int sign = 1;
     const char* p = str;
 
-    while(isspace((unsigned char)*p)) p++;
+    while(isspace((unsigned char)*p))
+        p++;
 
     if(*p == '-') {
         sign = -1;

+ 11 - 11
script/cJSON.h

@@ -52,7 +52,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
 
 */
 
-#define CJSON_CDECL __cdecl
+#define CJSON_CDECL   __cdecl
 #define CJSON_STDCALL __stdcall
 
 /* export symbols by default, this is necessary for copy pasting the C and header file */
@@ -89,16 +89,16 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
 
 /* cJSON Types: */
 #define cJSON_Invalid (0)
-#define cJSON_False (1 << 0)
-#define cJSON_True (1 << 1)
-#define cJSON_NULL (1 << 2)
-#define cJSON_Number (1 << 3)
-#define cJSON_String (1 << 4)
-#define cJSON_Array (1 << 5)
-#define cJSON_Object (1 << 6)
-#define cJSON_Raw (1 << 7) /* raw json */
-
-#define cJSON_IsReference 256
+#define cJSON_False   (1 << 0)
+#define cJSON_True    (1 << 1)
+#define cJSON_NULL    (1 << 2)
+#define cJSON_Number  (1 << 3)
+#define cJSON_String  (1 << 4)
+#define cJSON_Array   (1 << 5)
+#define cJSON_Object  (1 << 6)
+#define cJSON_Raw     (1 << 7) /* raw json */
+
+#define cJSON_IsReference   256
 #define cJSON_StringIsConst 512
 
 /* The cJSON structure: */

+ 1 - 1
script/wifi_marauder_script.c

@@ -959,4 +959,4 @@ void wifi_marauder_script_free(WifiMarauderScript* script) {
     free(script->name);
     free(script->description);
     free(script);
-}
+}

+ 3 - 3
script/wifi_marauder_script.h

@@ -108,10 +108,10 @@
 #include <storage/storage.h>
 #include "cJSON.h"
 
-#define WIFI_MARAUDER_DEFAULT_TIMEOUT_SCAN 15
+#define WIFI_MARAUDER_DEFAULT_TIMEOUT_SCAN   15
 #define WIFI_MARAUDER_DEFAULT_TIMEOUT_DEAUTH 30
-#define WIFI_MARAUDER_DEFAULT_TIMEOUT_PROBE 60
-#define WIFI_MARAUDER_DEFAULT_TIMEOUT_SNIFF 60
+#define WIFI_MARAUDER_DEFAULT_TIMEOUT_PROBE  60
+#define WIFI_MARAUDER_DEFAULT_TIMEOUT_SNIFF  60
 #define WIFI_MARAUDER_DEFAULT_TIMEOUT_BEACON 60
 
 typedef enum {

+ 3 - 2
script/wifi_marauder_script_executor.c

@@ -2,7 +2,8 @@
 #include "wifi_marauder_script_executor.h"
 
 void _wifi_marauder_script_delay(WifiMarauderScriptWorker* worker, uint32_t delay_secs) {
-    for(uint32_t i = 0; i < delay_secs && worker->is_running; i++) furi_delay_ms(1000);
+    for(uint32_t i = 0; i < delay_secs && worker->is_running; i++)
+        furi_delay_ms(1000);
 }
 
 void _send_stop(WifiMarauderScriptWorker* worker) {
@@ -326,4 +327,4 @@ void wifi_marauder_script_execute_stage(WifiMarauderScriptStage* stage, void* co
         _wifi_marauder_script_execute_delay((WifiMarauderScriptStageDelay*)stage_data, worker);
         break;
     }
-}
+}

+ 1 - 1
wifi_marauder_app.c

@@ -35,7 +35,7 @@ WifiMarauderApp* wifi_marauder_app_alloc() {
 
     app->view_dispatcher = view_dispatcher_alloc();
     app->scene_manager = scene_manager_alloc(&wifi_marauder_scene_handlers, app);
-    view_dispatcher_enable_queue(app->view_dispatcher);
+
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
 
     view_dispatcher_set_custom_event_callback(

+ 11 - 11
wifi_marauder_app_i.h

@@ -31,20 +31,20 @@
 
 #define NUM_MENU_ITEMS (22)
 
-#define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
+#define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE   (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)
 
-#define MARAUDER_APP_FOLDER_USER "apps_data/marauder"
-#define MARAUDER_APP_FOLDER EXT_PATH(MARAUDER_APP_FOLDER_USER)
-#define MARAUDER_APP_FOLDER_HTML MARAUDER_APP_FOLDER "/html"
-#define MARAUDER_APP_FOLDER_PCAPS MARAUDER_APP_FOLDER "/pcaps"
-#define MARAUDER_APP_FOLDER_LOGS MARAUDER_APP_FOLDER "/logs"
-#define MARAUDER_APP_FOLDER_USER_PCAPS MARAUDER_APP_FOLDER_USER "/pcaps"
-#define MARAUDER_APP_FOLDER_USER_LOGS MARAUDER_APP_FOLDER_USER "/logs"
-#define MARAUDER_APP_FOLDER_SCRIPTS MARAUDER_APP_FOLDER "/scripts"
+#define MARAUDER_APP_FOLDER_USER            "apps_data/marauder"
+#define MARAUDER_APP_FOLDER                 EXT_PATH(MARAUDER_APP_FOLDER_USER)
+#define MARAUDER_APP_FOLDER_HTML            MARAUDER_APP_FOLDER "/html"
+#define MARAUDER_APP_FOLDER_PCAPS           MARAUDER_APP_FOLDER "/pcaps"
+#define MARAUDER_APP_FOLDER_LOGS            MARAUDER_APP_FOLDER "/logs"
+#define MARAUDER_APP_FOLDER_USER_PCAPS      MARAUDER_APP_FOLDER_USER "/pcaps"
+#define MARAUDER_APP_FOLDER_USER_LOGS       MARAUDER_APP_FOLDER_USER "/logs"
+#define MARAUDER_APP_FOLDER_SCRIPTS         MARAUDER_APP_FOLDER "/scripts"
 #define MARAUDER_APP_SCRIPT_PATH(file_name) MARAUDER_APP_FOLDER_SCRIPTS "/" file_name ".json"
-#define SAVE_PCAP_SETTING_FILEPATH MARAUDER_APP_FOLDER "/save_pcaps_here.setting"
-#define SAVE_LOGS_SETTING_FILEPATH MARAUDER_APP_FOLDER "/save_logs_here.setting"
+#define SAVE_PCAP_SETTING_FILEPATH          MARAUDER_APP_FOLDER "/save_pcaps_here.setting"
+#define SAVE_LOGS_SETTING_FILEPATH          MARAUDER_APP_FOLDER "/save_logs_here.setting"
 
 typedef enum WifiMarauderUserInputType {
     WifiMarauderUserInputTypeString,

+ 2 - 2
wifi_marauder_uart.c

@@ -1,9 +1,9 @@
 #include "wifi_marauder_app_i.h"
 #include "wifi_marauder_uart.h"
 
-#define UART_CH (FuriHalSerialIdUsart)
+#define UART_CH    (FuriHalSerialIdUsart)
 #define LP_UART_CH (FuriHalSerialIdLpuart)
-#define BAUDRATE (230400)
+#define BAUDRATE   (230400)
 
 struct WifiMarauderUart {
     WifiMarauderApp* app;