From 51d3745904b69c8115af2ac68b3110db31588bb7 Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Fri, 9 Dec 2022 07:56:25 +0100 Subject: [PATCH] Made a little space for radioactivity display. --- .HA_VERSION | 2 +- esphome/epaperframe.yaml | 48 ++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.HA_VERSION b/.HA_VERSION index db3c477..cdf1917 100644 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -2022.11.5 \ No newline at end of file +2022.12.0 \ No newline at end of file diff --git a/esphome/epaperframe.yaml b/esphome/epaperframe.yaml index 09bc28e..83e19c5 100644 --- a/esphome/epaperframe.yaml +++ b/esphome/epaperframe.yaml @@ -419,9 +419,9 @@ display: /* C1024 logo */ it.image(10 , 37, id(c1024_logo)); - it.print(10, 120, id(mdi_small), TextAlign::BASELINE_LEFT, "󰊚"); // air pressure icon + it.print(10, 130, id(mdi_small), TextAlign::BASELINE_LEFT, "󰊚"); // air pressure icon it.print(375, 80, id(mdi_small), TextAlign::BASELINE_CENTER, "󰔏"); // thermometer icon - it.print(375, 120, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent icon + it.print(375, 130, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent icon it.print(95, 80, id(mdi_small), TextAlign::BASELINE_LEFT, "󰐼"); // radioactive icon if(outdoor_radiation > 0 && outdoor_radiation < 100) { @@ -441,19 +441,19 @@ display: } if(outdoor_humid >=0 && outdoor_humid <= 100) { - it.printf(357, 120, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "%3d%%", outdoor_humid); + it.printf(357, 130, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "%3d%%", outdoor_humid); } else { - it.print(357, 120, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, " - %"); + it.print(357, 130, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, " - %"); } if(air_pressure < 1200 && air_pressure >=800) { - it.printf(220, 120, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "%4.1f", air_pressure); - it.print(225, 120, id(sensor_unit), TextAlign::BASELINE_LEFT, "hPa"); + it.printf(220, 130, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "%4.1f", air_pressure); + it.print(225, 130, id(sensor_unit), TextAlign::BASELINE_LEFT, "hPa"); } else { - it.print(220, 120, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "- "); - it.print(225, 120, id(sensor_unit), TextAlign::BASELINE_LEFT, "hPa"); + it.print(220, 130, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "- "); + it.print(225, 130, id(sensor_unit), TextAlign::BASELINE_LEFT, "hPa"); } @@ -461,9 +461,9 @@ display: offsetY = 127; it.print(10, 10 + offsetY, id(sensor_unit), "Wohnzimmer"); it.filled_rectangle(136, 21 + offsetY, 247, 3); - it.print(10, 114 + offsetY, id(mdi_small), TextAlign::BASELINE_LEFT, "󰮬"); // PM2.5 + it.print(10, 125 + offsetY, id(mdi_small), TextAlign::BASELINE_LEFT, "󰮬"); // PM2.5 it.print(375, 75 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰔏"); // thermometer - it.print(375, 115 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent + it.print(375, 125 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent it.print(10, 75 + offsetY, id(mdi_small), TextAlign::BASELINE_LEFT, "󰟤"); // CO2 @@ -475,10 +475,10 @@ display: } if(livingroom_humid >=0 && livingroom_humid <= 100) { - it.printf(357, 115 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "%3d%%", livingroom_humid); + it.printf(357, 125 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "%3d%%", livingroom_humid); } else { - it.print(357, 115 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, " - %"); + it.print(357, 125 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, " - %"); } if(livingroom_co2 >=380 && livingroom_co2 <= 20000) { @@ -491,12 +491,12 @@ display: } if(livingroom_pm25 < 255 && livingroom_pm25 >=0) { - it.printf(220, 114 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "%3d", livingroom_pm25); - it.print(225, 114 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); + it.printf(220, 125 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "%3d", livingroom_pm25); + it.print(225, 125 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); } else { - it.print(220, 114 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "- "); - it.print(225, 114 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); + it.print(220, 125 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "- "); + it.print(225, 125 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); } @@ -504,9 +504,9 @@ display: offsetY = 247; it.print(10, 10 + offsetY, id(sensor_unit), "Schlafzimmer"); it.filled_rectangle(144, 21 + offsetY, 239, 3); - it.print(10, 114 + offsetY, id(mdi_small), TextAlign::BASELINE_LEFT, "󰮬"); // PM2.5 + it.print(10, 124 + offsetY, id(mdi_small), TextAlign::BASELINE_LEFT, "󰮬"); // PM2.5 it.print(375, 75 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰔏"); // thermometer - it.print(375, 115 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent + it.print(375, 124 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent it.print(10, 75 + offsetY, id(mdi_small), TextAlign::BASELINE_LEFT, "󰟤"); // CO2 @@ -518,10 +518,10 @@ display: } if(sleepingroom_humid >=0 && sleepingroom_humid <= 100) { - it.printf(357, 115 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "%3d%%", sleepingroom_humid); + it.printf(357, 125 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "%3d%%", sleepingroom_humid); } else { - it.print(357, 115 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, " - %"); + it.print(357, 125 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, " - %"); } if(sleepingroom_co2 >=380 && sleepingroom_co2 <= 20000) { @@ -534,12 +534,12 @@ display: } if(sleepingroom_pm25 < 255 && sleepingroom_pm25 >=0) { - it.printf(220, 114 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "%3d", sleepingroom_pm25); - it.print(225, 114 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); + it.printf(220, 125 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "%3d", sleepingroom_pm25); + it.print(225, 125 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); } else { - it.print(220, 114 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "- "); - it.print(225, 114 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); + it.print(220, 125 + offsetY, id(big_sensor_font), TextAlign::BASELINE_RIGHT, "- "); + it.print(225, 125 + offsetY, id(sensor_unit), TextAlign::BASELINE_LEFT, "µg/m³"); } /* Weather */