1.1.0

2025-12-06 09:32:48 +08:00 · 2025-09-18 12:20:10 +08:00 · 2025-09-18 12:10:10 +08:00 · 2025-09-18 11:49:19 +08:00 · 2025-09-05 08:20:33 +08:00
15 changed files with 246 additions and 147 deletions
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 墨水屏日历，采用三色4.2寸墨水屏，展示基本月历信息，支持农历、公共假期、倒计日、天气（实时天气、每日天气）展示。<br>
 项目以低难度、低成本的方式，方便爱好者实现属于自己的低功耗月历。<br>
 <img src="./assets/img/sample.jpg" width="60%"><br>
+<img src="./assets/img/sample2.jpg" width="60%"><br>
 Bilibili连接：https://www.bilibili.com/video/BV1wHDhYoE3G/<br>
 注：固件仅供个人下载免费使用，禁止商用。

@@ -44,8 +45,8 @@ Bilibili连接：https://www.bilibili.com/video/BV1wHDhYoE3G/<br>

 ## Button Operation Guide:
 1. **单点**  
-    如果处在休眠中,唤醒系统,并强制刷新月历。
-    如果处在运行中,强制刷新日历。
+    如果处在休眠中,唤醒系统,并刷新月历。
+    如果处在运行中,强制刷新/切换日历。
    如果处在配置中,不做任何处理。
 2. **双击**  
    系统正常运行中,双击进入系统配置。(并强制停止WIFI相关操作,如获取天气。)
@@ -79,6 +80,12 @@ Bilibili连接：https://www.bilibili.com/video/BV1wHDhYoE3G/<br>
    * 日期Tag:<br>
        1. 输入格式，yyyyMMddx，yyyy为年，每年显示设为0000，MM为月份，每月显示设为00，dd为日期，x为tag的图标（a:书签；b：金钱；c：笑脸；d：警告）。例如：00000015b，每年每月15日旁边显示$符号；00000312a，每年3月12日，显示书签符号。
        2. 最多可以设置三个tag，中间以分号隔开。例如：00000015b;00000312a
+    * 课程表:<br>
+        输入格式，分多段，每段用“；”隔开。
+        1. 课程数段。"000"，三位数字，分别代表上午、下午、晚上课程数，不可省略。如：“430”，代表上午4课，下午三课，晚上无课。
+        2. 每日课程（多段）。首位为星期数，后接当日的课程，以“，”分隔。如：“二,数学,语文,英语,体育,音乐,德法,”，表示周二的课程为数学、语文...等。
+        3. 样例: 430;一,语文,数学,体育,美术,科学,综合;二,数学,语文,英语,体育,音乐,德法;三,数学,英语,科学,语文,体育,书法,音乐;四,语文,数学,信息,劳动,德法,体育;五,英语,语文,数学,美术,心理,体育;
+        4. 注意：分隔用的“,”“;”，必须为英文符号，不可用中文符号。
    * 保存配置后，系统自动重启。
 3. Update. OTA升级  
    此项需要在浏览器内完成,通过ip地址访问配置页面,然后进入Update,选择固件文件后上传,等待。刷新完成后,页面会有成功提示。
@@ -97,7 +104,7 @@ A: 观察22针脚的LED是否点亮，有闪烁说明固件已经刷入，如果
 3. Q: 可以支持哪种屏？<br>
 A: 仅4.2寸三色屏(目前仅支持黑白红,将来支持黑白黄)。
 4. Q: 我使用的屏应该烧录哪个固件？<br>
-A: 从经验上预估，SES的拆机屏选z21，比较新一些的选z98，如果是非常老的屏，选z15。实在不行的话，三个固件都刷一遍试试。<br>
+A: 从经验上预估，大部分比较新一些的选z98，SES的拆机屏选z21，如果是非常老的屏，选z15。实在不行的话，三个固件都刷一遍试试。<br>
 明确的丝印对应如下：<br>
    |丝印|固件|
    |-----|-----|
@@ -108,12 +115,18 @@ A: 从经验上预估，SES的拆机屏选z21，比较新一些的选z98，如
 A: 1. 检查USB线连接是否正常。 <br>2. app的串口下拉框里是否检测到COM口。 <br>3. 把其他串口工具关闭，防止占用COM口。
 6. Q: 刷新固件的过程中提示报错。<br>
 A: 1. 换根质量较好的或短一些的USB线，或换个USB口插入。 <br>2. 可以将刷新的波特率降低一点，如选择速率低一点的115200。
