添加复位标志，用于debug时菜单复位

.vscode/c_cpp_properties.json

@@ -1,20 +1,20 @@
 {
-    "configurations": [
+  "configurations": [
-        {
+    {
-            "name": "Win32",
+      "name": "windows-gcc-x64",
-            "includePath": [
+      "includePath": [
-                "${workspaceFolder}/**"
+        "${workspaceFolder}/**"
-            ],
+      ],
-            "defines": [
+      "defines": [
-                "_DEBUG",
+        "_DEBUG",
-                "UNICODE",
+        "UNICODE",
-                "_UNICODE"
+        "_UNICODE"
-            ],
+      ],
-            "compilerPath": "C:\\TDM-GCC-64\\bin\\gcc.exe",
+      "compilerPath": "E:/Softwares/mingw64/bin/gcc.exe",
-            "cStandard": "c11",
+      "cStandard": "${default}",
-            "cppStandard": "c++17",
+      "cppStandard": "${default}",
-            "intelliSenseMode": "windows-gcc-x64"
+      "intelliSenseMode": "windows-gcc-x64"
-        }
+    }
-    ],
+  ],
-    "version": 4
+  "version": 4
 }

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "C/C++ Runner: Debug Session",
+      "type": "cppdbg",
+      "request": "launch",
+      "args": [],
+      "stopAtEntry": false,
+      "externalConsole": true,
+      "cwd": "f:/Desktop/Work/00_Projects/04_Signal_Generator/00_Code/00_New/signal_generator/App/APP_WU/Src",
+      "program": "f:/Desktop/Work/00_Projects/04_Signal_Generator/00_Code/00_New/signal_generator/App/APP_WU/Src/build/Debug/outDebug",
+      "MIMode": "gdb",
+      "miDebuggerPath": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ]
+    }
+  ]
+}

.vscode/settings.json

