fix: precommit

RogueMaster · Aug 21, 2024 · b033a77 · b033a77
1 parent f499d4e
commit b033a77
Show file tree

Hide file tree

Showing 19 changed files with 432 additions and 496 deletions.
diff --git a/ModbusApp/Modbus.h b/ModbusApp/Modbus.h
@@ -19,7 +19,6 @@
 
 #include "scenes_config/app_scene_functions.h"
 
-
 #define PATHAPP    "apps_data/modbus"
 #define PATHAPPEXT EXT_PATH(PATHAPP)
 #define PATHLOGS   PATHAPPEXT "/logs"
@@ -155,4 +154,4 @@ extern const char* parityValues[];
 extern const char* saveLOGValues[];
 extern const char* outputFormatValues[];
 extern const char* functionNames[];
-extern const char* exceptionCodes[];
+extern const char* exceptionCodes[];
diff --git a/ModbusApp/modbus_ring_buffer/modbus_ring_buffer.c b/ModbusApp/modbus_ring_buffer/modbus_ring_buffer.c
@@ -21,4 +21,4 @@ void writeRingBuffer(RingBuffer* rb, uint8_t* buf, size_t len) {
         }
     }
     rb->delimiterIdx++;
-}
+}
diff --git a/ModbusApp/modbus_ring_buffer/modbus_ring_buffer.h b/ModbusApp/modbus_ring_buffer/modbus_ring_buffer.h
@@ -1,9 +1,9 @@
-#pragma once 
+#pragma once
 
 #include <furi.h>
 
 #include "../Modbus.h"
 
 RingBuffer* ring_buffer_alloc();
 void ring_buffer_free(RingBuffer* buffer);
-void writeRingBuffer(RingBuffer* rb, uint8_t* buf, size_t len);
+void writeRingBuffer(RingBuffer* rb, uint8_t* buf, size_t len);
diff --git a/ModbusApp/modbus_sender/modbus_sender.c b/ModbusApp/modbus_sender/modbus_sender.c
@@ -16,4 +16,4 @@ void ModbusSender(void* context) {
     furi_hal_gpio_write(&gpio_ext_pc1, false);
     app->modbus->slave = true;
     furi_timer_start(app->timer, app->uart->cfg->timeout * TIMEOUT_SCALER);
-}
+}
diff --git a/ModbusApp/modbus_sender/modbus_sender.h b/ModbusApp/modbus_sender/modbus_sender.h
@@ -4,4 +4,4 @@
 
 #include "../Modbus.h"
 
-void ModbusSender(void* context);
+void ModbusSender(void* context);
diff --git a/ModbusApp/modbus_storage/modbus_storage.c b/ModbusApp/modbus_storage/modbus_storage.c
@@ -59,4 +59,4 @@ bool OpenLogFile(App* app) {
     furi_string_free(selected_filepath);
     furi_string_free(predefined_filepath);
     return true;
-}
+}
diff --git a/ModbusApp/modbus_storage/modbus_storage.h b/ModbusApp/modbus_storage/modbus_storage.h
@@ -10,4 +10,4 @@ char* sequential_file_resolve_path(
     const char* prefix,
     const char* extension);
 bool OpenLogFile(App* app);
-void makePaths(App* app);
+void makePaths(App* app);
diff --git a/ModbusApp/modbus_uart/modbus_uart.c b/ModbusApp/modbus_uart/modbus_uart.c
@@ -124,4 +124,4 @@ int32_t uart_worker(void* context) {
     }
 
     return 0;