-7. Q: 刷新固件后，需要重新配置吗？
+7. Q: 刷新固件后，需要重新配置吗？<br>
 A: 仅刷新app固件后，配置是保留的，所以，无需重新配置。如果刷新了分区表partition.bin，会将esp的nvs区刷新，这时候需要重新配置。
-8. Q: 填入和风天气的API Key和位置ID后，没有成功获取天气信息。
+8. Q: 填入和风天气的API Key和位置ID后，没有成功获取天气信息。<br>
 A: 2025年3月1日后注册的和风天气账户有API Host限制，请下载1.0.25以后版本，在配置时配置API Host信息。
+8. Q: 如何切换日历和课程表显示？<br>
+A: 在系统运行状态下(状态灯常亮)，单击按键，稍等即可切换课程表的展示。

 ## Releases
+### 1.1.0
+* New Feature: 课程表。
+* Refine: 对针脚统一配置。
+* Fix: Some bugs.
 ### 1.0.27
 * Fix: 闰月错误。（bug from nongli lib）
 ### 1.0.26
--- a/assets/img/sample2.jpg
+++ b/assets/img/sample2.jpg
--- a/dist/jcalendar_1.0.27_z15.bin
+++ b/dist/jcalendar_1.0.27_z15.bin
--- a/dist/jcalendar_1.0.27_z21.bin
+++ b/dist/jcalendar_1.0.27_z21.bin
--- a/dist/jcalendar_1.0.27_z98.bin
+++ b/dist/jcalendar_1.0.27_z98.bin
--- a/include/README
+++ b/include/README
@@ -1,39 +0,0 @@
-
-This directory is intended for project header files.
-
-A header file is a file containing C declarations and macro definitions
-to be shared between several project source files. You request the use of a
-header file in your project source file (C, C++, etc) located in `src` folder
-by including it, with the C preprocessing directive `#include'.
-
-```src/main.c
-
-#include "header.h"
-
-int main (void)
-{
- ...
-}
-```
-
-Including a header file produces the same results as copying the header file
-into each source file that needs it. Such copying would be time-consuming
-and error-prone. With a header file, the related declarations appear
-in only one place. If they need to be changed, they can be changed in one
-place, and programs that include the header file will automatically use the
-new version when next recompiled. The header file eliminates the labor of
-finding and changing all the copies as well as the risk that a failure to
-find one copy will result in inconsistencies within a program.
-
-In C, the usual convention is to give header files names that end with `.h'.
-It is most portable to use only letters, digits, dashes, and underscores in
-header file names, and at most one dot.
-
-Read more about using header files in official GCC documentation:
-
-* Include Syntax
-* Include Operation
-* Once-Only Headers
-* Computed Includes
-
-https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
--- a/include/_preference.h
+++ b/include/_preference.h
@@ -8,6 +8,8 @@
 // !!!preferences key限制15字符
 #define PREF_SI_CAL_DATE "SI_CAL_DATE" // 屏幕当前显示的日期
 #define PREF_SI_WEEK_1ST "SI_WEEK_1ST" // 每周第一天，0: 周日（默认），1:周一
+#define PREF_SI_TYPE "SI_TYPE" // 屏幕显示类型
+
 #define PREF_QWEATHER_HOST "QWEATHER_HOST" // QWEATHER HOST
 #define PREF_QWEATHER_KEY "QWEATHER_KEY" // QWEATHER KEY/TOKEN
 #define PREF_QWEATHER_TYPE "QWEATHER_TYPE" // 0: 每日天气，1: 实时天气
@@ -15,6 +17,7 @@
 #define PREF_CD_DAY_DATE "CD_DAY_DATE" // 倒计日
 #define PREF_CD_DAY_LABLE "CD_DAY_LABLE" // 倒计日名称
 #define PREF_TAG_DAYS "TAG_DAYS" // tag day
+#define PREF_STUDY_SCHEDULE "STUDY_SCH" // 课程表

 // 假期信息，tm年，假期日(int8)，假期日(int8)...
 #define PREF_HOLIDAY "HOLIDAY"
--- a/include/led.h
+++ b/include/led.h
@@ -1,10 +1,6 @@
 #ifndef ___LED_H__
 #define ___LED_H__

-#include <Arduino.h>
-
-#define PIN_LED GPIO_NUM_22
-
 void led_init();
 void led_fast();
 void led_slow();