@@ -1,33 +1,90 @@
 {
-    "files.associations": {
+  "files.associations": {
-        "main.h": "c",
+    "main.h": "c",
-        "cmsis_os.h": "c",
+    "cmsis_os.h": "c",
-        "task.h": "c",
+    "task.h": "c",
-        "freertos.h": "c",
+    "freertos.h": "c",
-        "stm32f4xx_hal.h": "c",
+    "stm32f4xx_hal.h": "c",
-        "stm32f4xx_hal_conf.h": "c",
+    "stm32f4xx_hal_conf.h": "c",
-        "stddef.h": "c",
+    "stddef.h": "c",
-        "stdint.h": "c",
+    "stdint.h": "c",
-        "usart.h": "c",
+    "usart.h": "c",
-        "string": "c",
+    "string": "c",
-        "data_type_def.h": "c",
+    "data_type_def.h": "c",
-        "gpio.h": "c",
+    "gpio.h": "c",
-        "limits": "c",
+    "limits": "c",
-        "ble.h": "c",
+    "ble.h": "c",
-        "dac8552.h": "c",
+    "dac8552.h": "c",
-        "spi.h": "c",
+    "spi.h": "c",
-        "ads1220ipwr.h": "c",
+    "ads1220ipwr.h": "c",
-        "dac.h": "c",
+    "dac.h": "c",
-        "mux_signal.h": "c",
+    "mux_signal.h": "c",
-        "stm32f407xx.h": "c",
+    "stm32f407xx.h": "c",
-        "utils.h": "c",
+    "utils.h": "c",
-        "type_traits": "c",
+    "type_traits": "c",
-        "stm32f4xx_hal_adc.h": "c",
+    "stm32f4xx_hal_adc.h": "c",
-        "stm32f4xx_hal_def.h": "c",
+    "stm32f4xx_hal_def.h": "c",
-        "stm32_hal_legacy.h": "c",
+    "stm32_hal_legacy.h": "c",
-        "timer.h": "c",
+    "timer.h": "c",
-        "lv_span.h": "c"
+    "lv_span.h": "c"
-    },
+  },
-    "C_Cpp.errorSquiggles": "disabled",
+  "C_Cpp.errorSquiggles": "disabled",
-    "idf.pythonInstallPath": "F:\\Espressif\\tools\\idf-python\\3.11.2\\python.exe"
+  "idf.pythonInstallPath": "F:\\Espressif\\tools\\idf-python\\3.11.2\\python.exe",
+  "C_Cpp_Runner.cCompilerPath": "gcc",
+  "C_Cpp_Runner.cppCompilerPath": "g++",
+  "C_Cpp_Runner.debuggerPath": "gdb",
+  "C_Cpp_Runner.cStandard": "",
+  "C_Cpp_Runner.cppStandard": "",
+  "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
+  "C_Cpp_Runner.useMsvc": false,
+  "C_Cpp_Runner.warnings": [
+    "-Wall",
+    "-Wextra",
+    "-Wpedantic",
+    "-Wshadow",
+    "-Wformat=2",
+    "-Wcast-align",
+    "-Wconversion",
+    "-Wsign-conversion",
+    "-Wnull-dereference"
+  ],
+  "C_Cpp_Runner.msvcWarnings": [
+    "/W4",
+    "/permissive-",
+    "/w14242",
+    "/w14287",
+    "/w14296",
+    "/w14311",
+    "/w14826",
+    "/w44062",
+    "/w44242",
+    "/w14905",
+    "/w14906",
+    "/w14263",
+    "/w44265",
+    "/w14928"
+  ],
+  "C_Cpp_Runner.enableWarnings": true,
+  "C_Cpp_Runner.warningsAsError": false,
+  "C_Cpp_Runner.compilerArgs": [],
+  "C_Cpp_Runner.linkerArgs": [],
+  "C_Cpp_Runner.includePaths": [],
+  "C_Cpp_Runner.includeSearch": [
+    "*",
+    "**/*"
+  ],
+  "C_Cpp_Runner.excludeSearch": [
+    "**/build",
+    "**/build/**",
+    "**/.*",
+    "**/.*/**",
+    "**/.vscode",
+    "**/.vscode/**"
+  ],
+  "C_Cpp_Runner.useAddressSanitizer": false,
+  "C_Cpp_Runner.useUndefinedSanitizer": false,
+  "C_Cpp_Runner.useLeakSanitizer": false,
+  "C_Cpp_Runner.showCompilationTime": false,
+  "C_Cpp_Runner.useLinkTimeOptimization": false,
+  "C_Cpp_Runner.msvcSecureNoWarnings": false
 }

App/APP_WU/Inc/apps_gather.h

@@ -130,6 +130,9 @@ extern const lv_img_dsc_t * screen_main_animimg_14_imgs[11];
 #define ITEMS_2 2
 //设置界面，选项卡2（从上往下数）
 
+#define ITEMS_3 3
+//设置界面，选项卡2（从上往下数）
+
 void menu_test5(void);              //模拟正式产品，实现基本功能
 void menu_data_init(void);          //数据初始化
 void scr_init_run(void);            //开机动画

App/APP_WU/Src/apps_gather.c

@@ -2,7 +2,7 @@
  * @Author: wujunchao wujunchao@wuxismart.com
  * @Date: 2024-12-27 11:50:56
  * @LastEditors: wujunchao wujunchao@wuxismart.com
- * @LastEditTime: 2025-03-03 14:08:51
+ * @LastEditTime: 2025-03-03 15:58:37
  * @FilePath: \signal_generator\App\APP_WU\Src\apps_gather.c
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -18,7 +18,27 @@ TABVIEW_DATA tabdata;
 void menu_data_init(void)
 {
     //general
-    m5data.scr_now = SCREEN_INIT;
+    if(m5data.scr_now != SCREEN_INIT)
+    {
+        //加载初始界面
+        setup_scr_screen_init(&guider_ui);
+        lv_scr_load(guider_ui.screen_init);
+        //释放内存
+        if(m5data.scr_now == SCREEN_SETTING)
+        {
+            guider_ui.screen_setting_del = true;
+            lv_obj_del(guider_ui.screen_setting);
+        }
+
+        if(m5data.scr_now == SCREEN_MAIN)
+        {
+            guider_ui.screen_main_del = true;
+            lv_obj_del(guider_ui.screen_main);
+        }
+        
+        m5data.scr_now = SCREEN_INIT;
+    }
+       
     m5data.tick_prv = -1;
     m5data.tick_cur = -1;
 
@@ -74,8 +94,18 @@ void menu_data_init(void)
     tabdata.tab_cursor_inner_prv = 99; 
 }
 
