Skip to content

Commit c1fc31a

Browse files
redchenjsredchenjs
committed
gui_task: add ssd1331 and st7735 driver config
1 parent dce97b8 commit c1fc31a

File tree

2 files changed

+62
-24
lines changed

2 files changed

+62
-24
lines changed

‎main/inc/tasks/gui_task.h‎

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,57 @@
1010

1111
#include <stdint.h>
1212

13+
#if defined(CONFIG_SCREEN_PANEL_SSD1331)
1314
// ani0.gif
14-
extern const uint8_t ani0_gif_ptr[] asm("_binary_ani0_gif_start");
15-
extern const uint8_t ani0_gif_end[] asm("_binary_ani0_gif_end");
15+
extern const uint8_t ani0_96x64_gif_ptr[] asm("_binary_ani0_96x64_gif_start");
16+
extern const uint8_t ani0_96x64_gif_end[] asm("_binary_ani0_96x64_gif_end");
1617
// ani1.gif
17-
extern const uint8_t ani1_gif_ptr[] asm("_binary_ani1_gif_start");
18-
extern const uint8_t ani1_gif_end[] asm("_binary_ani1_gif_end");
18+
extern const uint8_t ani1_96x64_gif_ptr[] asm("_binary_ani1_96x64_gif_start");
19+
extern const uint8_t ani1_96x64_gif_end[] asm("_binary_ani1_96x64_gif_end");
1920
// ani2.gif
20-
extern const uint8_t ani2_gif_ptr[] asm("_binary_ani2_gif_start");
21-
extern const uint8_t ani2_gif_end[] asm("_binary_ani2_gif_end");
21+
extern const uint8_t ani2_96x64_gif_ptr[] asm("_binary_ani2_96x64_gif_start");
22+
extern const uint8_t ani2_96x64_gif_end[] asm("_binary_ani2_96x64_gif_end");
2223
// ani3.gif
23-
extern const uint8_t ani3_gif_ptr[] asm("_binary_ani3_gif_start");
24-
extern const uint8_t ani3_gif_end[] asm("_binary_ani3_gif_end");
24+
extern const uint8_t ani3_96x64_gif_ptr[] asm("_binary_ani3_96x64_gif_start");
25+
extern const uint8_t ani3_96x64_gif_end[] asm("_binary_ani3_96x64_gif_end");
2526
// ani4.gif
26-
extern const uint8_t ani4_gif_ptr[] asm("_binary_ani4_gif_start");
27-
extern const uint8_t ani4_gif_end[] asm("_binary_ani4_gif_end");
27+
extern const uint8_t ani4_96x64_gif_ptr[] asm("_binary_ani4_96x64_gif_start");
28+
extern const uint8_t ani4_96x64_gif_end[] asm("_binary_ani4_96x64_gif_end");
2829
// ani5.gif
29-
extern const uint8_t ani5_gif_ptr[] asm("_binary_ani5_gif_start");
30-
extern const uint8_t ani5_gif_end[] asm("_binary_ani5_gif_end");
30+
extern const uint8_t ani5_96x64_gif_ptr[] asm("_binary_ani5_96x64_gif_start");
31+
extern const uint8_t ani5_96x64_gif_end[] asm("_binary_ani5_96x64_gif_end");
3132
// ani6.gif
32-
extern const uint8_t ani6_gif_ptr[] asm("_binary_ani6_gif_start");
33-
extern const uint8_t ani6_gif_end[] asm("_binary_ani6_gif_end");
33+
extern const uint8_t ani6_96x64_gif_ptr[] asm("_binary_ani6_96x64_gif_start");
34+
extern const uint8_t ani6_96x64_gif_end[] asm("_binary_ani6_96x64_gif_end");
3435
// ani7.gif
35-
extern const uint8_t ani7_gif_ptr[] asm("_binary_ani7_gif_start");
36-
extern const uint8_t ani7_gif_end[] asm("_binary_ani7_gif_end");
36+
extern const uint8_t ani7_96x64_gif_ptr[] asm("_binary_ani7_96x64_gif_start");
37+
extern const uint8_t ani7_96x64_gif_end[] asm("_binary_ani7_96x64_gif_end");
38+
#elif defined(CONFIG_SCREEN_PANEL_ST7735)
39+
// ani0.gif
40+
extern const uint8_t ani0_160x80_gif_ptr[] asm("_binary_ani0_160x80_gif_start");
41+
extern const uint8_t ani0_160x80_gif_end[] asm("_binary_ani0_160x80_gif_end");
42+
// ani1.gif
43+
extern const uint8_t ani1_160x80_gif_ptr[] asm("_binary_ani1_160x80_gif_start");
44+
extern const uint8_t ani1_160x80_gif_end[] asm("_binary_ani1_160x80_gif_end");
45+
// ani2.gif
46+
extern const uint8_t ani2_160x80_gif_ptr[] asm("_binary_ani2_160x80_gif_start");
47+
extern const uint8_t ani2_160x80_gif_end[] asm("_binary_ani2_160x80_gif_end");
48+
// ani3.gif
49+
extern const uint8_t ani3_160x80_gif_ptr[] asm("_binary_ani3_160x80_gif_start");
50+
extern const uint8_t ani3_160x80_gif_end[] asm("_binary_ani3_160x80_gif_end");
51+
// ani4.gif
52+
extern const uint8_t ani4_160x80_gif_ptr[] asm("_binary_ani4_160x80_gif_start");
53+
extern const uint8_t ani4_160x80_gif_end[] asm("_binary_ani4_160x80_gif_end");
54+
// ani5.gif
55+
extern const uint8_t ani5_160x80_gif_ptr[] asm("_binary_ani5_160x80_gif_start");
56+
extern const uint8_t ani5_160x80_gif_end[] asm("_binary_ani5_160x80_gif_end");
57+
// ani6.gif
58+
extern const uint8_t ani6_160x80_gif_ptr[] asm("_binary_ani6_160x80_gif_start");
59+
extern const uint8_t ani6_160x80_gif_end[] asm("_binary_ani6_160x80_gif_end");
60+
// ani7.gif
61+
extern const uint8_t ani7_160x80_gif_ptr[] asm("_binary_ani7_160x80_gif_start");
62+
extern const uint8_t ani7_160x80_gif_end[] asm("_binary_ani7_160x80_gif_end");
63+
#endif
3764

