From 16f6381a0d93b00f27bc6699f0c039a340cf0bfc Mon Sep 17 00:00:00 2001 From: Lorenz Uhlig <98092139+LoQue90@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:12:24 +0200 Subject: [PATCH] add hot water screen showing water drops and current temperature --- src/display/bitmaps.h | 18 ++++++++++++++++++ src/display/displayCommon.h | 11 +++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/display/bitmaps.h b/src/display/bitmaps.h index 4376c0bd3..16bc1baac 100644 --- a/src/display/bitmaps.h +++ b/src/display/bitmaps.h @@ -25,6 +25,8 @@ #define Water_Empty_Logo_height 64 #define Manual_Flush_Logo_width 40 #define Manual_Flush_Logo_height 40 +#define Hot_Water_Logo_width 40 +#define Hot_Water_Logo_height 40 // clang-format off @@ -225,4 +227,20 @@ static const unsigned char Manual_Flush_Logo[] U8X8_PROGMEM = { 0x00,0x3c,0x00,0x00 }; +static const unsigned char Hot_Water_Logo[] U8X8_PROGMEM = { + 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x18, 0x00, 0x00, + 0xfc, 0x00, 0x1c, 0x00, 0x00, 0xfe, 0x00, 0x3e, 0x00, 0x00, 0xef, 0x01, 0x36, 0x00, 0x00, 0xc7, + 0x01, 0x63, 0x00, 0x80, 0xc7, 0x03, 0xe3, 0x00, 0xc0, 0x83, 0x87, 0xc1, 0x00, 0xc0, 0x03, 0x87, + 0xc1, 0x01, 0xe0, 0x01, 0xcf, 0x80, 0x01, 0xe0, 0x00, 0xce, 0x80, 0x01, 0xf0, 0x00, 0x9e, 0xc1, + 0x00, 0x78, 0x00, 0xbc, 0xe3, 0x00, 0x38, 0x00, 0x38, 0x7f, 0x00, 0x3c, 0x00, 0x78, 0x1c, 0x00, + 0x1c, 0x00, 0x70, 0x00, 0x00, 0x1e, 0x00, 0xf0, 0xc0, 0x00, 0x0e, 0x00, 0xe0, 0xc0, 0x01, 0x0f, + 0x00, 0xc0, 0xe1, 0x03, 0x07, 0x00, 0xc0, 0xf1, 0x03, 0x07, 0x00, 0xc0, 0xf1, 0x07, 0x07, 0x00, + 0xc0, 0x79, 0x0f, 0x07, 0x00, 0xc0, 0x39, 0x0f, 0x0f, 0x00, 0xe0, 0x3d, 0x1e, 0x0e, 0x00, 0xe0, + 0x1e, 0x1c, 0x1e, 0x00, 0xf0, 0x0e, 0x3c, 0x3c, 0x00, 0x78, 0x0f, 0x78, 0x78, 0x00, 0x3c, 0x07, + 0x78, 0xf8, 0x01, 0x9f, 0x07, 0xf0, 0xe0, 0xff, 0x8f, 0x03, 0xe0, 0xc0, 0xff, 0x87, 0x03, 0xe0, + 0x00, 0xff, 0x81, 0x03, 0xe0, 0x00, 0x00, 0x80, 0x03, 0xf0, 0x00, 0x00, 0x80, 0x07, 0x70, 0x00, + 0x00, 0x00, 0x0f, 0x78, 0x00, 0x00, 0x00, 0x1f, 0x3e, 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x00, 0x00, + 0x00, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x03 +}; + // clang-format on diff --git a/src/display/displayCommon.h b/src/display/displayCommon.h index 73ab97d7c..cbe5159a6 100644 --- a/src/display/displayCommon.h +++ b/src/display/displayCommon.h @@ -338,6 +338,17 @@ bool displayMachineState() { u8g2.sendBuffer(); return true; } + // Hot Water + else if (machineState == kHotWater && brewSwitchState != kBrewSwitchFlushOff) { + u8g2.clearBuffer(); + u8g2.drawXBMP(0, 12, Hot_Water_Logo_width, Hot_Water_Logo_height, Hot_Water_Logo); + + displayTemperature(48, 16); + + displayWaterIcon(119, 1); + u8g2.sendBuffer(); + return true; + } // Steam else if (machineState == kSteam && brewSwitchState != kBrewSwitchFlushOff) { u8g2.clearBuffer();