更新

主界面各个按钮的功能已完成（电源键除外，硬件实现开关）；
switch按键功能待后续完善；

App/APP_WU/Inc/apps_gather.h

@@ -2,7 +2,7 @@
  * @Author: wujunchao wujunchao@wuxismart.com
  * @Date: 2024-12-27 11:51:06
  * @LastEditors: wujunchao wujunchao@wuxismart.com
- * @LastEditTime: 2025-01-13 19:24:32
+ * @LastEditTime: 2025-01-15 13:42:43
  * @FilePath: \signal_generator\App\APP_WU\Inc\apps_gather.h
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -36,27 +36,7 @@ extern const lv_img_dsc_t * screen_main_animimg_1_imgs[6];
 //written bt WuJunChao
 #include "timer.h"
 #include "stdio.h"
-#include "lv_demo_benchmark.h"
+//#include "lv_demo_benchmark.h"
-
-#define KEY_OUT 76
-#define KEY_UP 84
-#define KEY_MENU 92
-#define KEY_IN 69
-#define KEY_LEFT 77
-#define KEY_OK 85
-#define KEY_RIGHT 93
-#define KEY_SWITCH 101
-#define KEY_SOURCE 78
-#define KEY_DOWN 86
-#define KEY_BACK 94
-
-#define SCREEN_INIT 0
-#define SCREEN_INIT_CNT_MAX 4
-#define SCREEN_MAIN 1
-#define IO_CURSOR_START1 149    //用于改变直线位置
-#define IO_CURSOR_START2 209
-#define IO_CURSOR_INTERVAL 17
-#define SCREEN_SETTING 2
 
 // void menu_test2(void);       //竖屏，3个进度条，sggt_test_02
 
@@ -78,6 +58,30 @@ extern const lv_img_dsc_t * screen_main_animimg_1_imgs[6];
 /**********test4**********/
 
 /**********test5**********/
+#define KEY_OUT 76
+#define KEY_UP 84
+#define KEY_MENU 92
+#define KEY_IN 69
+#define KEY_LEFT 77
+#define KEY_OK 85
+#define KEY_RIGHT 93
+#define KEY_SWITCH 101
+#define KEY_SOURCE 78
+#define KEY_DOWN 86
+#define KEY_BACK 94
+
+#define SCREEN_INIT 0
+#define SCREEN_INIT_CNT_MAX 4
+#define SCREEN_MAIN 1
+#define IO_CURSOR_START1 149    //用于改变直线位置
+#define IO_CURSOR_START2 209
+#define IO_CURSOR_INTERVAL 17
+#define SCREEN_SETTING 2
+#define IO_ON 1
+#define IO_OFF 0
+#define IO_INPUT 0
+#define IO_OUTPUT 1
+
 void menu_test5(void);              //模拟正式产品，实现基本功能
 void menu_data_init(void);          //数据初始化
 void scr_init_run(void);            //开机动画
@@ -86,7 +90,30 @@ void scr_setting_run(void);     //详细设置界面
 void runtime_show(void);            //运行时间显示
 void battery_show(void);            //电池电量显示
 void key_functions_main(void);      //按键功能，主界面