+uint8_t menu_reset_flag = 0;
 void menu_test5(void)
 {
+    if(menu_reset_flag) 
+    {
+        menu_reset_flag = 0;
+        
+        menu_data_init();
+
+        return;
+    }
+
     if(m5data.scr_init_flag == 0)
     {
         scr_init_run();                 //播放开机动画
@@ -1181,11 +1211,22 @@ void key_functions_setting(void)   //按键功能，详细设置菜单界面
 
                     case ITEMS_1:
                     {
+                        tabdata.tab_cursor_inner = 99;
+                        tabdata.tab_cursor_inner_prv = 99;
                     }
                     break;
 
                     case ITEMS_2:
                     {
+                        tabdata.tab_cursor_inner = 99;
+                        tabdata.tab_cursor_inner_prv = 99;
+                    }
+                    break;
+
+                    case ITEMS_3:
+                    {
+                        tabdata.tab_cursor_inner = 99;
+                        tabdata.tab_cursor_inner_prv = 99;
                     }
                     break;
                 
@@ -1226,6 +1267,11 @@ void key_functions_setting(void)   //按键功能，详细设置菜单界面
                     }
                     break;
 
+                    case ITEMS_3:
+                    {
+                    }
+                    break;
+                
                     default:
                     break;
                 }
@@ -1263,6 +1309,11 @@ void key_functions_setting(void)   //按键功能，详细设置菜单界面
                     }
                     break;
 
+                    case ITEMS_3:
+                    {
+                    }
+                    break;
+                
                     default:
                     break;
                 }
@@ -1303,6 +1354,11 @@ void key_functions_setting(void)   //按键功能，详细设置菜单界面
                 }
                 break;
 
+                case ITEMS_3:
+                {
+                }
+                break;
+            
                 default:
                 break;
             }
@@ -1333,6 +1389,11 @@ void key_functions_setting(void)   //按键功能，详细设置菜单界面
                 {}
                 break;
 
+                case ITEMS_3:
+                {
+                }
+                break;
+
                 default:
                 break;
             }
@@ -1363,6 +1424,11 @@ void key_functions_setting(void)   //按键功能，详细设置菜单界面
                 {}
                 break;
 
+                case ITEMS_3:
+                {
+                }
+                break;
+
                 default:
                 break;
             }
