GitHub/HMCLOCK
1
0
Fork 0
mirror of https://github.com/tpunix/HMCLOCK.git synced 2026-03-19 02:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整epd代码结构

Browse Source
This commit is contained in:
tpu
2025-05-14 00:04:47 +08:00
parent 31dae466c5
commit 89203f5b7a
7 changed files with 79 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/user_config.h
View File

@@ -55,7 +55,7 @@
****************************************************************************************
*/
#define EPD_VERSION 0xA50f0004
#define EPD_VERSION 0xA50f0005
/*

122
src/epd/epd.c
View File

@@ -11,6 +11,7 @@ int scr_h;
int scr_mode;
int line_bytes;
int scr_padding;
int update_mode;
// 窗口参数
@@ -89,7 +90,7 @@ void epd_pos(int x, int y)
epd_data(y>>8);
}
u8 lut[80] = {
u8 lut_fast[80] = {
// RP0 RP1 RP2 RP3 RP4 RP5 RP6
0x80, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, // LUT0
0x10, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, // LUT1
@@ -110,16 +111,19 @@ u8 lut[80] = {
0x15, 0x41, 0xa8, 0x32, 0x30, 0x0a,
};
u8 lut_p[80] = {
// 这里如果B-B和W->W不驱动的话，屏幕很快就会花掉。
// 但如果驱动的话，这种黑白转换就没有意义了。
u8 lut_fly[80] = {
// RP0 RP1 RP2 RP3 RP4 RP5 RP6
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT0
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT1
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT2
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT3
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT0 B->B
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT1 B->W
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT2 W->B
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT3 W->W
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // LUT4
0x0a, 0x00, 0x00, 0x00, 0x01, // Group0
0x0f, 0x00, 0x00, 0x00, 0x01, // Group0
0x00, 0x00, 0x00, 0x00, 0x01, // Group1
0x00, 0x00, 0x00, 0x00, 0x01, // Group2
0x00, 0x00, 0x00, 0x00, 0x01, // Group3
@@ -224,15 +228,18 @@ void epd_init(void)
printk("epd_init: %dx%d\n", scr_w, scr_h);
update_mode = UPDATE_FULL;
epd_power(1);
epd_reset();
epd_reset(1);
#if 0
epd_wait();
epd_cmd(0x12); // SWRESET
delay_ms(10);
epd_wait();
//epd_lut_size();
// epd_lut_size();
#endif
epd_cmd1(0x74, 0x54);
epd_cmd1(0x7e, 0x3b);
@@ -245,50 +252,47 @@ void epd_init(void)
epd_cmd1(0x3c, 0x05); // border wavefrom
epd_window(0, 0, scr_w-1, scr_h-1);
epd_cmd1(0x18, 0x80); // Read Built-in temperature sensor
#if 0
epd_cmd1(0x18, 0x80); // Read Built-in temperature sensor
epd_cmd1(0x22, 0xb1);
epd_cmd(0x20);
epd_wait();
epd_dump_lut();
#endif
}
void epd_update(int mode)
void epd_update_mode(int mode)
{
update_mode = mode;
}
void epd_update(void)
{
int seq;
if(mode==0){
if(update_mode==UPDATE_FULL){
seq = 0xf7;
}else{
seq = mode;
if(update_mode==UPDATE_FAST){
epd_load_lut(lut_fast);
}else{
epd_load_lut(lut_fly);
}
seq = 0xc7;
}
epd_cmd1(0x22, seq);
epd_cmd(0x20);
epd_wait();
// epd_dump_lut();
}
void epd_update_lut(u8 *lut)
{
epd_load_lut(lut);
epd_cmd1(0x22, 0xc4);
epd_cmd(0x20);
epd_wait();
}
void epd_sleep(void)
{
epd_cmd1(0x10, 01);
delay_ms(10);
}
@@ -305,11 +309,8 @@ void epd_screen_update(void)
if(scr_mode&EPD_BWR){
epd_cmd(0x26);
for(i=0; i<win_h*line_bytes; i++){
//epd_data(fb_rr[i]);
epd_data(fb_bw[i]^0xff);
//epd_data(0xff);
epd_data(fb_rr[i]);
}
//memcpy(fb_rr, fb_bw, win_h*line_bytes);
}
}
@@ -362,66 +363,39 @@ void epd_screen_clean(int mode)
void epd_test(void)
{
// epd_hw_init(0x23200700, 0x05210006); // for 2.13 board BW
epd_hw_init(0x23200700, 0x05210006, 104, 212, ROTATE_3); // for 2.13 board BW
// epd_hw_init(0x23111000, 0x07210120, 122, 250, EPD_BWR|ROTATE_3); // for 2.13 board BWR
// epd_hw_init(0x23200700, 0x05210006, 128, 296, EPD_BWR|ROTATE_3); // for 2.90 board
// epd_hw_init(0x23111000, 0x07210120); // for 2.13 board BWR
// epd_init(104, 212, ROTATE_3);
epd_init(104, 212, EPD_BWR|ROTATE_3);
// epd_hw_init(0x23111000, 0x07210120); // for 2.13 board BWR
// epd_init(122, 250, EPD_BWR|ROTATE_3);
// epd_hw_init(0x23200700, 0x05210006); // for 2.90 board
// epd_init(128, 296, EPD_BWR|ROTATE_3);
epd_init();
#if 0
epd_screen_clean(2);
#else
fb_test();
#endif
//epd_load_lut(lut);
//epd_cmd1(0x2c, 0x08);
//epd_update(0xc7);
epd_update(0xf4);
epd_update();
epd_wait();
#if 0
epd_window(32, 16, 96, 80);
epd_screen_clean(1);
epd_update_lut(lut);
//epd_update(0);
#endif
#if 0
epd_load_lut(lut_p);
epd_cmd1(0x2c, 0x55);
#if 0
epd_cmd(0x37);
epd_data(0x00);
epd_data(0x00);
epd_data(0x00);
epd_data(0x00);
epd_data(0x40);
epd_data(0x00);
epd_data(0x00);
#endif
epd_update(0xc0);
#if 1
epd_update_mode(UPDATE_FLY);
// epd_cmd1(0x2c, 0x55);
// epd_update(0xc0);
for(int i=0; i<10; i++)
{
printk("%d\n", i);
delay_ms(3000);
fb_test();
epd_update(0x04);
//epd_update(0xf7);
//scr_mode += 1;
//scr_mode &= 0xf3;
epd_update();
epd_wait();
}
#endif
delay_ms(1000);
delay_ms(5000);
printk("\nepd_test done.\n");
epd_cmd1(0x10, 0x03);
epd_cmd1(0x10, 0x01);
epd_power(0);
epd_hw_close();
//epd_update(0x03);

12
src/epd/epd.h
View File

@@ -31,7 +31,7 @@ int selflash(int otp_boot);
void epd_hw_init(u32 config0, u32 config1, int w, int h, int mode);
void epd_hw_open(void);
void epd_hw_close(void);
void epd_reset(void);
void epd_reset(int val);
void epd_wait(void);
int epd_busy(void);
void epd_power(int on);
@@ -48,8 +48,8 @@ void epd_cmd_read(int cmd, u8 *data, int len);
// epd_xxx
void epd_init(void);
void epd_load_lut(u8 *lut);
void epd_update(int mode);
void epd_update_mode(int mode);
void epd_update();
void epd_sleep(void);
void epd_window(int x1, int y1, int x2, int y2);
void epd_screen_update(void);
@@ -84,11 +84,17 @@ void fb_test(void);
#define RED 2
#define UPDATE_FULL 0
#define UPDATE_FAST 1
#define UPDATE_FLY 2
extern int scr_w;
extern int scr_h;
extern int scr_mode;
extern int line_bytes;
extern int scr_padding;
extern int update_mode;
extern int win_w;
extern int win_h;

25
src/epd/epd_gui.c
View File

@@ -43,16 +43,11 @@ void draw_pixel(int x, int y, int color)
int byte_pos = ny*line_bytes+(nx>>3);
int bit_mask = 0x80>>(nx&7);
if(color==RED){
if(color!=WHITE){
fb_bw[byte_pos] &= ~bit_mask;
}
if(scr_mode&EPD_BWR && color==RED){
fb_rr[byte_pos] |= bit_mask;
fb_bw[byte_pos] |= bit_mask;
}else{
fb_rr[byte_pos] &= ~bit_mask;
if(color==WHITE){
fb_bw[byte_pos] |= bit_mask;
}else{
fb_bw[byte_pos] &= ~bit_mask;
}
}
}
@@ -224,11 +219,14 @@ char *wday_str[] = {
"日",
};
static int wday = 0;
void fb_test(void)
{
memset(fb_bw, 0xff, scr_h*line_bytes);
memset(fb_rr, 0x00, scr_h*line_bytes);
if(scr_mode&EPD_BWR){
memset(fb_rr, 0x00, scr_h*line_bytes);
}
draw_rect(0, 0, fb_w-1, fb_h-1, BLACK);
draw_rect(1, 1, fb_w-2, fb_h-2, BLACK);
@@ -246,9 +244,7 @@ void fb_test(void)
select_font(0);
char tbuf[64];
// sprintf(tbuf, "%4d年%2d月%2d日 星期%s", 2025, 4, 29, wday_str[wday]);
sprintf(tbuf, "2025年 4月29日 星期%s", wday_str[wday]);
printk("tbuf: %s\n", tbuf);
sprintk(tbuf, "%4d年%2d月%2d日 星期%s", 2025, 4, 29, wday_str[wday]);
draw_text(15, 85, tbuf, BLACK);
wday += 1;
@@ -256,7 +252,8 @@ void fb_test(void)
wday = 0;
select_font(1);
draw_text(12, 20, "02:34", BLACK);
sprintk(tbuf, "%02d:%02d", 2+wday, 30+wday);
draw_text(12, 20, tbuf, BLACK);
epd_screen_update();
}

9
src/epd/epd_hw.c
View File

@@ -80,7 +80,7 @@ void epd_hw_init(u32 config0, u32 config1, int w, int h, int mode)
epio_cs = (config1>>16)&0xff;
epio_clk = (config1>> 8)&0xff;
epio_sdi = (config1>> 0)&0xff;
scr_w = w;
scr_h = h;
scr_mode = mode;
@@ -138,12 +138,9 @@ static int epd_spi_read(void)
}
void epd_reset(void)
void epd_reset(int val)
{
EPD_RST(0);
delay_ms(20);
EPD_RST(1);
delay_ms(20);
EPD_RST(val);
}

12
src/user_custs1_impl.c
View File

@@ -247,14 +247,14 @@ void clock_draw(int full)
epd_screen_update();
if(full){
epd_update(0xf4);
epd_update_mode(UPDATE_FULL);
}else{
epd_load_lut(lut_p);
epd_cmd1(0x2c, 0x55);
epd_update(0xc0);
epd_update(0x04);
epd_update_mode(UPDATE_FLY);
}
epd_cmd1(0x10, 0x03);
epd_update();
epd_wait();
epd_cmd1(0x10, 0x01);
epd_power(0);
epd_hw_close();
}

2
src/user_peripheral.c
View File

@@ -183,7 +183,7 @@ void user_app_init(void)
adv_count = 0;
fspi_config(0x00030605);
epd_hw_init(0x23200700, 0x05210006, 104, 212, EPD_BWR|ROTATE_3); // for 2.13 board BW
epd_hw_init(0x23200700, 0x05210006, 104, 212, ROTATE_3); // for 2.13 board BW
selflash(otp_boot);