From 869e5896c9e9a72747c63e889847f8011118c704 Mon Sep 17 00:00:00 2001 From: Drath Vader Date: Thu, 27 Nov 2025 20:22:09 +0100 Subject: [PATCH] use the just enum --- main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index 60d5502..b6a9221 100644 --- a/main.cpp +++ b/main.cpp @@ -127,24 +127,24 @@ void displayThread(std::stop_token st, Sensors* s) { cpu_fan /= 2; // write to display buffer - lcd.writeBuf(0, 0, pad(s->td.date, 11, true) + " " + s->td.time + lcd.bar(7, s->gpu.usage_core / 100.0)); + lcd.writeBuf(0, 0, pad(s->td.date, 11, JUST::LEFT) + " " + s->td.time + lcd.bar(7, s->gpu.usage_core / 100.0)); lcd.writeBuf(0, 26, pNum(s->avg[0], s->avg[0] > 10 ? 1 : 2)); lcd.writeBuf(0, 31, pNum(s->avg[1], s->avg[1] > 10 ? 1 : 2)); lcd.writeBuf(0, 36, pNum(s->avg[2], s->avg[2] > 10 ? 1 : 2)); - lcd.writeBuf(1, 0, pad(std::to_string(s->cpu.tctl) + "/" + std::to_string(s->cpu.tccd1) + lcd.cc(0), 8, true)); - lcd.writeBuf(1, 8, pad(pBytes(s->ram.used, true) + "B", 7, true)); - lcd.writeBuf(1, 30 - gpu_temps.size(), pad(pBytes(s->gpu.vram_used) + "B", 7)); + lcd.writeBuf(1, 0, pad(std::to_string(s->cpu.tctl) + "/" + std::to_string(s->cpu.tccd1) + lcd.cc(0), 8, JUST::LEFT)); + lcd.writeBuf(1, 8, pad(pBytes(s->ram.used, true), 7, JUST::LEFT)); + lcd.writeBuf(1, 30 - gpu_temps.size(), pad(pBytes(s->gpu.vram_used), 7)); lcd.writeBuf(1, 39 - gpu_temps.size(), gpu_temps + lcd.cc(0)); lcd.writeBuf(1, 15, std::to_string(s->sys.t_sensor) + lcd.cc(0)); // t_sensor temp - lcd.writeBuf(2, 0, pad(pNum(s->cpu.ptotal, 1) + "W", 8, true)); - lcd.writeBuf(2, s->cpu.ptotal < 100 ? 6 : 7, std::to_string(cpu_fan) + "R"); // avg fan speed + lcd.writeBuf(2, 0, pad(std::to_string((int)s->cpu.ptotal) + "W", 8, JUST::LEFT)); + lcd.writeBuf(2, s->cpu.ptotal < 100 ? 4 : 5, std::to_string(cpu_fan) + "R"); // avg fan speed lcd.writeBuf(2, 16, pad(pNum(s->hass_state) + "W", 4)); lcd.writeBuf(2, 26, pad(std::to_string(s->gpu.fan_speed) + "R", 5)); lcd.writeBuf(2, 31, pad(std::to_string(s->gpu.power_avg) + "/" + std::to_string(s->gpu.power_cap) + "W", 9)); - lcd.writeBuf(3, 0, pad(pNum(s->cpu.vcore, 2) + "V", 7, true)); + lcd.writeBuf(3, 0, pad(pNum(s->cpu.vcore, 2) + "V", 7, JUST::LEFT)); lcd.writeBuf(3, 6, std::to_string(s->cpu.avg_freq) + "MHz"); lcd.writeBuf(3, 14, lcd.cc(2) + pad(pBytes(s->home.usage.free), 5)); lcd.writeBuf(3, 21, pad(std::to_string(s->gpu.clock_core) + "/" + std::to_string(s->gpu.clock_mem) + "MHz ", 13));