-void current_io(void);          //当前输入&输出
+void key_functions_setting(void);   //按键功能，详细设置菜单界面
+
+typedef enum
+{
+    SIG_VOLTAGE = 0,            //电压
+    SIG_CURRENT,                //电流
+    SIG_RESISTANT,              //电阻
+    SIG_FREQUENCE,              //频率
+    SIG_TC,                     //热电偶
+    SIG_RTD                     //热电阻
+}SIG_FUNCTIONS;
+
+typedef enum
+{
+    VOLTAGE_MV = 0,             //电压mV
+    VOLTAGE_V,                  //电压V
+    CURRENT_MA,                 //电流mA
+    RESISTANT_OHM,              //电阻Ω
+    FREQUENCE_KHZ,              //频率KHz
+    TC_K,                       //热电偶K
+    TC_S,                       //热电偶S
+    TC_N,                       //热电偶N
+    RTD_DC                     //热电阻摄氏度
+}SIG_FUNCTIONS_TYPE;
 
 typedef struct
 {
@@ -106,10 +133,13 @@ typedef struct
     uint8_t runtime_hours;
     char runtime_show[8];
     uint8_t battery_cnt;
-    uint8_t io_cursor;          //光标位置, [000,000], 0~5整数表示6个位置
+    uint8_t io_cursor;          //实时数值游标位置, [000,000], 0~5整数表示6个位置
     char io_numbers[6];         //实时显示的字符
-    // uint16_t io_number_L;       //小数点左三位
+    uint8_t io_mode;            //当前工作模式，0输入，1输出
-    // uint16_t io_number_R;       //小数点右三位
+    SIG_FUNCTIONS input_mode;               //当前的输入模式
+    SIG_FUNCTIONS_TYPE input_mode_type;     //当前输入模式的类型
+    SIG_FUNCTIONS output_mode;              //当前的输出模式
+    SIG_FUNCTIONS_TYPE output_mode_type;    //当前输出模式的类型
 
     //screen_setting
     

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-01-13 21:16:00
+ * @LastEditTime: 2025-01-15 15:02:01
  * @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
  */
@@ -30,11 +30,17 @@ void menu_data_init(void)
     m5data.runtime_minutes = 0;
     m5data.runtime_hours = 0;
     m5data.battery_cnt = 0;
-    m5data.io_cursor = 3;
+    m5data.io_cursor = 3;           //默认数值游标位置，[000,000]:0~5
+    m5data.io_mode = IO_OUTPUT;     //默认工作模式，0：输入IN，1：输出OUT
     for(uint8_t i = 0; i < 6; i++)
     {
         m5data.io_numbers[i] = 0;
     }
+    m5data.input_mode = SIG_VOLTAGE;
+    m5data.input_mode_type = VOLTAGE_MV;
+    m5data.output_mode = SIG_VOLTAGE;
+    m5data.output_mode_type = VOLTAGE_MV;
+
     memset(buff_io,0,2);
 
     //screen_setting
@@ -60,6 +66,7 @@ void menu_test5(void)
             case SCREEN_SETTING:
             {
                 scr_setting_run();
+                key_functions_setting(); 
             }
             break;
             
@@ -71,11 +78,69 @@ void menu_test5(void)
 
 void key_functions_main(void)       //按键功能
 {
+    uint8_t cursor_temp = 0;        //临时游标，替代枚举变量进行加减运算
+
     switch (key)
     {
         case KEY_OUT:
         {
             key = 0;
+
+            if(m5data.io_mode == IO_INPUT)
+            {
+                m5data.io_mode = IO_OUTPUT;
+                m5data.output_mode = m5data.input_mode;
+
+                lv_span_set_text(guider_ui.screen_main_spangroup_3_span, "OUT");
+            }
+            else
+            {
+                cursor_temp = (uint8_t)m5data.output_mode;
+                cursor_temp = (cursor_temp >= 5)?(0):(cursor_temp + 1);
+                m5data.output_mode = (SIG_FUNCTIONS)cursor_temp;
+            }
+
+            switch (m5data.output_mode)
+            {
+                case SIG_VOLTAGE:       //电压
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Volt");
+                }
+                break;
+
+                case SIG_CURRENT:       //电流
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Cur");
+                }
+                break;
+
+                case SIG_RESISTANT:     //电阻
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Res");
+                }
+                break;
+
+                case SIG_FREQUENCE:     //频率
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Fre");
+                }
+                break;
+
+                case SIG_TC:            //热电偶
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "TC");
+                }
+                break;
+
+                case SIG_RTD:           //热电阻
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "RTD");
+                }
+                break;
+            
+                default:
+                break;
+            }
         }
         break;
 
