Skip to content

Commit 610e4c9

Browse files
committed
gui_task: rm st7789 config
1 parent 2c1c667 commit 610e4c9

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

main/inc/tasks/gui_task.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern const uint8_t ani2_128x128_gif_end[] asm("_binary_ani2_128x128_gif_end");
3636
// ani3_128x128.gif
3737
extern const uint8_t ani3_128x128_gif_ptr[] asm("_binary_ani3_128x128_gif_start");
3838
extern const uint8_t ani3_128x128_gif_end[] asm("_binary_ani3_128x128_gif_end");
39-
#elif defined(CONFIG_SCREEN_PANEL_ST7735)
39+
#else
4040
// ani0_160x80.gif
4141
extern const uint8_t ani0_160x80_gif_ptr[] asm("_binary_ani0_160x80_gif_start");
4242
extern const uint8_t ani0_160x80_gif_end[] asm("_binary_ani0_160x80_gif_end");
@@ -49,19 +49,6 @@ extern const uint8_t ani2_160x80_gif_end[] asm("_binary_ani2_160x80_gif_end");
4949
// ani3_160x80.gif
5050
extern const uint8_t ani3_160x80_gif_ptr[] asm("_binary_ani3_160x80_gif_start");
5151
extern const uint8_t ani3_160x80_gif_end[] asm("_binary_ani3_160x80_gif_end");
52-
#elif defined(CONFIG_SCREEN_PANEL_ST7789)
53-
// ani0_240x240.gif
54-
extern const uint8_t ani0_240x240_gif_ptr[] asm("_binary_ani0_240x240_gif_start");
55-
extern const uint8_t ani0_240x240_gif_end[] asm("_binary_ani0_240x240_gif_end");
56-
// ani1_240x240.gif
57-
extern const uint8_t ani1_240x240_gif_ptr[] asm("_binary_ani1_240x240_gif_start");
58-
extern const uint8_t ani1_240x240_gif_end[] asm("_binary_ani1_240x240_gif_end");
59-
// ani2_240x240.gif
60-
extern const uint8_t ani2_240x240_gif_ptr[] asm("_binary_ani2_240x240_gif_start");
61-
extern const uint8_t ani2_240x240_gif_end[] asm("_binary_ani2_240x240_gif_end");
62-
// ani3_240x240.gif
63-
extern const uint8_t ani3_240x240_gif_ptr[] asm("_binary_ani3_240x240_gif_start");
64-
extern const uint8_t ani3_240x240_gif_end[] asm("_binary_ani3_240x240_gif_end");
6552
#endif
6653

6754
extern void gui_show_image(uint8_t filename_index);

main/src/tasks/gui_task.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,23 @@ static const uint8_t *img_file_ptr[][2] = {
2424
{ani1_128x128_gif_ptr, ani1_128x128_gif_end}, // "Standby"
2525
{ani2_128x128_gif_ptr, ani2_128x128_gif_end}, // "Pause"
2626
{ani3_128x128_gif_ptr, ani3_128x128_gif_end} // "Playing"
27-
#elif defined(CONFIG_SCREEN_PANEL_ST7735)
27+
#else
2828
{ani0_160x80_gif_ptr, ani0_160x80_gif_end}, // "Bluetooth"
2929
{ani1_160x80_gif_ptr, ani1_160x80_gif_end}, // "Standby"
3030
{ani2_160x80_gif_ptr, ani2_160x80_gif_end}, // "Pause"
3131
{ani3_160x80_gif_ptr, ani3_160x80_gif_end} // "Playing"
32-
#elif defined(CONFIG_SCREEN_PANEL_ST7789)
33-
{ani0_240x240_gif_ptr, ani0_240x240_gif_end}, // "Bluetooth"
34-
{ani1_240x240_gif_ptr, ani1_240x240_gif_end}, // "Standby"
35-
{ani2_240x240_gif_ptr, ani2_240x240_gif_end}, // "Pause"
36-
{ani3_240x240_gif_ptr, ani3_240x240_gif_end} // "Playing"
3732
#endif
3833
};
3934
uint8_t img_file_index = 0;
4035

4136
void gui_show_image(uint8_t filename_index)
4237
{
43-
#if !defined(CONFIG_SCREEN_PANEL_NONE)
4438
if (filename_index >= (sizeof(img_file_ptr) / 2)) {
4539
ESP_LOGE(TAG, "invalid filename index");
4640
return;
4741
}
4842
img_file_index = filename_index;
4943
xEventGroupSetBits(task_event_group, GUI_RELOAD_BIT);
50-
#endif
5144
}
5245

5346
void gui_task(void *pvParameter)

0 commit comments

Comments
 (0)