GitHub/jcalendar
1
0
Fork 0
mirror of https://github.com/JADE-Jerry/jcalendar.git synced 2025-12-16 06:18:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.1.6

Browse Source
This commit is contained in:
Jerry
2025-10-27 12:42:13 +08:00
parent 56a4a3a029
commit 7929bc3e52
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/jcalendar_1.1.5_1680.bin → dist/jcalendar_1.1.6_1680.bin vendored
View File

Binary file not shown.

BIN
dist/jcalendar_1.1.5_z15.bin → dist/jcalendar_1.1.6_z15.bin vendored
View File

Binary file not shown.

BIN
dist/jcalendar_1.1.5_z21.bin → dist/jcalendar_1.1.6_z21.bin vendored
View File

Binary file not shown.

BIN
dist/jcalendar_1.1.5_z98.bin → dist/jcalendar_1.1.6_z98.bin vendored
View File

Binary file not shown.

2
src/main.cpp
View File

@@ -101,7 +101,7 @@ void setup() {
led_init(); led_init();
led_on(); led_on();
delay(1000); delay(100);
int voltage = readBatteryVoltage(); int voltage = readBatteryVoltage();
Serial.printf("Battery: %d mV\r\n", voltage); Serial.printf("Battery: %d mV\r\n", voltage);
if(voltage < 2500) { if(voltage < 2500) {

17
src/screen_ink.cpp
View File

@@ -211,8 +211,8 @@ void draw_cal_year(bool partial) {
u8g2Fonts.setForegroundColor(GxEPD_BLACK); u8g2Fonts.setForegroundColor(GxEPD_BLACK);
u8g2Fonts.print("日"); u8g2Fonts.print("日");
calLayout.lunarYearX = u8g2Fonts.getCursorX() + 15; calLayout.lunarYearX = u8g2Fonts.getCursorX() + 10;
calLayout.lunarDayX = u8g2Fonts.getCursorX() + 15; calLayout.lunarDayX = u8g2Fonts.getCursorX() + 10;
// 第几周 // 第几周
u8g2Fonts.setFont(FONT_TEXT); u8g2Fonts.setFont(FONT_TEXT);
@@ -238,7 +238,12 @@ void draw_cal_year(bool partial) {
u8g2Fonts.setCursor(calLayout.lunarDayX, calLayout.lunarDayY); u8g2Fonts.setCursor(calLayout.lunarDayX, calLayout.lunarDayY);
u8g2Fonts.setFont(FONT_SUB); u8g2Fonts.setFont(FONT_SUB);
u8g2Fonts.setForegroundColor(GxEPD_BLACK); u8g2Fonts.setForegroundColor(GxEPD_BLACK);
if (!todayLunarDay.isEmpty()) {
u8g2Fonts.print(todayLunarDay); u8g2Fonts.print(todayLunarDay);
} else {
u8g2Fonts.setFont(FONT_TEXT);
u8g2Fonts.print(("星期" + week_str[tmInfo.tm_wday]).c_str());
}
// 特殊日期 // 特殊日期
// draw_special_day(); // draw_special_day();
@@ -955,14 +960,6 @@ void drawStudySchedule() {
} while (true); } while (true);
} }
// 显示当前周几, 农历年月不显示
todayLunarYear = "";
todayLunarDay = "";
uint16_t color = (tmInfo.tm_wday == 0 || tmInfo.tm_wday == 6) ? GxEPD_RED : GxEPD_BLACK;
u8g2Fonts.setBackgroundColor(GxEPD_WHITE);
u8g2Fonts.setForegroundColor(GxEPD_BLACK);
u8g2Fonts.setFont(FONT_TEXT);
u8g2Fonts.drawUTF8(calLayout.lunarDayX, calLayout.lunarDayY, ("星期" + week_str[tmInfo.tm_wday]).c_str());
} }
///////////// Calendar ////////////// ///////////// Calendar //////////////