GitHub/EPD-nRF5
1
0
Fork 0
mirror of https://github.com/tsl0922/EPD-nRF5.git synced 2025-12-06 15:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

get rid of global EPD var

Browse Source
This commit is contained in:
Shuanglei Tao
2025-10-15 17:12:00 +08:00
parent c044759262
commit 1ac6b8473f
10 changed files with 119 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
GUI/GUI.c
View File

@@ -420,7 +420,7 @@ static void DrawClock(Adafruit_GFX *gfx, tm_t *tm, struct Lunar_Date *Lunar, gui
}
}
void DrawGUI(gui_data_t *data, buffer_callback draw, display_mode_t mode)
void DrawGUI(gui_data_t *data, buffer_callback callback, void *callback_data)
{
if (data->week_start > 6) data->week_start = 0;
@@ -445,7 +445,7 @@ void DrawGUI(gui_data_t *data, buffer_callback draw, display_mode_t mode)
LUNAR_SolarToLunar(&Lunar, tm.tm_year + YEAR0, tm.tm_mon + 1, tm.tm_mday);
switch (mode) {
switch (data->mode) {
case MODE_CALENDAR:
DrawCalendar(&gfx, &tm, &Lunar, data);
break;
@@ -455,11 +455,11 @@ void DrawGUI(gui_data_t *data, buffer_callback draw, display_mode_t mode)
default:
break;
}
if ((mode == MODE_CALENDAR || mode == MODE_CLOCK) &&
if ((data->mode == MODE_CALENDAR || data->mode == MODE_CLOCK) &&
(tm.tm_year + YEAR0 == 2025 && tm.tm_mon + 1 == 1)) {
DrawTimeSyncTip(&gfx, data);
}
} while(GFX_nextPage(&gfx, draw));
} while(GFX_nextPage(&gfx, callback, callback_data));
GFX_end(&gfx);
}