@@ -88,36 +153,54 @@ void key_functions_main(void)       //按键功能
                 case 0:
                 {
                     m5data.io_numbers[0] = (m5data.io_numbers[0] >= 9)?(0):(m5data.io_numbers[0] + 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[0]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_7_span, buff_io);
                 }
                 break;
 
                 case 1:
                 {
                     m5data.io_numbers[1] = (m5data.io_numbers[1] >= 9)?(0):(m5data.io_numbers[1] + 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[1]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_8_span, buff_io);
                 }
                 break;
 
                 case 2:
                 {
                     m5data.io_numbers[2] = (m5data.io_numbers[2] >= 9)?(0):(m5data.io_numbers[2] + 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[2]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_9_span, buff_io);
                 }
                 break;
 
                 case 3:
                 {
                     m5data.io_numbers[3] = (m5data.io_numbers[3] >= 9)?(0):(m5data.io_numbers[3] + 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[3]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_10_span, buff_io);
                 }
                 break;
 
                 case 4:
                 {
                     m5data.io_numbers[4] = (m5data.io_numbers[4] >= 9)?(0):(m5data.io_numbers[4] + 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[4]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_11_span, buff_io);
                 }
                 break;
 
                 case 5:
                 {
                     m5data.io_numbers[5] = (m5data.io_numbers[5] >= 9)?(0):(m5data.io_numbers[5] + 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[5]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_12_span, buff_io);
                 }
                 break;
             
@@ -130,12 +213,78 @@ void key_functions_main(void)       //按键功能
         case KEY_MENU:
         {
             key = 0;
+
+            //加载菜单界面
+            setup_scr_screen_setting(&guider_ui);
+            lv_scr_load(guider_ui.screen_setting);
+
+            //切换至菜单后，清除主界面对象，释放内存
+            guider_ui.screen_main_del = true;
+            lv_obj_del(guider_ui.screen_main);
+
+            m5data.scr_now = SCREEN_SETTING;   //当前界面为详细设置菜单
         }
         break;
 
         case KEY_IN:
         {
             key = 0;
+
+            if(m5data.io_mode == IO_OUTPUT)
+            {
+                m5data.io_mode = IO_INPUT;
+                m5data.input_mode = m5data.output_mode;
+
+                lv_span_set_text(guider_ui.screen_main_spangroup_3_span, "IN");
+            }
+            else
+            {
+                cursor_temp = (uint8_t)m5data.input_mode;
+                cursor_temp = (cursor_temp >= 5)?(0):(cursor_temp + 1);
+                m5data.input_mode = (SIG_FUNCTIONS)cursor_temp;
+            }
+
+            switch (m5data.input_mode)
+            {
+                case SIG_VOLTAGE:       //电压
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Volt");
+                }
+                break;
+
+                case SIG_CURRENT:       //电流
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Cur");
+                }
+                break;
+
+                case SIG_RESISTANT:     //电阻
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Res");
+                }
+                break;
+
+                case SIG_FREQUENCE:     //频率
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Fre");
+                }
+                break;
+
+                case SIG_TC:            //热电偶
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "TC");
+                }
+                break;
+
+                case SIG_RTD:           //热电阻
+                {
+                    lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "RTD");
+                }
+                break;
+            
+                default:
+                break;
+            }
         }
         break;
 
@@ -144,12 +293,32 @@ void key_functions_main(void)       //按键功能
             key = 0;
 
             m5data.io_cursor = (m5data.io_cursor <= 0)?(5):(m5data.io_cursor - 1);
+
+            if(m5data.io_cursor <= 2)
+            {
+                lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START1 + m5data.io_cursor * IO_CURSOR_INTERVAL, 225);
+            }
+            else
+            {
+                lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START2 + (m5data.io_cursor -3 ) * IO_CURSOR_INTERVAL, 225);
+            }
         }
         break;
 
         case KEY_OK:
         {
             key = 0;
+
+            if(m5data.io_mode == IO_ON)
+            {
+                m5data.io_mode = IO_OFF;
+                lv_span_set_text(guider_ui.screen_main_spangroup_6_span, "OFF");
+            }
+            else
+            {
+                m5data.io_mode = IO_ON;
+                lv_span_set_text(guider_ui.screen_main_spangroup_6_span, "ON");
+            }
         }
         break;
 