--- a/include/wiring.h
+++ b/include/wiring.h
@@ -0,0 +1,27 @@
+
+#ifndef __WIRING_H__
+#define __WIRING_H__
+
+#define LOLIN32_LITE
+
+
+
+#ifdef LOLIN32_LITE    
+// Output PIN
+#define SPI_MOSI GPIO_NUM_23
+#define SPI_MISO GPIO_NUM_19
+#define SPI_SCK GPIO_NUM_18
+
+#define SPI_CS GPIO_NUM_5
+#define SPI_DC GPIO_NUM_17
+#define SPI_RST GPIO_NUM_16
+#define SPI_BUSY GPIO_NUM_4
+// I2C
+#define I2C_SDA GPIO_NUM_21
+#define I2C_SCL GPIO_NUM_22
+// Other PIN
+#define PIN_BUTTON GPIO_NUM_14 // 注意：由于此按键负责唤醒，因此需要选择支持RTC唤醒的PIN脚。
+#define PIN_LED GPIO_NUM_22
+#endif
+
+#endif
--- a/lib/README
+++ b/lib/README
@@ -1,46 +0,0 @@
-
-This directory is intended for project specific (private) libraries.
-PlatformIO will compile them to static libraries and link into executable file.
-
-The source code of each library should be placed in an own separate directory
-("lib/your_library_name/[here are source files]").
-
-For example, see a structure of the following two libraries `Foo` and `Bar`:
-
-|--lib
-|  |
-|  |--Bar
-|  |  |--docs
-|  |  |--examples
-|  |  |--src
-|  |     |- Bar.c
-|  |     |- Bar.h
-|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
-|  |
-|  |--Foo
-|  |  |- Foo.c
-|  |  |- Foo.h
-|  |
-|  |- README --> THIS FILE
-|
-|- platformio.ini
-|--src
-   |- main.c
-
-and a contents of `src/main.c`:
-```
-#include <Foo.h>
-#include <Bar.h>
-
-int main (void)
-{
-  ...
-}
-
-```
-
-PlatformIO Library Dependency Finder will find automatically dependent
-libraries scanning project source files.
-
-More information about PlatformIO Library Dependency Finder
- https://docs.platformio.org/page/librarymanager/ldf.html
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,6 +12,8 @@
 description = Ink Screen Calendar
 default_envs = 
 	z21
+	z15
+	z98

 [common]
 framework = arduino
@@ -33,8 +35,7 @@ lib_deps = ${common.lib_deps}
 upload_speed = 460800
 monitor_speed = 115200
 board_build.partitions = min_spiffs.csv
-build_flags =
-	-D SI_DRIVER=98
+build_flags = -D SI_DRIVER=98

 [env:z21]
 build_type = release
@@ -45,9 +46,7 @@ lib_deps = ${common.lib_deps}
 upload_speed = 460800
 monitor_speed = 115200
 board_build.partitions = min_spiffs.csv
-build_flags =
-	-D SI_DRIVER=21
-;extra_scripts = post:extra_script.py
+build_flags = -D SI_DRIVER=21

 [env:z15]
 build_type = release
@@ -58,8 +57,8 @@ lib_deps = ${common.lib_deps}
 upload_speed = 460800
 monitor_speed = 115200
 board_build.partitions = min_spiffs.csv
-build_flags =
-	-D SI_DRIVER=15
+build_flags = -D SI_DRIVER=15
+

 [env:esp32c3]
 platform = espressif32
@@ -70,6 +69,6 @@ lib_deps = ${common.lib_deps}
 upload_speed = 460800
 monitor_speed = 115200
 board_build.partitions = min_spiffs.csv
-build_flags =
-	-DARDUINO_USB_MODE=1                        ;开启USB Slave 功能
-	-DARDUINO_USB_CDC_ON_BOOT=1                ;开启CDC 下载功能宏
+build_flags = -D SI_DRIVER=98
+;	-DARDUINO_USB_MODE=1
+;	-DARDUINO_USB_CDC_ON_BOOT=1
--- a/src/API.hpp
+++ b/src/API.hpp
@@ -8,7 +8,6 @@

 #include <ArduinoUZlib.h> // 解压gzip