-}
+}
diff --git a/ModbusApp/modbus_uart/modbus_uart.h b/ModbusApp/modbus_uart/modbus_uart.h
@@ -9,4 +9,4 @@ void Serial_Begin(FuriHalSerialHandle* handle, LL_USART_InitTypeDef USART_InitSt
 int32_t uart_worker(void* context);
 void timerDone(void* context);
 void serial_deinit(Uart* uart);
-void serial_init(Uart* uart, uint8_t uart_ch);
+void serial_init(Uart* uart, uint8_t uart_ch);
diff --git a/ModbusApp/scenes/byte_input_scene.c b/ModbusApp/scenes/byte_input_scene.c
@@ -2,57 +2,52 @@
 
 //////////////////////////   ByteInput Scene  ////////////////////////
 void SetValue(void* context) {
-  App* app = context;
-  scene_manager_handle_back_event(app->sceneManager);
+    App* app = context;
+    scene_manager_handle_back_event(app->sceneManager);
 }
 void app_scene_byte_input_on_enter(void* context) {
-  App* app = context;
-  uint8_t* buf = app->msgBuf;
-  uint8_t offset =
-      scene_manager_get_scene_state(app->sceneManager, app_scene_byte_input);
-  switch (scene_manager_get_scene_state(app->sceneManager, app_scene_byte_input)) {
+    App* app = context;
+    uint8_t* buf = app->msgBuf;
+    uint8_t offset = scene_manager_get_scene_state(app->sceneManager, app_scene_byte_input);
+    switch(scene_manager_get_scene_state(app->sceneManager, app_scene_byte_input)) {
     case 0:
-      byte_input_set_header_text(app->byteInput, "Set Slave");
-      byte_input_set_result_callback(app->byteInput, SetValue, NULL, app,
-                                     &SLAVE, 1);
-      view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
-      break;
+        byte_input_set_header_text(app->byteInput, "Set Slave");
+        byte_input_set_result_callback(app->byteInput, SetValue, NULL, app, &SLAVE, 1);
+        view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
+        break;
     case 1:
-      byte_input_set_header_text(app->byteInput, "Set Function");
-      byte_input_set_result_callback(app->byteInput, SetValue, NULL, app,
-                                     &FUNCTION, 1);
-      view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
-      break;
+        byte_input_set_header_text(app->byteInput, "Set Function");
+        byte_input_set_result_callback(app->byteInput, SetValue, NULL, app, &FUNCTION, 1);
+        view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
+        break;
     case 2:
-      byte_input_set_header_text(app->byteInput, "Set Address");
-      byte_input_set_result_callback(app->byteInput, SetValue, NULL, app,
-                                     &buf[2], 2);
-      view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
-      break;
+        byte_input_set_header_text(app->byteInput, "Set Address");
+        byte_input_set_result_callback(app->byteInput, SetValue, NULL, app, &buf[2], 2);
+        view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
+        break;
     case 3:
-      byte_input_set_header_text(app->byteInput, "Set value or quantity");
-      byte_input_set_result_callback(app->byteInput, SetValue, NULL, app,
-                                     &buf[4], 2);
-      view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
-      break;
+        byte_input_set_header_text(app->byteInput, "Set value or quantity");
+        byte_input_set_result_callback(app->byteInput, SetValue, NULL, app, &buf[4], 2);
+        view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
+        break;
     default:
-      if (FUNCTION == 0x0F)
-        offset += 2;
-      else
-        offset += offset - 3;
-      byte_input_set_header_text(app->byteInput, "Set x value");
-      byte_input_set_result_callback(app->byteInput, SetValue, NULL, app,
-                                     &buf[offset], FUNCTION == 0x0F ? 1 : 2);
-      view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
-      break;
-  }
+        if(FUNCTION == 0x0F)
+            offset += 2;
+        else
+            offset += offset - 3;
+        byte_input_set_header_text(app->byteInput, "Set x value");
+        byte_input_set_result_callback(
+            app->byteInput, SetValue, NULL, app, &buf[offset], FUNCTION == 0x0F ? 1 : 2);
+        view_dispatcher_switch_to_view(app->viewDispatcher, ByteInput_View);
+        break;
+    }
 }
 bool app_scene_byte_input_on_event(void* context, SceneManagerEvent event) {
-  UNUSED(context);
-  UNUSED(event);
-  return false;
+    UNUSED(context);
+    UNUSED(event);
+    return false;
 }
 void app_scene_byte_input_on_exit(void* context) {
-  App* app = context;
-  UNUSED(app);
-}
+    App* app = context;
+    UNUSED(app);
+}
diff --git a/ModbusApp/scenes/main_scene.c b/ModbusApp/scenes/main_scene.c
@@ -3,68 +3,58 @@
 
 //////////////////////////   Main Scene  //////////////////////////
 void mainOptionsCB(void* context, uint32_t index) {
-  App* app = context;
+    App* app = context;
 
-  switch (index) {
+    switch(index) {
     case Settings_Option:
-      scene_manager_set_scene_state(app->sceneManager, app_scene_main,
-                                    Settings_Option);
-      scene_manager_next_scene(app->sceneManager, app_scene_settings);
-      break;
+        scene_manager_set_scene_state(app->sceneManager, app_scene_main, Settings_Option);
+        scene_manager_next_scene(app->sceneManager, app_scene_settings);
+        break;
     case Sniffer_Option:
-      scene_manager_set_scene_state(app->sceneManager, app_scene_main,
-                                    Sniffer_Option);
-      scene_manager_set_scene_state(app->sceneManager, app_scene_sniffer,
-                                    Sniffer_Option);
-      scene_manager_next_scene(app->sceneManager, app_scene_sniffer);
-      break;
+        scene_manager_set_scene_state(app->sceneManager, app_scene_main, Sniffer_Option);
+        scene_manager_set_scene_state(app->sceneManager, app_scene_sniffer, Sniffer_Option);
+        scene_manager_next_scene(app->sceneManager, app_scene_sniffer);
+        break;
     case Sender_Option:
-      scene_manager_set_scene_state(app->sceneManager, app_scene_main,
-                                    Sender_Option);
-      scene_manager_next_scene(app->sceneManager, app_scene_sender);
-      break;
+        scene_manager_set_scene_state(app->sceneManager, app_scene_main, Sender_Option);
+        scene_manager_next_scene(app->sceneManager, app_scene_sender);
+        break;
     case Read_LOG_Option:
-      scene_manager_set_scene_state(app->sceneManager, app_scene_main,
-                                    Read_LOG_Option);
-      if (OpenLogFile(app)) {
-        scene_manager_set_scene_state(app->sceneManager, app_scene_sniffer,
-                                      Read_LOG_Option);
-        scene_manager_next_scene(app->sceneManager, app_scene_sniffer);
-      }
-      break;
+        scene_manager_set_scene_state(app->sceneManager, app_scene_main, Read_LOG_Option);
+        if(OpenLogFile(app)) {
+            scene_manager_set_scene_state(app->sceneManager, app_scene_sniffer, Read_LOG_Option);
+            scene_manager_next_scene(app->sceneManager, app_scene_sniffer);
+        }
+        break;
     case About_Option:
-      scene_manager_set_scene_state(app->sceneManager, app_scene_main,
-                                    About_Option);
-      scene_manager_set_scene_state(app->sceneManager, app_scene_sniffer,
-                                    About_Option);
-      scene_manager_next_scene(app->sceneManager, app_scene_sniffer);
-      break;
+        scene_manager_set_scene_state(app->sceneManager, app_scene_main, About_Option);
+        scene_manager_set_scene_state(app->sceneManager, app_scene_sniffer, About_Option);
+        scene_manager_next_scene(app->sceneManager, app_scene_sniffer);
+        break;
     default:
-      break;
-  }
+        break;
+    }
 }
 
 void app_scene_main_on_enter(void* context) {
-  App* app = context;
-  submenu_reset(app->subMenu);
-  submenu_set_header(app->subMenu, "Main");
-  submenu_add_item(app->subMenu, "Settings", Settings_Option, mainOptionsCB,
-                   app);
-  submenu_add_item(app->subMenu, "Sniffer", Sniffer_Option, mainOptionsCB, app);
-  submenu_add_item(app->subMenu, "Sender", Sender_Option, mainOptionsCB, app);
-  submenu_add_item(app->subMenu, "Read LOG", Read_LOG_Option, mainOptionsCB,
-                   app);
-  submenu_add_item(app->subMenu, "About", About_Option, mainOptionsCB, app);
-  submenu_set_selected_item(app->subMenu, scene_manager_get_scene_state(
-                                              app->sceneManager, app_scene_main));
-  view_dispatcher_switch_to_view(app->viewDispatcher, Submenu_View);
+    App* app = context;
+    submenu_reset(app->subMenu);
+    submenu_set_header(app->subMenu, "Main");
+    submenu_add_item(app->subMenu, "Settings", Settings_Option, mainOptionsCB, app);
+    submenu_add_item(app->subMenu, "Sniffer", Sniffer_Option, mainOptionsCB, app);
+    submenu_add_item(app->subMenu, "Sender", Sender_Option, mainOptionsCB, app);
+    submenu_add_item(app->subMenu, "Read LOG", Read_LOG_Option, mainOptionsCB, app);
+    submenu_add_item(app->subMenu, "About", About_Option, mainOptionsCB, app);
+    submenu_set_selected_item(
+        app->subMenu, scene_manager_get_scene_state(app->sceneManager, app_scene_main));
+    view_dispatcher_switch_to_view(app->viewDispatcher, Submenu_View);
 }
 bool app_scene_main_on_event(void* context, SceneManagerEvent event) {
-  UNUSED(context);
-  UNUSED(event);
-  return false;
+    UNUSED(context);
+    UNUSED(event);
+    return false;
 }
 void app_scene_main_on_exit(void* context) {
-  App* app = context;
-  submenu_reset(app->subMenu);
-}
+    App* app = context;
+    submenu_reset(app->subMenu);
+}