@@ -158,12 +327,139 @@ void key_functions_main(void)       //按键功能
             key = 0;
 
             m5data.io_cursor = (m5data.io_cursor >= 5)?(0):(m5data.io_cursor + 1);
+
+            if(m5data.io_cursor <= 2)
+            {
+                lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START1 + m5data.io_cursor * IO_CURSOR_INTERVAL, 225);
+            }
+            else
+            {
+                lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START2 + (m5data.io_cursor -3 ) * IO_CURSOR_INTERVAL, 225);
+            }
         }
         break;
 
         case KEY_SWITCH:
         {
             key = 0;
+
+            switch (m5data.io_mode)     //输入、输出模式切换
+            {
+                case IO_OUTPUT:
+                {
+                    switch (m5data.output_mode)     //功能切换
+                    {
+                        case SIG_VOLTAGE:
+                        {
+                            cursor_temp = (uint8_t)m5data.output_mode_type;
+                            cursor_temp = !cursor_temp;
+                            m5data.output_mode_type = (SIG_FUNCTIONS_TYPE)cursor_temp;
+
+                            switch (m5data.output_mode_type)        //功能类型切换，电压V/mV
+                            {
+                                case VOLTAGE_MV:
+                                {
+                                    lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "mV");
+                                }
+                                break;
+
+                                case VOLTAGE_V:
+                                {
+                                    lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "V");
+                                }
+                                break;
+                            
+                                default:
+                                break;
+                            }
+                        }
+                        break;
+
+                        case SIG_CURRENT:
+                        {}
+                        break;
+
+                        case SIG_RESISTANT:
+                        {}
+                        break;
+
+                        case SIG_FREQUENCE:
+                        {}
+                        break;
+
+                        case SIG_TC:
+                        {}
+                        break;
+
+                        case SIG_RTD:
+                        {}
+                        break;
+                    
+                        default:
+                        break;
+                    }
+                }
+                break;
+
+                case IO_INPUT:
+                {
+                    switch (m5data.input_mode)
+                    {
+                        case SIG_VOLTAGE:
+                        {
+                            cursor_temp = (uint8_t)m5data.input_mode_type;
+                            cursor_temp = !cursor_temp;
+                            m5data.input_mode_type = (SIG_FUNCTIONS_TYPE)cursor_temp;
+
+                            switch (m5data.input_mode_type)        //功能类型切换，电压V/mV
+                            {
+                                case VOLTAGE_MV:
+                                {
+                                    lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "mV");
+                                }
+                                break;
+
+                                case VOLTAGE_V:
+                                {
+                                    lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "V");
+                                }
+                                break;
+                            
+                                default:
+                                break;
+                            }
+                        }
+                        break;
+
+                        case SIG_CURRENT:
+                        {}
+                        break;
+
+                        case SIG_RESISTANT:
+                        {}
+                        break;
+
+                        case SIG_FREQUENCE:
+                        {}
+                        break;
+
+                        case SIG_TC:
+                        {}
+                        break;
+
+                        case SIG_RTD:
+                        {}
+                        break;
+                    
+                        default:
+                        break;
+                    }
+                }
+                break;
+            
+                default:
+                break;
+            }
         }
         break;
 
