ADD FLASH(flash.h flash.cpp flash_def.h flash_cfg.h flash_sfdp.cpp)

ADD RunTimer(log.h ticks.h ticks.cpp)
ADD sim_key form sdl

demo/lvgl/test.c

@@ -2,7 +2,9 @@
 #include "lv_port_disp.h"
 #include "lv_port_indev.h"
 #include "lvgl.h"
+#include "demos/lv_demos.h"
 #include <windows.h>
+//#include <widgets/lv_demo_widgets.h>
 #include "t_lvgl.h"
 #include "SDL3/SDL.h"
 
@@ -38,8 +40,8 @@ int Test_lvgl(void *pVoid) {
     lv_port_disp_init();
 //    lv_port_indev_init();
 
-    lv_example_get_started_1();
-//     lv_demo_widgets();
+//    lv_example_get_started_1();
+    lv_demo_widgets();
 //    printf("\nTEST Widgets\n");
 
     while (1) {

demo/oled/test.c

@@ -131,16 +131,16 @@ int Test_OLED(void *pVoid) {
 //    OLED_ShowPic(&oled, 0, 0, 64, 64, BMP1);
     OLED_Refresh(&oled);
     _beginthread(Get_Key, 0, NULL);
-    pageinit();
+//    pageinit();
     while (1) {
-        if (pageid > 4)pageid = 0;
-        item_h = pagesearch(pageid).item_h;
-        item_w = pagesearch(pageid).item_w;
-//        pagesearch(pageid).page(&oled);
-//        sprintf(buf, "DATA:%d", s);
-//        OLED_ShowString(&oled, 2, 51, buf, 12);
-        OLED_Refresh(&oled);
-        Sleep(200);
+//        if (pageid > 4)pageid = 0;
+//        item_h = pagesearch(pageid).item_h;
+//        item_w = pagesearch(pageid).item_w;
+////        pagesearch(pageid).page(&oled);
+////        sprintf(buf, "DATA:%d", s);
+////        OLED_ShowString(&oled, 2, 51, buf, 12);
+//        OLED_Refresh(&oled);
+//        Sleep(200);
     }
     SIM_OLED_STOP();
 }

demo/task/test.c

@@ -1,6 +1,7 @@
 #include <sysinfoapi.h>
 #include "stdio.h"
 #include "task.h"
+#include "log.h"
 
 Task_t *task1;
 Task_t *task2;
@@ -34,22 +35,28 @@ typedef struct CustomUserData {
 void exampleTimer4Callback(Task_t *task, void *userData) {
     CustomUserData *customUserData = (CustomUserData *) userData;
     customUserData->count--;
-    printf("[%012ld] Task:%p callback-> %s.\r\n", GetTick(), task, customUserData->str);
+    printf("[%012llu] Task:%p callback-> %s.\r\n", GetTick(), task, customUserData->str);
     if (customUserData->count > 0) {
         TaskStart(task);
     }
 }
 
+#undef LOG_RUN_TIMER_FUN
+#define LOG_RUN_TIMER_FUN GetTick()
 int Test_task(void *pVoid) {
-    TaskInit(GetTick);
-    TaskCreat(task1, 1000, -1, exampleTimer1Callback, "1000ms CYCLE task");
-    TaskCreat(task2, 5000, -1, exampleTimer2Callback, "5000ms ONCE task");
-    TaskCreat(task3, 3456, 2, exampleTimer3Callback, "3456ms delay start, 4567ms CYCLE task");
-    CustomUserData customUserData = {
-            .count = 3,
-            .str = "2000ms 3 task"
-    };
-    TaskCreat(task4, 2000, 1, exampleTimer4Callback, &customUserData);
+    LOG_RUN_TIME() {
+        TaskInit(GetTick);
+        TaskCreat(task1, 1000, -1, exampleTimer1Callback, "1000ms CYCLE task");
+        TaskCreat(task2, 5000, -1, exampleTimer2Callback, "5000ms ONCE task");
+        TaskCreat(task3, 3456, 2, exampleTimer3Callback, "3456ms delay start, 4567ms CYCLE task");
+        CustomUserData customUserData = {
+                .count = 3,
+                .str = "2000ms 3 task"
+        };
+        TaskCreat(task4, 2000, 1, exampleTimer4Callback, &customUserData);
+    }
+
+
     while (1) {
         TaskRun();
     }

demo/tft/test.c

@@ -4,6 +4,8 @@
 #include "t_tft.h"
 #include "sim_display.h"
 #include "tool.h"
+
+#define LOG_WITH_RUN_TIMER
 #include "log.h"
 
 TFT_T demo_tft;
@@ -103,6 +105,10 @@ uint8_t tft_senddata(uint8_t *data, size_t len) {
     return result;
 }
 
+int64_t GetSysCnt64() {
+
+}
+
 int Test_tft(void *arg) {
     //设备信息预填充
     demo_tft.width = 480;//实际如有支持不用填(如ST7735/7796)
@@ -141,11 +147,11 @@ int Test_tft(void *arg) {
     TFT_ShowCHString(&demo_tft, 0, 60, "星海科技机械师", 1);
 
 
-    TFT_DrawCircle(&demo_tft, 25, 25, 10);
-
-
+    TFT_DrawCircle(&demo_tft, 25, 25, 15);
+    TFT_DrawRoundedRect(&demo_tft, 200, 0, 100, 30, 8);
+    TFT_DrawArc(&demo_tft, 200, 50, 30, 0, 360);
     TFT_DrawCross(&demo_tft, 25, 25, 10);
-
+    TFT_DrawXCross(&demo_tft, 25, 25, 10);
 
     TFT_ShowString(&demo_tft, 60, 20, "JiXieShi", 16, 1);
 
@@ -162,6 +168,7 @@ int Test_tft(void *arg) {
 //
 //        Sleep(5);
 //    }
+
     SIM_Display_STOP(&tft_display);
     return 0;
 }