.gitignore

@@ -3,4 +3,3 @@
 /.idea/
 /.venv/
 /lvgl/
-/SDL3/

CMakeLists.txt

@@ -39,7 +39,7 @@ add_executable(HW_Lib main.c ${SOURCES})
 add_subdirectory(lib)
 
 target_link_libraries(HW_Lib HW_LIB_List HW_LIB_Task HW_LIB_Printf HW_LIB_Utils HW_LIB_Iic
-        HW_LIB_Spi HW_LIB_Key HW_LIB_Oled HW_LIB_Font HW_LIB_Tft lvgl::lvgl HW_LIB_Lui
+        HW_LIB_Spi HW_LIB_Key HW_LIB_Oled HW_LIB_Font HW_LIB_Tft lvgl::lvgl lvgl::examples lvgl::demos
 )
 
 add_custom_command(TARGET HW_Lib POST_BUILD

demo/lvgl/test.c

@@ -41,7 +41,7 @@ int Test_lvgl(void *pVoid) {
 //    lv_port_indev_init();
 
 //    lv_example_get_started_1();
-    // lv_demo_widgets();
+    lv_demo_widgets();
 //    printf("\nTEST Widgets\n");
 
     while (1) {

demo/oled/test.c

@@ -105,7 +105,7 @@ OLED_T oled = {
     .height = 64,
     .width = 128,
     .state = IDLE,
-    .buf = oledbuf[0],
+    .buf = oledbuf,
     .cmd = Cmd,
     .data = Data,
     .call = Refresh_Call,

lib/CMakeLists.txt

@@ -11,7 +11,6 @@ set(LIBRARIES
         HW_LIB_Oled oled oled/inc
         HW_LIB_Tft tft tft/inc
         HW_LIB_Flash flash flash/inc
-        HW_LIB_Lui lui lui/inc
 )
 
 # 循环浏览库列表以创建它们

lib/key/inc/key.h

@@ -6,7 +6,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <string.h>
-#include <stdbool.h>
+
 #define KEY_TICKS_INTERVAL    5    // 定时器间隔时间，单位为毫秒
 #define DEBOUNCE_TICKS    0    // 按键去抖动计数阈值，最大为7（0 ~ 7）
 #define SHORT_TICKS       (300 / KEY_TICKS_INTERVAL)  // 短按阈值，单位为定时器间隔的倍数

lib/oled/inc/oled.h

@@ -4,7 +4,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "stdbool.h"
+
 #include "stdint.h"
 
 

lib/utils/inc/argpase.h

@@ -3,7 +3,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "stdbool.h"
 typedef char OptId;
 
 typedef struct Option {

lib/utils/tool.cpp

@@ -5,6 +5,7 @@
 #include <ctime>
 #include <stdint.h>
 #include <cstdlib>
+#include <syncstream>
 #include "tool.h"
 
 float Mapping(float val, float I_Min, float I_Max, float O_Min, float O_Max) {

main.c

@@ -12,7 +12,7 @@
 #include "t_tft.h"
 #include "tool.h"
 #include "sim_test.h"
-#include "t_lui.h"
+
 #include <windows.h>
 #include <stdint.h>
 #include <SDL3/SDL.h>
@@ -160,11 +160,10 @@ int main(int argc, char *argv[]) {
 //    Test_Run("List", Test_List,NULL);
 //    Test_RunTime("Key", Test_Key);
 //    Test_RunTime("Queue", Test_Queue);
-    // Test_RunTime("Hash", Test_Hash);
+    Test_RunTime("Hash", Test_Hash);
     // Test_RunTime("Task", Test_task);
     // Test_RunTime("OLED", Test_OLED);
 //    Test_RunTime("LVGL", Test_lvgl);
 //    Test_RunTime("TFT", Test_tft);
-    Test_RunTime("LUI", Test_lui);
     return 0;
 }

sim/Test/sim_test.cpp

@@ -4,6 +4,7 @@
 
 #include <ctime>
 #include <cstdio>
+#include <syncstream>
 #include "sim_test.h"
 
 void Test_RunTime(char *name, int (*pFunction)(void *)) {

sim/display/sim_display.cpp

@@ -1,5 +1,6 @@
 #include "sim_display.h"
-
+#include "graphics.h"
+#include <conio.h>
 
 #define    GET_BIT(x, bit)    ((x & (1 << bit)) >> bit)
 
@@ -19,10 +20,6 @@ uint32_t RGB565_to_ARGB8888(uint16_t rgb565, bool isBGR) {
     }
 }
 #ifndef USER_SDL3
-
-#include "graphics.h"
-#include <conio.h>
-
 static uint32_t pixelColor, backgroundColor;
 static int scaleFactor, w, h;
 uint8_t border;

sim/lvgl/lv_port_indev.cpp

@@ -12,6 +12,8 @@
  *********************/
 #include "lv_port_indev.h"
 #include "lvgl.h"
+#include "graphics.h"
+#include <easyx.h>
 /*********************
  *      DEFINES
  *********************/
@@ -251,8 +253,8 @@ static void mouse_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
 static bool mouse_is_pressed(void)
 {
     /*Your code comes here*/
-    // ExMessage msg;peekmessage(&msg, EM_MOUSE);
-    // if(msg.message==WM_LBUTTONDOWN) return true;
+    ExMessage msg;peekmessage(&msg, EM_MOUSE);
+    if(msg.message==WM_LBUTTONDOWN) return true;
     return false;
 }
 
@@ -260,13 +262,13 @@ static bool mouse_is_pressed(void)
 static void mouse_get_xy(lv_coord_t * x, lv_coord_t * y)
 {
     /*Your code comes here*/
-    // ExMessage msg;
-    // if(peekmessage(&msg, EM_MOUSE))
-    // {
-    //     (*x) = msg.x;
-    //     (*y) = msg.y;
-    //     printf("\nX:%d,Y:%d",*x,*y);
-    // }
+    ExMessage msg;
+    if(peekmessage(&msg, EM_MOUSE))
+    {
+        (*x) = msg.x;
+        (*y) = msg.y;
+        printf("\nX:%d,Y:%d",*x,*y);
+    }
 }
 
 /*------------------

sim/oled/oled.cpp

@@ -1,4 +1,6 @@
 #include "sim_oled.h"
+#include "graphics.h"
+#include <conio.h>
 
 static SIM_Display_t oled_display;
 void SIM_OLED_INIT(int width, int height, uint32_t pixcolor, uint32_t backcolor, int scale, uint8_t b) {