Added icons. Unified formatting.

This commit is contained in:
Marcus Scholz 2022-02-21 00:43:36 +01:00
parent c761fe3285
commit f7ffbdc183

View File

@ -245,7 +245,10 @@ font:
'󰖛', # mdi-weather-sunset-down '󰖛', # mdi-weather-sunset-down
'󰖜', # mdi-weather-sunset-up '󰖜', # mdi-weather-sunset-up
'󱐋', # mdi-lightning-bolt '󱐋', # mdi-lightning-bolt
'󰴾' # mdi-transmission-tower '󰴾', # mdi-transmission-tower
'󰚥', # mdi-power-plug
'󱈹', # mdi-desk
'󰔂' # mdi-television
] ]
- file: 'fonts/materialdesignicons-webfont.ttf' - file: 'fonts/materialdesignicons-webfont.ttf'
@ -598,8 +601,6 @@ display:
it.print(10 + offsetX, 10 + offsetY, id(sensor_unit), "Serverraum"); it.print(10 + offsetX, 10 + offsetY, id(sensor_unit), "Serverraum");
it.filled_rectangle(125 + offsetX, 21 + offsetY, 110, 3); it.filled_rectangle(125 + offsetX, 21 + offsetY, 110, 3);
/* it.print(227 + offsetX, 75 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰔏"); // thermometer
* it.print(227+ offsetX, 115 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰖎"); // water percent */
it.print(227 + offsetX, 110 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰔏"); // thermometer it.print(227 + offsetX, 110 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰔏"); // thermometer
if(serverroom_temp > -100 && serverroom_temp < 100) { if(serverroom_temp > -100 && serverroom_temp < 100) {
@ -618,23 +619,23 @@ display:
int x = 630; int x = 630;
int y = 384; int y = 384;
if (id(wifisignal).state >= -50) { if (id(wifisignal).state >= -50) {
//Excellent // Excellent
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤨"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤨");
ESP_LOGI("WiFi", "Excellent"); ESP_LOGI("WiFi", "Excellent");
} else if (id(wifisignal).state >= -60) { } else if (id(wifisignal).state >= -60) {
//Good // Good
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤥"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤥");
ESP_LOGI("WiFi", "Good"); ESP_LOGI("WiFi", "Good");
} else if (id(wifisignal).state >= -75) { } else if (id(wifisignal).state >= -75) {
//Fair // Fair
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤢"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤢");
ESP_LOGI("WiFi", "Fair"); ESP_LOGI("WiFi", "Fair");
} else if (id(wifisignal).state >= -100) { } else if (id(wifisignal).state >= -100) {
//Weak // Weak
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤟"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤟");
ESP_LOGI("WiFi", "Weak"); ESP_LOGI("WiFi", "Weak");
} else { } else {
//Unlikely working signal // Unlikely working signal
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤫"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤫");
ESP_LOGI("WiFi", "Unlikely"); ESP_LOGI("WiFi", "Unlikely");
} }
@ -767,7 +768,7 @@ display:
it.print(10 + offsetX, 10 + offsetY, id(sensor_unit), "Serverraum"); it.print(10 + offsetX, 10 + offsetY, id(sensor_unit), "Serverraum");
it.filled_rectangle(125 + offsetX, 21 + offsetY, 110, 3); it.filled_rectangle(125 + offsetX, 21 + offsetY, 110, 3);
it.print(227 + offsetX, 110 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󱐋"); // lightning-bolt it.print(227 + offsetX, 110 + offsetY, id(mdi_small), TextAlign::BASELINE_CENTER, "󰚥"); // power-plug
if(serverroom_power > 0 && serverroom_power < 999) { if(serverroom_power > 0 && serverroom_power < 999) {
it.printf(207 + offsetX, 110 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "W"); it.printf(207 + offsetX, 110 + offsetY, id(sub_sensor_font), TextAlign::BASELINE_RIGHT, "W");
@ -785,23 +786,23 @@ display:
int x = 630; int x = 630;
int y = 384; int y = 384;
if (id(wifisignal).state >= -50) { if (id(wifisignal).state >= -50) {
//Excellent // Excellent
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤨"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤨");
ESP_LOGI("WiFi", "Excellent"); ESP_LOGI("WiFi", "Excellent");
} else if (id(wifisignal).state >= -60) { } else if (id(wifisignal).state >= -60) {
//Good // Good
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤥"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤥");
ESP_LOGI("WiFi", "Good"); ESP_LOGI("WiFi", "Good");
} else if (id(wifisignal).state >= -75) { } else if (id(wifisignal).state >= -75) {
//Fair // Fair
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤢"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤢");
ESP_LOGI("WiFi", "Fair"); ESP_LOGI("WiFi", "Fair");
} else if (id(wifisignal).state >= -100) { } else if (id(wifisignal).state >= -100) {
//Weak // Weak
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤟"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤟");
ESP_LOGI("WiFi", "Weak"); ESP_LOGI("WiFi", "Weak");
} else { } else {
//Unlikely working signal // Unlikely working signal
it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤫"); it.print(x, y, id(mdi_wifi), TextAlign::BASELINE_CENTER, "󰤫");
ESP_LOGI("WiFi", "Unlikely"); ESP_LOGI("WiFi", "Unlikely");
} }