@@ -182,36 +478,54 @@ void key_functions_main(void)       //按键功能
                 case 0:
                 {
                     m5data.io_numbers[0] = (m5data.io_numbers[0] <= 0)?(9):(m5data.io_numbers[0] - 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[0]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_7_span, buff_io);
                 }
                 break;
 
                 case 1:
                 {
                     m5data.io_numbers[1] = (m5data.io_numbers[1] <= 0)?(9):(m5data.io_numbers[1] - 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[1]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_8_span, buff_io);
                 }
                 break;
 
                 case 2:
                 {
                     m5data.io_numbers[2] = (m5data.io_numbers[2] <= 0)?(9):(m5data.io_numbers[2] - 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[2]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_9_span, buff_io);
                 }
                 break;
 
                 case 3:
                 {
                     m5data.io_numbers[3] = (m5data.io_numbers[3] <= 0)?(9):(m5data.io_numbers[3] - 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[3]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_10_span, buff_io);
                 }
                 break;
 
                 case 4:
                 {
                     m5data.io_numbers[4] = (m5data.io_numbers[4] <= 0)?(9):(m5data.io_numbers[4] - 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[4]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_11_span, buff_io);
                 }
                 break;
 
                 case 5:
                 {
                     m5data.io_numbers[5] = (m5data.io_numbers[5] <= 0)?(9):(m5data.io_numbers[5] - 1);
+
+                    sprintf(buff_io,"%d",m5data.io_numbers[5]);
+                    lv_span_set_text(guider_ui.screen_main_spangroup_12_span, buff_io);
                 }
                 break;
             
@@ -221,14 +535,27 @@ void key_functions_main(void)       //按键功能
         }
         break;
 
-        case KEY_BACK:
+        // case KEY_BACK:       //迁移至函数 key_functions_setting
+        // {
+        //     key = 0;
+
+        //     //加载主界面
+        //     setup_scr_screen_main(&guider_ui);
+        //     lv_scr_load(guider_ui.screen_main);
+
+        //     //切换至菜单后，清除主界面对象，释放内存
+        //     guider_ui.screen_setting_del = true;
+        //     lv_obj_del(guider_ui.screen_setting);
+
+        //     m5data.scr_now = SCREEN_MAIN;   //当前界面为主界面
+        // }
+        // break;
+    
+        default:
         {
             key = 0;
         }
         break;
-    
-        default:
-        break;
     }
 }
 
@@ -285,10 +612,10 @@ void scr_main_run(void)        //主界面
     battery_show();
 
     //动态曲线绘制
-    //当前工作模式
+
-    //IN/OUT
+    //当前输出值、工作模式、IN/OUT、ON/OFF
-    //当前输出值
+    //m5data.io_numbers的显示已迁移至按键功能，按键按下后再对显示内容进行设置
-    current_io();
+
     //当前工作模式的单位或类型
 }
 
@@ -333,33 +660,38 @@ void battery_show(void)        //电池电量显示
     }
 }
 
-void current_io(void)          //当前输入&输出
+void key_functions_setting(void)   //按键功能，详细设置菜单界面
 {
-    if(m5data.io_cursor <= 2)
+    switch (key)
     {
-        lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START1 + m5data.io_cursor * IO_CURSOR_INTERVAL, 225);
+        case KEY_BACK:
-    }
-    else
         {
-        lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START2 + (m5data.io_cursor -3 ) * IO_CURSOR_INTERVAL, 225);
+            key = 0;
-    }
 
-    sprintf(buff_io,"%d",m5data.io_numbers[0]);
+            //加载主界面
-    lv_span_set_text(guider_ui.screen_main_spangroup_7_span, buff_io);
+            setup_scr_screen_main(&guider_ui);
-    sprintf(buff_io,"%d",m5data.io_numbers[1]);
+            lv_scr_load(guider_ui.screen_main);
-    lv_span_set_text(guider_ui.screen_main_spangroup_8_span, buff_io);
+
-    sprintf(buff_io,"%d",m5data.io_numbers[2]);
+            //切换至菜单后，清除主界面对象，释放内存
-    lv_span_set_text(guider_ui.screen_main_spangroup_9_span, buff_io);
+            guider_ui.screen_setting_del = true;
-    sprintf(buff_io,"%d",m5data.io_numbers[3]);
+            lv_obj_del(guider_ui.screen_setting);
-    lv_span_set_text(guider_ui.screen_main_spangroup_10_span, buff_io);
+
-    sprintf(buff_io,"%d",m5data.io_numbers[4]);
+            m5data.scr_now = SCREEN_MAIN;   //当前界面为主界面
-    lv_span_set_text(guider_ui.screen_main_spangroup_11_span, buff_io);
+        }
-    sprintf(buff_io,"%d",m5data.io_numbers[5]);
+        break;
-    lv_span_set_text(guider_ui.screen_main_spangroup_12_span, buff_io);
+    
+        default:
+        {
+            key = 0;
+        }
+        break;
+    }
 }
 
 void scr_setting_run(void)     //详细设置界面
