update:lcd draw 统一

application/include/luat_conf_bsp.h

@@ -166,7 +166,7 @@ extern unsigned int gLVFlashTime;
 #define LV_TICK_CUSTOM_INCLUDE  "app_interface.h"         /*Header for the system time function*/
 #define LV_TICK_CUSTOM_SYS_TIME_EXPR ((uint32_t)GetSysTickMS())     /*Expression evaluating to current system time in ms*/
 
-#define LV_NO_BLOCK_FLUSH
+#define LUAT_USE_LCD_CUSTOM_DRAW
 #define time(X)	luat_time(X)
 
 #define LV_USE_PERF_MONITOR     1

application/src/luat_spi_air105.c

@@ -257,35 +257,65 @@ int luat_lcd_draw_no_block(luat_lcd_conf_t* conf, uint16_t x1, uint16_t y1, uint
 	}
 }
 
-void luat_lcd_draw_block(luat_lcd_conf_t* conf, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, luat_color_t* color, uint8_t last_flush)
-{
-	LCD_DrawStruct draw;
-	if (conf->port == LUAT_LCD_SPI_DEVICE){
-		luat_spi_device_t* spi_dev = (luat_spi_device_t*)conf->lcd_spi_device;
-		int spi_id = spi_dev->bus_id;
-	    uint8_t spi_mode = SPI_MODE_0;
-	    if(spi_dev->spi_config.CPHA&&spi_dev->spi_config.CPOL)spi_mode = SPI_MODE_3;
-	    else if(spi_dev->spi_config.CPOL)spi_mode = SPI_MODE_2;
-	    else if(spi_dev->spi_config.CPHA)spi_mode = SPI_MODE_1;
-	    draw.DCDelay = conf->dc_delay_us;
-	    draw.Mode = spi_mode;
-	    draw.Speed = spi_dev->spi_config.bandrate;
-	    draw.SpiID = luat_spi[spi_id].id;
-	    draw.CSPin = spi_dev->spi_config.cs;
-	    draw.DCPin = conf->pin_dc;
-	    draw.x1 = x1;
-	    draw.x2 = x2;
-	    draw.y1 = y1;
-	    draw.y2 = y2;
-	    draw.xoffset = conf->xoffset;
-	    draw.yoffset = conf->yoffset;
-	    draw.Size = (draw.x2 - draw.x1 + 1) * (draw.y2 - draw.y1 + 1) * 2;
-	    draw.ColorMode = COLOR_MODE_RGB_565;
-	    draw.Data = color;
-	    Core_LCDDrawBlock(&draw);
-	}
+#ifdef LUAT_USE_LCD_CUSTOM_DRAW
+int luat_lcd_flush(luat_lcd_conf_t* conf) {
+    if (conf->buff == NULL) {
+        return 0;
+    }
+    //LLOGD("luat_lcd_flush range %d %d", conf->flush_y_min, conf->flush_y_max);
+    if (conf->flush_y_max < conf->flush_y_min) {
+        // 没有需要刷新的内容,直接跳过
+        //LLOGD("luat_lcd_flush no need");
+        return 0;
+    }
+    // 重置为不需要刷新的状态
+    conf->flush_y_max = 0;
+    conf->flush_y_min = conf->h;
+
+    return 0;
 }
 
+int luat_lcd_draw(luat_lcd_conf_t* conf, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, luat_color_t* color) {
+    // 直接刷屏模式
+    if (conf->buff == NULL) {
+    	if (conf->is_init_done)
+    	{
+    		return luat_lcd_draw_no_block(conf, x1, y1, x2, y2, color, 0);
+    	}
+        uint32_t size = (x2 - x1 + 1) * (y2 - y1 + 1) * 2;
+        luat_lcd_set_address(conf, x1, y1, x2, y2);
+	    if (conf->port == LUAT_LCD_SPI_DEVICE){
+		    luat_spi_device_send((luat_spi_device_t*)(conf->lcd_spi_device), (const char*)color, size);
+	    }else{
+		    luat_spi_send(conf->port, (const char*)color, size);
+	    }
+        return 0;
+    }
+    // buff模式
+    if (x1 > conf->w || x2 > conf->w || y1 > conf->h || y2 > conf->h) {
+        //LLOGW("out of lcd range");
+        return -1;
+    }
+    luat_color_t* dst = (conf->buff + x1 + conf->w * y1);
+    luat_color_t* src = (color);
+    size_t lsize = (x2 - x1 + 1);
+    for (size_t i = 0; i < (y2 - y1 + 1); i++) {
+        memcpy(dst, src, lsize * sizeof(luat_color_t));
+        dst += conf->w;  // 移动到下一行
+        src += lsize;    // 移动数据
+    }
+
+    // 存储需要刷新的区域
+    if (y1 < conf->flush_y_min)
+        conf->flush_y_min = y1;
+    if (y2 > conf->flush_y_max)
+        conf->flush_y_max = y2;
+
+    return 0;
+}
+#endif
+
+
 static void *luat_fatfs_spi_ctrl;
 
 static void sdhc_spi_check(luat_fatfs_spi_t* userdata)