3865
extern void gui_show_image(uint8_t filename_index);
3966
extern void gui_task(void *pvParameter);

‎main/src/tasks/gui_task.c‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,25 @@
1414
#define TAG "gui_task"
1515

1616
static const uint8_t *img_file_ptr[][2] = {
17-
{ani0_gif_ptr, ani0_gif_end}, // "WiFi"
18-
{ani1_gif_ptr, ani1_gif_end}, // "Loading"
19-
{ani2_gif_ptr, ani2_gif_end}, // "Success"
20-
{ani3_gif_ptr, ani3_gif_end}, // "NFC"
21-
{ani4_gif_ptr, ani4_gif_end}, // "PowerOff"
22-
{ani5_gif_ptr, ani5_gif_end}, // "Clock"
23-
{ani6_gif_ptr, ani6_gif_end}, // "Error"
24-
{ani7_gif_ptr, ani7_gif_end} // "Fail"
17+
#if defined(CONFIG_SCREEN_PANEL_SSD1331)
18+
{ani0_96x64_gif_ptr, ani0_96x64_gif_end}, // "WiFi"
19+
{ani1_96x64_gif_ptr, ani1_96x64_gif_end}, // "Loading"
20+
{ani2_96x64_gif_ptr, ani2_96x64_gif_end}, // "Success"
21+
{ani3_96x64_gif_ptr, ani3_96x64_gif_end}, // "NFC"
22+
{ani4_96x64_gif_ptr, ani4_96x64_gif_end}, // "PowerOff"
23+
{ani5_96x64_gif_ptr, ani5_96x64_gif_end}, // "Clock"
24+
{ani6_96x64_gif_ptr, ani6_96x64_gif_end}, // "Error"
25+
{ani7_96x64_gif_ptr, ani7_96x64_gif_end} // "Fail"
26+
#elif defined(CONFIG_SCREEN_PANEL_ST7735)
27+
{ani0_160x80_gif_ptr, ani0_160x80_gif_end}, // "WiFi"
28+
{ani1_160x80_gif_ptr, ani1_160x80_gif_end}, // "Loading"
29+
{ani2_160x80_gif_ptr, ani2_160x80_gif_end}, // "Success"
30+
{ani3_160x80_gif_ptr, ani3_160x80_gif_end}, // "NFC"
31+
{ani4_160x80_gif_ptr, ani4_160x80_gif_end}, // "PowerOff"
32+
{ani5_160x80_gif_ptr, ani5_160x80_gif_end}, // "Clock"
33+
{ani6_160x80_gif_ptr, ani6_160x80_gif_end}, // "Error"
34+
{ani7_160x80_gif_ptr, ani7_160x80_gif_end} // "Fail"
35+
#endif
2536
};
2637
uint8_t img_file_index = 0;
2738

0 commit comments

Comments
 (0)