fix: crash when EXPANSION MODULE is activated

Author: Otrebor671

ModbusApp/Modbus.c

@@ -45,23 +45,6 @@ const char* exceptionCodes[] = {
     "",
     "GATEWAY PATH\nUNAVAILABLE"
     "GATEWAY TARGET DEVICE\nFAILED TO RESPOND"};
-
-uint16_t getCRC(uint8_t* buf, uint8_t len) {
-    uint16_t crc = 0xFFFF;
-
-    for(int pos = 0; pos < len; pos++) {
-        crc ^= (uint16_t)buf[pos];
-
-        for(int i = 8; i != 0; i--) {
-            if((crc & 0x0001) != 0) {
-                crc >>= 1;
-                crc ^= 0xA001;
-            } else
-                crc >>= 1;
-        }
-    }
-    return crc;
-}
 //////////////////////////   ViewDispatcher Callbacks //////////////////////////
 static bool CustomEventCB(void* context, uint32_t event) {
     furi_assert(context);
@@ -196,18 +179,22 @@ void modbus_app_free(App* app) {
     storage_file_free(app->LOGfile);
     furi_record_close(RECORD_STORAGE);
     furi_record_close(RECORD_DIALOGS);
+    furi_record_close(RECORD_EXPANSION);
+    expansion_enable(app->expansion);
     free(app);
 }
 
 //////////////////////////   Entry Point   //////////////////////////
 int32_t Modbus_app(void* p) {
     UNUSED(p);
+    App* app = modbus_app_alloc();
+    Gui* gui = furi_record_open(RECORD_GUI);
+    app->expansion = furi_record_open(RECORD_EXPANSION);
+    expansion_disable(app->expansion);
     furi_hal_gpio_init_simple(&gpio_ext_pc0, GpioModeOutputPushPull);
     furi_hal_gpio_init_simple(&gpio_ext_pc1, GpioModeOutputPushPull);
     furi_hal_gpio_write(&gpio_ext_pc0, 0);
     furi_hal_gpio_write(&gpio_ext_pc1, 0);
-    App* app = modbus_app_alloc();
-    Gui* gui = furi_record_open(RECORD_GUI);
     view_dispatcher_attach_to_gui(app->viewDispatcher, gui, ViewDispatcherTypeFullscreen);
     scene_manager_next_scene(app->sceneManager, app_scene_main);
     view_dispatcher_run(app->viewDispatcher);

ModbusApp/Modbus.h

@@ -11,6 +11,8 @@
 #include <gui/view_dispatcher.h>
 #include <dialogs/dialogs.h>
 #include <storage/storage.h>
+#include <expansion/expansion.h>
+#include <expansion/expansion_settings.h>
 
 #include <stm32wbxx_ll_lpuart.h>
 #include <stm32wbxx_ll_usart.h>
@@ -120,6 +122,7 @@ typedef struct {
     uint8_t msgBuf[RX_BUF_SIZE + 1];
     size_t msgLen;
     RingBuffer* ringBuffer;
+    Expansion* expansion;
 } App;
 
 typedef enum {
@@ -152,5 +155,4 @@ extern const char* parityValues[];
 extern const char* saveLOGValues[];
 extern const char* outputFormatValues[];
 extern const char* functionNames[];
-extern const char* exceptionCodes[];
-uint16_t getCRC(uint8_t* buf, uint8_t len);
+extern const char* exceptionCodes[];

ModbusApp/modbus_parser/modbus_parser.c

@@ -3,6 +3,23 @@
 #include "../Modbus.h"
 #include "../modbus_ring_buffer/modbus_ring_buffer.h"
 
+uint16_t getCRC(uint8_t* buf, uint8_t len) {
+    uint16_t crc = 0xFFFF;
+
+    for(int pos = 0; pos < len; pos++) {
+        crc ^= (uint16_t)buf[pos];
+
+        for(int i = 8; i != 0; i--) {
+            if((crc & 0x0001) != 0) {
+                crc >>= 1;
+                crc ^= 0xA001;
+            } else
+                crc >>= 1;
+        }
+    }
+    return crc;
+}
+
 static void discreteValuesParser(void* context, uint8_t* buff, size_t len, FuriString* data) {
     App* app = context;
     uint8_t value = 0;

ModbusApp/modbus_parser/modbus_parser.h

@@ -3,3 +3,4 @@
 #include <furi.h>
 
 void handle_rx_data_cb(uint8_t* buf, size_t len, void* context);
+uint16_t getCRC(uint8_t* buf, uint8_t len);

ModbusApp/modbus_sender/modbus_sender.c

@@ -1,4 +1,5 @@
 #include "modbus_sender.h"
+#include "../modbus_parser/modbus_parser.h"
 
 void ModbusSender(void* context) {
     App* app = context;

ModbusApp/scenes/msgs_buffer_scene.c

@@ -1,6 +1,6 @@
 #include "../Modbus.h"
+#include "../modbus_parser/modbus_parser.h"
 
-//////////////////////////   MSGsBuffer Scene  ////////////////////////
 void OnItemEnterCB(void* context, uint32_t index) {
   App* app = context;
   uint8_t start = index ? app->ringBuffer->delimiters[index - 1] + 1 : 0;

ModbusApp/scenes/settings_scene.c

@@ -2,7 +2,8 @@
 #include "../modbus_storage/modbus_storage.h"
 #include "../modbus_uart/modbus_uart.h"
 
-//////////////////////////   Settings Scene  //////////////////////////
+
+
 void itemChangedCB(VariableItem* item) {
   App* app = variable_item_get_context(item);
   uint8_t index = variable_item_get_current_value_index(item);