clean buadrate settings

bigtreetech · Dec 26, 2020 · e104886 · e104886
1 parent 984d0b6
commit e104886
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 31 deletions.
diff --git a/TFT/src/User/API/Settings.h b/TFT/src/User/API/Settings.h
@@ -33,8 +33,6 @@ enum
 #define LANGUAGE_CHECK_SIGN   (LANGUAGE_FLASH_SIGN + LANGUAGE_ADDR)
 #define ICON_CHECK_SIGN       (ICON_FLASH_SIGN + ICON_ADDR(0))
 
-#define ITEM_BAUDRATE_NUM     9
-
 #define MAX_EXT_COUNT         6
 #define MAX_HOTEND_COUNT      6
 #define MAX_HEATER_COUNT      (2 + MAX_HOTEND_COUNT) // chamber + bed + hotend

diff --git a/TFT/src/User/API/config.c b/TFT/src/User/API/config.c
@@ -533,7 +533,7 @@ void parseConfigKey(u16 index)
       break;
 
     case C_INDEX_UART_BAUDRATE:
-      SET_VALID_INT_VALUE(infoSettings.baudrate, 0, ITEM_BAUDRATE_NUM - 1);
+      SET_VALID_INT_VALUE(infoSettings.baudrate, 0, ITEM_BAUDRATE_COUNT - 1);
       break;
 
     case C_INDEX_LANGUAGE:

diff --git a/TFT/src/User/API/serialConnection.c b/TFT/src/User/API/serialConnection.c
@@ -0,0 +1,22 @@
+#include "serialConnection.h"
+#include "includes.h"
+
+bool serialHasBeenInitialized = false;
+const u32 baudrateList[ITEM_BAUDRATE_COUNT] = {2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000};
+
+void Serial_ReSourceDeInit(void)
+{
+  if (!serialHasBeenInitialized) return;
+  serialHasBeenInitialized = false;
+  Serial_DeInit();
+}
+
+void Serial_ReSourceInit(void)
+{
+  if (serialHasBeenInitialized) return;
+  serialHasBeenInitialized = true;
+
+  memset(&infoHost, 0, sizeof(infoHost));
+  reminderSetUnConnected(); // reset connect status
+  Serial_Init(infoSettings.baudrate);
+}
diff --git a/TFT/src/User/API/serialConnection.h b/TFT/src/User/API/serialConnection.h
@@ -0,0 +1,21 @@
+#ifndef _SERIAL_CONNECTION_H_
+#define _SERIAL_CONNECTION_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ITEM_BAUDRATE_COUNT 9
+
+extern const uint32_t baudrateList[ITEM_BAUDRATE_COUNT];
+
+void Serial_ReSourceDeInit(void);
+void Serial_ReSourceInit(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/TFT/src/User/Menu/ConnectionSettings.c b/TFT/src/User/Menu/ConnectionSettings.c
@@ -40,22 +40,21 @@ void menuDisconnect(void)
   infoMenu.cur--;
 }
 
-const char * const item_baudrate_str[ITEM_BAUDRATE_NUM] = {"2400",   "9600",   "19200",  "38400",  "57600",
-                                                           "115200", "250000", "500000", "1000000"};
-const u32 item_baudrate[ITEM_BAUDRATE_NUM] = {2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000};
+const char * const item_baudrate_str[ITEM_BAUDRATE_COUNT] = {"2400",   "9600",   "19200",  "38400",  "57600",
+                                                             "115200", "250000", "500000", "1000000"};
 
 void menuBaudrate(void)
 {
   LABEL title = {LABEL_BAUDRATE};
-  LISTITEM totalItems[ITEM_BAUDRATE_NUM];
+  LISTITEM totalItems[ITEM_BAUDRATE_COUNT];
   KEY_VALUES key_num = KEY_IDLE;
   SETTINGS now = infoSettings;
   uint8_t cur_item = 0;
 
   // fill baudrate items
   for(uint8_t i = 0; i < COUNT(totalItems); i++)
   {
-    if (infoSettings.baudrate == item_baudrate[i])
+    if (infoSettings.baudrate == i)
     {
       totalItems[i].icon = ICONCHAR_CHECKED;
       cur_item = i;
@@ -97,7 +96,7 @@ void menuBaudrate(void)
             totalItems[cur_item].icon = ICONCHAR_CHECKED;
             listWidgetRefreshItem(cur_item); // refresh checked status
 
-            infoSettings.baudrate = item_baudrate[cur_item];
+            infoSettings.baudrate = cur_item;
             Serial_ReSourceDeInit(); // Serial_Init() will malloc a dynamic memory, so Serial_DeInit() first to free, then malloc again.
             Serial_ReSourceInit();
             reminderMessage(LABEL_UNCONNECTED, STATUS_UNCONNECT);

diff --git a/TFT/src/User/Menu/Mode.c b/TFT/src/User/Menu/Mode.c
@@ -1,26 +1,8 @@
 #include "Mode.h"
 #include "includes.h"
 
-bool serialHasBeenInitialized = false;
 bool freshboot = true;
 
-void Serial_ReSourceDeInit(void)
-{
-  if (!serialHasBeenInitialized) return;
-  serialHasBeenInitialized = false;
-  Serial_DeInit();
-}
-
-void Serial_ReSourceInit(void)
-{
-  if (serialHasBeenInitialized) return;
-  serialHasBeenInitialized = true;
-
-  memset(&infoHost, 0, sizeof(infoHost));
-  reminderSetUnConnected(); // reset connect status
-  Serial_Init(infoSettings.baudrate);
-}
-
 void infoMenuSelect(void)
 {
   infoMenu.cur = 0;

diff --git a/TFT/src/User/Menu/Mode.h b/TFT/src/User/Menu/Mode.h
@@ -7,9 +7,6 @@ extern "C" {
 
 void infoMenuSelect(void);
 
-void Serial_ReSourceDeInit(void);
-void Serial_ReSourceInit(void);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/TFT/src/User/Menu/SettingsMenu.h b/TFT/src/User/Menu/SettingsMenu.h
@@ -8,7 +8,6 @@ extern "C" {
 #include <stdint.h>
 #include "Settings.h"
 
-extern const u32 item_baudrate[ITEM_BAUDRATE_NUM];
 extern uint8_t machine_type[64];
 
 void menuInfo(void);

diff --git a/TFT/src/User/includes.h b/TFT/src/User/includes.h
@@ -46,6 +46,7 @@
 #include "HD44780_Simulator.h"
 #include "ui_draw.h"
 #include "touch_process.h"
+#include "serialConnection.h"
 #include "interfaceCmd.h"
 #include "coordinate.h"
 #include "ff.h"