Просмотр исходного кода

add:gtfont lcd支持颜色绘制

Dozingfiretruck 2 лет назад
Родитель
Сommit
42a58aaa7d
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      components/gtfont/luat_lib_gtfont.c

+ 3 - 2
components/gtfont/luat_lib_gtfont.c

@@ -17,6 +17,7 @@
 #define LUAT_LOG_TAG "gt"
 #include "luat_log.h"
 
+extern luat_color_t BACK_COLOR , FORE_COLOR;
 extern luat_spi_device_t* gt_spi_dev;
 
 //横置横排显示
@@ -31,11 +32,11 @@ void gtfont_draw_w(unsigned char *pBits,unsigned int x,unsigned int y,unsigned i
 			for(k = 0;k < 8;k++){
 				if(((temp << k)& 0x80) == 0 ){
 					/* 显示一个像素点 */
-					if (mode == 0)point((luat_lcd_conf_t *)userdata, x+k+(j*8), y+i, 0xFFFF);
+					if (mode == 0)point((luat_lcd_conf_t *)userdata, x+k+(j*8), y+i, BACK_COLOR);
 					else if (mode == 1)point((Paint *)userdata, x+k+(j*8), y+i, 0xFFFF);
 				}else{
 					/* 显示一个像素点 */
-					if (mode == 0)point((luat_lcd_conf_t *)userdata, x+k+(j*8), y+i, 0x0000);
+					if (mode == 0)point((luat_lcd_conf_t *)userdata, x+k+(j*8), y+i, FORE_COLOR);
 					else if (mode == 1)point((Paint *)userdata, x+k+(j*8), y+i, 0x0000);
 					else if (mode == 2)point((u8g2_t *)userdata, x+k+(j*8), y+i, 0x0000);
 				}