@@ -1391,19 +1457,19 @@ void setting_items_check(uint8_t cursor, uint8_t cursor_prv, uint8_t tab_cont)
                 {
                     case 0:
                     {
-                        lv_obj_set_style_text_color(guider_ui.screen_setting_label_01, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
+                        lv_obj_set_style_bg_color(guider_ui.screen_setting_label_01, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
                     }
                     break;
 
                     case 1:
                     {
-                        lv_obj_set_style_text_color(guider_ui.screen_setting_label_03, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
+                        lv_obj_set_style_bg_color(guider_ui.screen_setting_label_03, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
                     }
                     break;
 
                     case 2:
                     {
-                        lv_obj_set_style_text_color(guider_ui.screen_setting_label_05, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
+                        lv_obj_set_style_bg_color(guider_ui.screen_setting_label_05, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
                     }
                     break;
                 
@@ -1415,19 +1481,19 @@ void setting_items_check(uint8_t cursor, uint8_t cursor_prv, uint8_t tab_cont)
                 {
                     case 0:
                     {
-                        lv_obj_set_style_text_color(guider_ui.screen_setting_label_01, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
+                        lv_obj_set_style_bg_color(guider_ui.screen_setting_label_01, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
                     }
                     break;
 
                     case 1:
                     {
-                        lv_obj_set_style_text_color(guider_ui.screen_setting_label_03, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
+                        lv_obj_set_style_bg_color(guider_ui.screen_setting_label_03, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
                     }
                     break;
 
                     case 2:
                     {
-                        lv_obj_set_style_text_color(guider_ui.screen_setting_label_05, lv_color_hex(0x000000), LV_PART_MAIN|LV_STATE_DEFAULT);
+                        lv_obj_set_style_bg_color(guider_ui.screen_setting_label_05, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
                     }
                     break;
                 
@@ -1445,6 +1511,11 @@ void setting_items_check(uint8_t cursor, uint8_t cursor_prv, uint8_t tab_cont)
             {}
             break;
 
+            case ITEMS_3:
+            {
+            }
+            break;
+        
             default:
             break;
         }
@@ -1453,25 +1524,25 @@ void setting_items_check(uint8_t cursor, uint8_t cursor_prv, uint8_t tab_cont)
     {
         switch (cursor)     //点亮当前选中目标
         {
-            case 0:
+            case ITEMS_0:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s0, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
             break;
 
-            case 1:
+            case ITEMS_1:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s1, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
             break;
 
-            case 2:
+            case ITEMS_2:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s2, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
             break;
 
-            case 3:
+            case ITEMS_3:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s3, lv_color_hex(0xcbefff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
@@ -1483,25 +1554,25 @@ void setting_items_check(uint8_t cursor, uint8_t cursor_prv, uint8_t tab_cont)
 
         switch (cursor_prv)   //熄灭前一时刻的目标
         {
-            case 0:
+            case ITEMS_0:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s0, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
             break;
 
-            case 1:
+            case ITEMS_1:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
             break;
 
-            case 2:
+            case ITEMS_2:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s2, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }
             break;
 
-            case 3:
+            case ITEMS_3:
             {
                 lv_obj_set_style_bg_color(guider_ui.screen_setting_label_s3, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
             }

LVGL/myGUI/generated/setup_scr_screen_setting.c

@@ -322,7 +322,7 @@ void setup_scr_screen_setting(lv_ui *ui)
     lv_obj_set_style_text_letter_space(ui->screen_setting_label_05, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_line_space(ui->screen_setting_label_05, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_align(ui->screen_setting_label_05, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_opa(ui->screen_setting_label_05, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
+    lv_obj_set_style_bg_opa(ui->screen_setting_label_05, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_top(ui->screen_setting_label_05, 8, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_right(ui->screen_setting_label_05, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_bottom(ui->screen_setting_label_05, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
@@ -368,7 +368,7 @@ void setup_scr_screen_setting(lv_ui *ui)
     lv_obj_set_style_text_letter_space(ui->screen_setting_label_03, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_line_space(ui->screen_setting_label_03, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_align(ui->screen_setting_label_03, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_opa(ui->screen_setting_label_03, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
+    lv_obj_set_style_bg_opa(ui->screen_setting_label_03, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_top(ui->screen_setting_label_03, 8, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_right(ui->screen_setting_label_03, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_bottom(ui->screen_setting_label_03, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
@@ -414,7 +414,7 @@ void setup_scr_screen_setting(lv_ui *ui)
     lv_obj_set_style_text_letter_space(ui->screen_setting_label_01, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_line_space(ui->screen_setting_label_01, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_text_align(ui->screen_setting_label_01, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
-    lv_obj_set_style_bg_opa(ui->screen_setting_label_01, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
+    lv_obj_set_style_bg_opa(ui->screen_setting_label_01, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_top(ui->screen_setting_label_01, 8, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_right(ui->screen_setting_label_01, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
     lv_obj_set_style_pad_bottom(ui->screen_setting_label_01, 0, LV_PART_MAIN|LV_STATE_DEFAULT);

MDK-ARM/signal_generator.uvoptx

@@ -240,6 +240,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>tabdata,0x0A</ItemText>
         </Ww>
+        <Ww>
+          <count>17</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>menu_reset_flag,0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>