-{}
+{
+    
+}
 
 /**********test5**********/
 #else

LVGL/myGUI/generated/setup_scr_screen_main.c

@@ -185,7 +185,7 @@ void setup_scr_screen_main(lv_ui *ui)
     lv_spangroup_set_mode(ui->screen_main_spangroup_5, LV_SPAN_MODE_BREAK);
     //create span
     ui->screen_main_spangroup_5_span = lv_spangroup_new_span(ui->screen_main_spangroup_5);
-    lv_span_set_text(ui->screen_main_spangroup_5_span, "Voltage");
+    lv_span_set_text(ui->screen_main_spangroup_5_span, "Volt");
     lv_style_set_text_color(&ui->screen_main_spangroup_5_span->style, lv_color_hex(0x000000));
     lv_style_set_text_decor(&ui->screen_main_spangroup_5_span->style, LV_TEXT_DECOR_NONE);
     lv_style_set_text_font(&ui->screen_main_spangroup_5_span->style, &lv_font_montserratMedium_20);
@@ -211,7 +211,7 @@ void setup_scr_screen_main(lv_ui *ui)
     ui->screen_main_line_1 = lv_line_create(ui->screen_main);
     static lv_point_t screen_main_line_1[] = {{0, 0},{60, 0},};
     lv_line_set_points(ui->screen_main_line_1, screen_main_line_1, 2);
-    lv_obj_set_pos(ui->screen_main_line_1, 243, 225);
+    lv_obj_set_pos(ui->screen_main_line_1, 209, 225);
     lv_obj_set_size(ui->screen_main_line_1, 12, 3);
 
     //Write style for screen_main_line_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
@@ -232,7 +232,7 @@ void setup_scr_screen_main(lv_ui *ui)
     lv_style_set_text_decor(&ui->screen_main_spangroup_6_span->style, LV_TEXT_DECOR_NONE);
     lv_style_set_text_font(&ui->screen_main_spangroup_6_span->style, &lv_font_montserratMedium_16);
     lv_obj_set_pos(ui->screen_main_spangroup_6, 140, 0);
-    lv_obj_set_size(ui->screen_main_spangroup_6, 30, 15);
+    lv_obj_set_size(ui->screen_main_spangroup_6, 60, 15);
 
     //Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_6_main_main_default
     static lv_style_t style_screen_main_spangroup_6_main_main_default;

LVGL/src/extra/widgets/span/lv_span.c