-
 struct Weather {
    String time;
    int8_t temp;
@@ -106,9 +105,10 @@ private:
                    if (isGzip) {
                        // gzip解压缩
                        uint8_t* outBuf = NULL;
-                        size_t outLen = 0;
+                        uint32_t outLen = 0;
                        ArduinoUZlib::decompress((uint8_t*)s.c_str(), (uint32_t)s.length(), outBuf, outLen);
                        error = deserializeJson(doc, (char*)outBuf, outLen);
+                        free(outBuf);
                    } else {
                        error = deserializeJson(doc, s);
                    }
--- a/src/led.cpp
+++ b/src/led.cpp
@@ -1,6 +1,7 @@
 #include "led.h"

-#define PIN_LED GPIO_NUM_22
+#include <Arduino.h>
+#include "wiring.h"

 TaskHandle_t LED_HANDLER;
 int8_t BLINK_TYPE;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,9 @@

 #include <WiFiManager.h>

-#include "OneButton.h"
+#include "esp_sleep.h"
+
+#include <wiring.h>

 #include "led.h"
 #include "_sntp.h"
@@ -13,7 +15,7 @@

 #include "version.h"

-#define PIN_BUTTON GPIO_NUM_14 // 注意：由于此按键负责唤醒，因此需要选择支持RTC唤醒的PIN脚。
+#include "OneButton.h"
 OneButton button(PIN_BUTTON, true);

 void IRAM_ATTR checkTicks() {
@@ -31,6 +33,7 @@ WiFiManagerParameter para_cd_day_label("cd_day_label", "倒数日（4字以内
 WiFiManagerParameter para_cd_day_date("cd_day_date", "日期（yyyyMMdd）", "", 8, "pattern='\\d{8}'"); //     城市code
 WiFiManagerParameter para_tag_days("tag_days", "日期Tag（yyyyMMddx，详见README）", "", 30); //     日期Tag
 WiFiManagerParameter para_si_week_1st("si_week_1st", "每周起始（0:周日，1:周一）", "0", 2, "pattern='\\[0-1]{1}'"); //     每周第一天
+WiFiManagerParameter para_study_schedule("study_schedule", "课程表", "0", 4000, "pattern='\\[0-9]{3}[;]$'"); //     每周第一天

 void print_wakeup_reason() {
    esp_sleep_wakeup_cause_t wakeup_reason = esp_sleep_get_wakeup_cause();
@@ -158,10 +161,10 @@ void loop() {

    // 未在配置状态，且屏幕刷新完成，进入休眠
    if (!wm.getConfigPortalActive() && si_screen_status() > 0) {
-        if(_wifi_flag) {
+        if (_wifi_flag) {
            go_sleep();
        }
-        if(!_wifi_flag && millis() - _wifi_failed_millis > 10 * 1000) { // 如果wifi连接不成功，等待10秒休眠
+        if (!_wifi_flag && millis() - _wifi_failed_millis > 10 * 1000) { // 如果wifi连接不成功，等待10秒休眠
            go_sleep();
        }
    }
@@ -181,6 +184,11 @@ void buttonClick(void* oneButton) {
        Serial.println("In config status.");
    } else {
        Serial.println("Refresh screen manually.");
+        Preferences pref;
+        pref.begin(PREF_NAMESPACE);
+        int _si_type = pref.getInt(PREF_SI_TYPE);
+        pref.putInt(PREF_SI_TYPE, _si_type == 0 ? 1 : 0);
+        pref.end();
        si_screen();
    }
 }
@@ -196,6 +204,7 @@ void saveParamsCallback() {
    pref.putString(PREF_CD_DAY_DATE, para_cd_day_date.getValue());
    pref.putString(PREF_TAG_DAYS, para_tag_days.getValue());
    pref.putString(PREF_SI_WEEK_1ST, strcmp(para_si_week_1st.getValue(), "1") == 0 ? "1" : "0");
+    pref.putString(PREF_STUDY_SCHEDULE, para_study_schedule.getValue());
    pref.end();

    Serial.println("Params saved.");
@@ -232,6 +241,7 @@ void buttonDoubleClick(void* oneButton) {
    String cddDate = pref.getString(PREF_CD_DAY_DATE);
    String tagDays = pref.getString(PREF_TAG_DAYS);
    String week1st = pref.getString(PREF_SI_WEEK_1ST, "0");
+    String studySchedule = pref.getString(PREF_STUDY_SCHEDULE);
    pref.end();

    para_qweather_host.setValue(qHost.c_str(), 64);
@@ -242,6 +252,7 @@ void buttonDoubleClick(void* oneButton) {
    para_cd_day_date.setValue(cddDate.c_str(), 8);
    para_tag_days.setValue(tagDays.c_str(), 30);
    para_si_week_1st.setValue(week1st.c_str(), 1);
+    para_study_schedule.setValue(studySchedule.c_str(), 4000);

    wm.setTitle("J-Calendar");
    wm.addParameter(&para_si_week_1st);
@@ -252,6 +263,7 @@ void buttonDoubleClick(void* oneButton) {
    wm.addParameter(&para_cd_day_label);
    wm.addParameter(&para_cd_day_date);
    wm.addParameter(&para_tag_days);
+    wm.addParameter(&para_study_schedule);
    // std::vector<const char *> menu = {"wifi","wifinoscan","info","param","custom","close","sep","erase","update","restart","exit"};
    std::vector<const char*> menu = { "wifi","param","update","sep","info","restart","exit" };
    wm.setMenu(menu); // custom menu, pass vector
@@ -338,7 +350,12 @@ void go_sleep() {
    }

    esp_sleep_enable_timer_wakeup(p * (uint64_t)uS_TO_S_FACTOR);
+#ifdef CONFIG_IDF_TARGET_ESP32   
    esp_sleep_enable_ext0_wakeup(PIN_BUTTON, 0);
+#elif CONFIG_IDF_TARGET_ESP32C3
+    esp_deep_sleep_enable_gpio_wakeup(PIN_BUTTON, ESP_GPIO_WAKEUP_GPIO_HIGH);
+    gpio_set_direction(PIN_BUTTON, GPIO_MODE_INPUT);
+#endif

    // 省电考虑，关闭RTC外设和存储器
    // esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_OFF); // RTC IO, sensors and ULP, 注意：由于需要按键唤醒，所以不能关闭，否则会导致RTC_IO唤醒失败
@@ -347,10 +364,10 @@ void go_sleep() {

    // 省电考虑，重置gpio，平均每针脚能省8ua。
    gpio_reset_pin(PIN_LED); // 减小deep-sleep电流
-    gpio_reset_pin(GPIO_NUM_5); // 减小deep-sleep电流
-    gpio_reset_pin(GPIO_NUM_17); // 减小deep-sleep电流
-    gpio_reset_pin(GPIO_NUM_16); // 减小deep-sleep电流
-    gpio_reset_pin(GPIO_NUM_4); // 减小deep-sleep电流
+    gpio_reset_pin(SPI_CS); // 减小deep-sleep电流
+    gpio_reset_pin(SPI_DC); // 减小deep-sleep电流
+    gpio_reset_pin(SPI_RST); // 减小deep-sleep电流
+    gpio_reset_pin(SPI_BUSY); // 减小deep-sleep电流

    delay(10);
    Serial.println("Deep sleep...");
--- a/src/screen_ink.cpp
+++ b/src/screen_ink.cpp
@@ -14,10 +14,10 @@
 #include "font.h"
 #define ROTATION 0

-GxEPD2_DISPLAY_CLASS<GxEPD2_DRIVER_CLASS, GxEPD2_DRIVER_CLASS::HEIGHT> display(GxEPD2_DRIVER_CLASS(/*CS=D8*/ 5, /*DC=D3*/ 17, /*RST=D4*/ 16, /*BUSY=D2*/ 4));
+#include "wiring.h"
+GxEPD2_DISPLAY_CLASS<GxEPD2_DRIVER_CLASS, GxEPD2_DRIVER_CLASS::HEIGHT> display(GxEPD2_DRIVER_CLASS(/*CS=D8*/ SPI_CS, /*DC=D3*/ SPI_DC, /*RST=D4*/ SPI_RST, /*BUSY=D2*/ SPI_BUSY));
 U8G2_FOR_ADAFRUIT_GFX u8g2Fonts;

-
 #define FONT_TEXT u8g2_font_wqy16_t_gb2312 // 224825bytes，最大字库（天气描述中“霾”，只有此字库中有）
 #define FONT_SUB u8g2_font_wqy12_t_gb2312 // 次要字体，u8g2最小字体
 const String week_str[] = { "日", "一", "二", "三", "四", "五", "六" };
@@ -41,6 +41,10 @@ const int jrLength = 11;
 const int jrDate[] = { 101, 214, 308, 312, 501, 504, 601, 701, 801, 910, 1001, 1224, 1225 };
 const String jrText[] = { "元旦", "情人节", "妇女节", "植树节", "劳动节", "青年节", "儿童节", "建党节", "建军节", "教师节", "国庆节", "平安夜", "圣诞节" };

+int _si_type = 0;
+String _study_schedule;
+
+
 struct tm tmInfo = { 0 }; // 日历显示用的时间

 struct
@@ -98,9 +102,9 @@ void init_cal_layout_size() {
    calLayout.weekX = 10;
    calLayout.weekY = calLayout.topH - 5;

-    calLayout.lunarYearX = calLayout.topX + calLayout.topW;
+    calLayout.lunarYearX = calLayout.topX + calLayout.topW + 15;
    calLayout.lunarYearY = calLayout.yearY / 2;
-    calLayout.lunarDayX = calLayout.topX + calLayout.topW;
+    calLayout.lunarDayX = calLayout.topX + calLayout.topW + 15;
    calLayout.lunarDayY = calLayout.yearY;

    calLayout.cdDayX = 0;
@@ -129,7 +133,7 @@ void init_cal_layout_size() {
    calLayout.dayH = 44;
 }

-void draw_cal_layout() {
+void draw_cal_header() {
    uint16_t color;

    u8g2Fonts.setFont(FONT_TEXT);
@@ -139,19 +143,19 @@ void draw_cal_layout() {
    int16_t daysMagin = 4;

    for (int i = 0; i < 7; i++) {
-        if((i + _week_1st) % 7 == 0 || (i + _week_1st) % 7 == 6) {
+        if ((i + _week_1st) % 7 == 0 || (i + _week_1st) % 7 == 6) {
            color = GxEPD_RED;
        } else {
            color = GxEPD_BLACK;
        }
        // header background
-        if(i == 0) {
-            display.fillRect(0, calLayout.headerY, (display.width() - 7 * calLayout.dayW)/2, calLayout.headerH, color);
-        } else if(i == 6) {
-            display.fillRect((display.width() + 7 * calLayout.dayW)/2, calLayout.headerY, (display.width() - 7 * calLayout.dayW)/2, calLayout.headerH, color);
+        if (i == 0) {
+            display.fillRect(0, calLayout.headerY, (display.width() - 7 * calLayout.dayW) / 2, calLayout.headerH, color);
+        } else if (i == 6) {
+            display.fillRect((display.width() + 7 * calLayout.dayW) / 2, calLayout.headerY, (display.width() - 7 * calLayout.dayW) / 2, calLayout.headerH, color);
        }
-        display.fillRect((display.width() - 7 * calLayout.dayW)/2 + i * calLayout.dayW, calLayout.headerY, calLayout.dayW, calLayout.headerH, color);
-        
+        display.fillRect((display.width() - 7 * calLayout.dayW) / 2 + i * calLayout.dayW, calLayout.headerY, calLayout.dayW, calLayout.headerH, color);
+
        // header text
        u8g2Fonts.drawUTF8(calLayout.headerX + daysMagin + (calLayout.dayW - u8g2Fonts.getUTF8Width(week_str[i].c_str())) / 2 + i * calLayout.dayW, calLayout.headerY + calLayout.headerH - 3, week_str[(i + _week_1st) % 7].c_str());
    }
@@ -247,9 +251,9 @@ void draw_cal_days(bool partial) {
        totalDays = 31;
    }
    if (monthNum == 2) {
-        if ((tmInfo.tm_year + 1900) % 4 == 0 
-            && (tmInfo.tm_year + 1900) % 100 != 0 
-            || (tmInfo.tm_year + 1900) % 400 == 0){
+        if ((tmInfo.tm_year + 1900) % 4 == 0
+            && (tmInfo.tm_year + 1900) % 100 != 0
+            || (tmInfo.tm_year + 1900) % 400 == 0) {
            totalDays = 29; // 闰二月
        } else {
            totalDays = 28; // 二月
@@ -291,7 +295,7 @@ void draw_cal_days(bool partial) {
    }
    pref.end();

-    if(_holiday.year != tmInfo.tm_year + 1900 || _holiday.month != tmInfo.tm_mon + 1) {
+    if (_holiday.year != tmInfo.tm_year + 1900 || _holiday.month != tmInfo.tm_mon + 1) {
        _holiday = {};
    }

@@ -313,7 +317,7 @@ void draw_cal_days(bool partial) {
        } else {
            color = GxEPD_BLACK;
        }
-        
+
        if (tmInfo.tm_year + 1900 == _holiday.year && tmInfo.tm_mon + 1 == _holiday.month) {
            uint8_t holidayIndex = 0;
            for (; holidayIndex < _holiday.length; holidayIndex++) {
@@ -419,8 +423,8 @@ void draw_cal_days(bool partial) {

            // 今日农历年份，e.g. 乙巳年 蛇
            // 如果农历月份小于公历月份，那么说明是上一年
-            int tg = nl_tg(tmInfo.tm_year + 1900 - (lunarMon > (tmInfo.tm_mon + 1)? 1:0));
-            int dz = nl_dz(tmInfo.tm_year + 1900 - (lunarMon > (tmInfo.tm_mon + 1)? 1:0));;
+            int tg = nl_tg(tmInfo.tm_year + 1900 - (lunarMon > (tmInfo.tm_mon + 1) ? 1 : 0));
+            int dz = nl_dz(tmInfo.tm_year + 1900 - (lunarMon > (tmInfo.tm_mon + 1) ? 1 : 0));;
            todayLunarYear = String(nl_tg_text[tg]) + String(nl_dz_text[dz]) + "年 " + String(nl_sx_text[dz]);

            // 今日农历日期
@@ -798,6 +802,122 @@ void draw_err(bool partial) {
    }
 }

+void drawStudySchedule() {
+    int i = _study_schedule.substring(0, 3).toInt();
+    Serial.printf("%d\r\n", i);
+    int morningClassCount = i / 100;
+    int eveningClassCount = (i % 100) / 10;
+    int nightClassCount = i % 10;
+    int segmentCount = (morningClassCount > 0 ? 1 : 0) + (eveningClassCount > 0 ? 1 : 0) + (nightClassCount > 0 ? 1 : 0);
+    String daysClassStr[7];
+    int pos_begin = 4;
+    int daysCount = 0;
+    do {
+        int pos_end = _study_schedule.indexOf(";", pos_begin);
+        if (pos_end < 0) break;
+
+        String str = _study_schedule.substring(pos_begin, pos_end);
+        str.trim();
+        daysClassStr[daysCount++] = str;
+        // Serial.printf("%d : %d : %s\r\n", daysCount, pos_end, str.c_str());
+        pos_begin = pos_end + 1;
+    } while (true);
+
+    // 计算Cell尺寸
+    int cellHeight = (display.height() - calLayout.topH - calLayout.headerH - segmentCount * 2) / (morningClassCount + eveningClassCount + nightClassCount);
+    int cellWidth = display.width() / daysCount;
+    int marginLeft = (display.width() - cellWidth * daysCount) / 2;
+
+    // cell line
+    display.drawFastHLine(0, calLayout.topH, display.width(), GxEPD_RED);
+    display.drawFastHLine(0, calLayout.topH - 1, display.width(), GxEPD_RED);
+    display.drawFastHLine(0, calLayout.topH + calLayout.headerH - 1, display.width(), GxEPD_RED);
+    display.drawFastHLine(0, calLayout.topH + calLayout.headerH, display.width(), GxEPD_RED);
+    int segmentIndex = 0;
+    uint16_t max_y = calLayout.topH + calLayout.headerH; // 水平分割线
+    for (int x = 1; x <= morningClassCount; x++) {
+        max_y += cellHeight;
+        display.drawFastHLine(0, max_y, display.width(), GxEPD_BLACK);
+    }
+    if (eveningClassCount > 0) {
+        max_y += 2;
+        display.drawFastHLine(0, max_y, display.width(), GxEPD_BLACK);
+    }
+    for (int x = 1; x <= eveningClassCount; x++) {
+        max_y += cellHeight;
+        display.drawFastHLine(0, max_y, display.width(), GxEPD_BLACK);
+    }
+    if (nightClassCount > 0) {
+        max_y += 2;
+        display.drawFastHLine(0, max_y, display.width(), GxEPD_BLACK);
+    }
+    for (int x = 1; x <= nightClassCount; x++) {
+        max_y += cellHeight;
+        display.drawFastHLine(0, max_y, display.width(), GxEPD_BLACK);
+    }
+    for (int x = 1; x < daysCount; x++) { // 垂直分割线
+        display.drawFastVLine(cellWidth * x, calLayout.headerH + calLayout.topH, max_y - calLayout.headerH - calLayout.topH, GxEPD_BLACK);
+    }
+
+    for (int x = 0; x < daysCount; x++) {
+        // Serial.println(daysClassStr[x].c_str());
+        int pos_begin = 0;
+        int yStep = 0;
+        int segmentIndex = 0;
+
+
+        uint16_t fontColor = GxEPD_BLACK;
+        do {
+            int pos_end = daysClassStr[x].indexOf(",", pos_begin);
+            String ss = daysClassStr[x].substring(pos_begin, pos_end);
+            ss.trim();
+            // Serial.printf("%s\r\n", ss.c_str());
+            if (yStep == 0) {
+                if (week_str[tmInfo.tm_wday] == ss) {
+                    display.fillRect(cellWidth * x + marginLeft, calLayout.topH, cellWidth, calLayout.headerH, GxEPD_RED);
+                    fontColor = GxEPD_RED;
+                    u8g2Fonts.setBackgroundColor(GxEPD_RED);
+                    u8g2Fonts.setForegroundColor(GxEPD_WHITE);
+                } else {
+                    fontColor = GxEPD_BLACK;
+                    u8g2Fonts.setBackgroundColor(GxEPD_WHITE);
+                    u8g2Fonts.setForegroundColor(fontColor);
+                }
+                u8g2Fonts.setFont(FONT_TEXT);
+                u8g2Fonts.drawUTF8(cellWidth * x + marginLeft + (cellWidth - u8g2Fonts.getUTF8Width(ss.c_str())) / 2, calLayout.topH + calLayout.headerH - 4, ss.c_str());
+            } else if (yStep > 0) {
+                if (yStep == morningClassCount + 1 || yStep == (morningClassCount + eveningClassCount + 1)) {
+                    segmentIndex++;
+                }
+                u8g2Fonts.setBackgroundColor(GxEPD_WHITE);
+                u8g2Fonts.setForegroundColor(fontColor);
+                int fontHeight = 12;
+                if (cellHeight < 18) {
+                    u8g2Fonts.setFont(FONT_SUB);
+                    fontHeight = 12;
+                } else {
+                    u8g2Fonts.setFont(FONT_TEXT);
+                    fontHeight = 16;
+                }
+                u8g2Fonts.drawUTF8(cellWidth * x + marginLeft + (cellWidth - u8g2Fonts.getUTF8Width(ss.c_str())) / 2, calLayout.topH + calLayout.headerH + cellHeight * yStep - 1 - (cellHeight - 1 - fontHeight) / 2 + 2 * segmentIndex, ss.c_str());
+            }
+
+            if (pos_end < 0) break;
+            pos_begin = pos_end + 1;
+            yStep++;
+        } 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 //////////////
 /**
 * 处理日历信息
@@ -812,6 +932,10 @@ void si_calendar() {
    _cd_day_date = pref.getString(PREF_CD_DAY_DATE);
    _tag_days_str = pref.getString(PREF_TAG_DAYS);
    _week_1st = pref.getString(PREF_SI_WEEK_1ST, "0").toInt();
+    _study_schedule = pref.getString(PREF_STUDY_SCHEDULE);
+    _si_type = pref.getInt(PREF_SI_TYPE);
+    if (_study_schedule.isEmpty()) _si_type = 0;
+
    pref.end();

    time_t now = 0;
@@ -839,8 +963,7 @@ void si_calendar() {
                time_t set = mktime(&tmInfo);
                timeval tv;
                tv.tv_sec = set;
-                settimeofday(&tv, nullptr);
-                isSetOK = true;
+                isSetOK = (settimeofday(&tv, nullptr) == 0);
                Serial.println("WARN: Set system time by api time.");
            } else {
                Serial.println("ERR: Fail to format api time.");
@@ -884,20 +1007,25 @@ void task_screen(void* param) {
    init_cal_layout_size();
    display.setFullWindow();
    display.fillScreen(GxEPD_WHITE);
-    draw_cal_layout();
-    draw_cal_days(false);
-    draw_cal_year(false);
+    do {
+        if (_si_type == 1) {
+            drawStudySchedule();
+        } else {
+            draw_cal_days(false);
+            draw_cal_header();
+        }

-    // 倒计日
-    draw_cd_day(_cd_day_label, _cd_day_date);
+        draw_cal_year(false);

-    if (weather_status() == 1) {
-        draw_weather(false);
-    } else if (weather_status() == 2) {
-        draw_err(false);
-    }
+        // 倒计日
+        draw_cd_day(_cd_day_label, _cd_day_date);

-    display.display();
+        if (weather_status() == 1) {
+            draw_weather(false);
+        } else if (weather_status() == 2) {
+            draw_err(false);
+        }
+    } while (display.nextPage());

    int32_t _calendar_date = (tmInfo.tm_year + 1900) * 10000 + (tmInfo.tm_mon + 1) * 100 + tmInfo.tm_mday;
Author	SHA1	Message	Date
Jerry	f631e8632a	1.1.0	2025-09-18 12:20:10 +08:00
Jerry	d1511d7035	1.1.0	2025-09-18 12:10:10 +08:00
Jerry	2a65240c5a	1.1.0	2025-09-18 11:49:19 +08:00
Jerry	e58ad6aa75	Fix memory leak by gzip	2025-09-05 08:20:33 +08:00