Skip to content

Commit 7efcc60

Browse files
committed
New boot screen with OpenCO2 logo
1 parent 8bac246 commit 7efcc60

File tree

5 files changed

+149
-951
lines changed

5 files changed

+149
-951
lines changed

.github/workflows/arduino_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
platforms: |
1818
- name: esp32:esp32
1919
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
20-
version: 3.3.5
20+
version: 3.3.7
2121
libraries: |
2222
- name: FastLED
2323
- name: Sensirion Core

OpenCO2_Sensor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- WiFiManager: https://github.com/tzapu/WiFiManager
1111
- ArduinoMqttClient (if MQTT is defined)
1212
*/
13-
#define VERSION "v6.0"
13+
#define VERSION "v6.1"
1414

1515
#define HEIGHT_ABOVE_SEA_LEVEL 50 // Berlin
1616
#define TZ_DATA "CET-1CEST,M3.5.0,M10.5.0/3" // Europe/Berlin time zone from https://github.com/nayarsystems/posix_tz_db/blob/master/zones.csv

epd_abstraction.ino

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,21 @@ void displayWelcome() {
321321

322322
initEpdOnce();
323323
#ifdef EINK_1IN54V2
324-
Paint_DrawBitMap(gImage_welcome);
324+
Paint_Clear(WHITE);
325+
// vertikal, horizontal
326+
Paint_DrawImage(gImage_openco2, 60, 0, 80, 200);
325327
Paint_DrawString_EN(1, 1, VERSION, &Font16, WHITE, BLACK);
328+
329+
// circle XCenter,YCenter,radius
330+
Paint_DrawCircle(145, 35, 20, BLACK, DOT_PIXEL_3X3, DRAW_FILL_EMPTY);
331+
Paint_DrawRectangle(139, 0, 151, 30, WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
332+
Paint_DrawLine(145, 13, 145, 34, BLACK, DOT_PIXEL_3X3, LINE_STYLE_SOLID);
333+
334+
// arrow Xstart,Ystart,Xend,Yend
335+
Paint_DrawLine(190, 6, 190, 60, BLACK, DOT_PIXEL_3X3, LINE_STYLE_SOLID);
336+
Paint_DrawLine(182, 42, 190, 60, BLACK, DOT_PIXEL_3X3, LINE_STYLE_SOLID);
337+
Paint_DrawLine(198, 42, 190, 60, BLACK, DOT_PIXEL_3X3, LINE_STYLE_SOLID);
338+
326339
EPD_1IN54_V2_Display(BlackImage);
327340
EPD_1IN54_V2_Sleep();
328341
#endif
@@ -360,25 +373,30 @@ void initEpdOnce() {
360373

361374
void displayInitTestMode() {
362375
#ifdef EINK_1IN54V2
363-
Paint_DrawBitMap(gImage_init);
376+
Paint_Clear(WHITE);
377+
// vertikal, horizontal
378+
Paint_DrawImage(gImage_openco2, 60, 0, 80, 200);
364379
Paint_DrawString_EN(1, 1, VERSION, &Font16, WHITE, BLACK);
365-
Paint_DrawNum(125, 25, 1, &mid, BLACK, WHITE); // 15 sec for testmode
380+
Paint_DrawString_EN(50, 200-16, "Test Mode", &Font16, WHITE, BLACK);
366381
EPD_1IN54_V2_Display(BlackImage);
367382
#endif
368383
#ifdef EINK_4IN2
384+
Paint_DrawImage(gImage_openco2, 60, 0, 80, 200);
369385
Paint_DrawString_EN(1, 1, VERSION, &Font16, WHITE, BLACK);
370386
EPD_4IN2_Display(BlackImage);
371387
#endif
372388
}
373389

374390
void displayInit() {
391+
Paint_Clear(WHITE);
375392
#ifdef EINK_1IN54V2
376-
Paint_DrawBitMap(gImage_init);
393+
Paint_DrawImage(gImage_openco2, 60, 0, 80, 200);
377394
Paint_DrawString_EN(1, 1, VERSION, &Font16, WHITE, BLACK);
378395
EPD_1IN54_V2_Display(BlackImage);
379396
EPD_1IN54_V2_Sleep();
380397
#endif
381398
#ifdef EINK_4IN2
399+
Paint_DrawImage(gImage_openco2, 60, 0, 80, 200);
382400
Paint_DrawString_EN(1, 1, VERSION, &Font16, WHITE, BLACK);
383401
EPD_4IN2_Display(BlackImage);
384402
EPD_4IN2_Sleep();

0 commit comments

Comments
 (0)