@@ -144,7 +144,6 @@ void lv_spangroup_del_span(lv_obj_t * obj, lv_span_t * span)
 void lv_span_set_text(lv_span_t * span, const char * text)
 {
     if(span == NULL || text == NULL) {
-		printf("\n");
         return;
     }
 

MDK-ARM/signal_generator/_logo_alpha_188x80.d

@@ -1,131 +0,0 @@
-signal_generator\_logo_alpha_188x80.o: ..\LVGL\myGUI\generated\images\_logo_alpha_188x80.c
-signal_generator\_logo_alpha_188x80.o: ../LVGL/lvgl.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_log.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/../lv_conf_internal.h
-signal_generator\_logo_alpha_188x80.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/../lv_conf_kconfig.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/examples/porting/../../lv_conf.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_types.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_timer.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/../hal/lv_hal_tick.h
-signal_generator\_logo_alpha_188x80.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdbool.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_math.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_mem.h
-signal_generator\_logo_alpha_188x80.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stddef.h
-signal_generator\_logo_alpha_188x80.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_async.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_anim_timeline.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_anim.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/misc/lv_printf.h
-signal_generator\_logo_alpha_188x80.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdarg.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/lv_hal.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/lv_hal_disp.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/lv_hal.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_style.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/../font/lv_font.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/../font/lv_symbol_def.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/../font/../misc/lv_area.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_color.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_assert.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_txt.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_bidi.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_style_gen.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_img_decoder.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_img_buf.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/../misc/lv_fs.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_img_cache.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_rect.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/sw/lv_draw_sw_gradient.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/sw/lv_draw_sw_dither.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/sw/../../core/lv_obj_pos.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_label.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_img.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_line.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_triangle.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_arc.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_mask.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_transform.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../draw/lv_draw_layer.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/../misc/lv_ll.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/hal/lv_hal_indev.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj_tree.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj_scroll.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj_style.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj_style_gen.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj_draw.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_obj_class.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_event.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_group.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_indev.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_refr.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_disp.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/core/lv_theme.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/font/lv_font_loader.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/font/lv_font_fmt_txt.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_arc.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_btn.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_img.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_label.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_line.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_table.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_checkbox.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_bar.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_slider.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_btnmatrix.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_dropdown.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_roller.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_textarea.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_canvas.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/widgets/lv_switch.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/lv_api_map.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/../lvgl.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/lv_extra.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/layouts/lv_layouts.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/layouts/flex/lv_flex.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/layouts/grid/lv_grid.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/lv_libs.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/bmp/lv_bmp.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/fsdrv/lv_fsdrv.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/png/lv_png.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/gif/lv_gif.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/gif/../../../lvgl.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/qrcode/lv_qrcode.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/sjpg/lv_sjpg.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/freetype/lv_freetype.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/rlottie/lv_rlottie.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/ffmpeg/lv_ffmpeg.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/libs/tiny_ttf/lv_tiny_ttf.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/lv_others.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/snapshot/lv_snapshot.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/monkey/lv_monkey.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/gridnav/lv_gridnav.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/fragment/lv_fragment.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/imgfont/lv_imgfont.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/msg/lv_msg.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/others/ime/lv_ime_pinyin.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/themes/lv_themes.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/themes/default/lv_theme_default.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/themes/mono/lv_theme_mono.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/themes/basic/lv_theme_basic.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/lv_widgets.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/animimg/lv_animimg.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/calendar/lv_calendar.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/calendar/lv_calendar_header_arrow.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/chart/lv_chart.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/keyboard/lv_keyboard.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/list/lv_list.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/menu/lv_menu.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/msgbox/lv_msgbox.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/meter/lv_meter.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/spinbox/lv_spinbox.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/spinner/lv_spinner.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/tabview/lv_tabview.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/tileview/lv_tileview.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/win/lv_win.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/colorwheel/lv_colorwheel.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/led/lv_led.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/imgbtn/lv_imgbtn.h
-signal_generator\_logo_alpha_188x80.o: ../LVGL/src/extra/widgets/span/lv_span.h

MDK-ARM/signal_generator/apps_gather.d

@@ -195,5 +195,3 @@ signal_generator\apps_gather.o: ../LVGL/myGUI/generated/events_init.h
 signal_generator\apps_gather.o: ../App/APP_WU/Inc/timer.h
 signal_generator\apps_gather.o: ../App/APP_WU/Inc/apps_gather.h
 signal_generator\apps_gather.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
-signal_generator\apps_gather.o: ../LVGL/demos/benchmark/lv_demo_benchmark.h
-signal_generator\apps_gather.o: ../LVGL/demos/benchmark/../lv_demos.h

MDK-ARM/signal_generator/freertos.d

@@ -200,5 +200,3 @@ signal_generator\freertos.o: ../LVGL/myGUI/generated/events_init.h
 signal_generator\freertos.o: ../App/APP_WU/Inc/timer.h
 signal_generator\freertos.o: ../App/APP_WU/Inc/apps_gather.h
 signal_generator\freertos.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
-signal_generator\freertos.o: ../LVGL/demos/benchmark/lv_demo_benchmark.h
-signal_generator\freertos.o: ../LVGL/demos/benchmark/../lv_demos.h