diff --git a/src/main.c b/src/main.c index 12a1b91..0b4aa25 100644 --- a/src/main.c +++ b/src/main.c @@ -104,10 +104,13 @@ static void *display_thread(void *arg) { /* setup custom chars */ lcd_set_custom_char(&lcd, 0, &(lcd_glyph_t){16, 6, 9, 8, 8, 9, 6, 0}); // celcius - lcd_set_custom_char(&lcd, 1, &(lcd_glyph_t){0, 0, 4, 10, 10, 17, 31, 0}); // delta + lcd_set_custom_char(&lcd, 1, &(lcd_glyph_t){0, 0, 4, 10, 10, 17, 31, 0}); // delta lcd_set_custom_char(&lcd, 2, &(lcd_glyph_t){0, 0, 8, 21, 21, 2, 0, 0}); // home (tilde) lcd_set_custom_char(&lcd, 3, &(lcd_glyph_t){4, 14, 21, 4, 4, 4, 0}); // up arrow lcd_set_custom_char(&lcd, 4, &(lcd_glyph_t){4, 4, 4, 21, 14, 4, 0}); // down arrow + lcd_set_custom_char(&lcd, 5, &(lcd_glyph_t){0, 0, 15, 21, 21, 17, 15, 0}); // home (tilde) + + const char modes[] = "QBP"; /* main display loop */ applog(LOG_START, "reached display main loop"); @@ -130,7 +133,9 @@ static void *display_thread(void *arg) { char gpuclock[16]; snprintf(gpuclock, sizeof(gpuclock), "%d/%dMHz", sensors->gpu.clock_core, sensors->gpu.clock_mem); - lcd_writef(&lcd, 0, 0, "%s %s%c", sensors->td.date, sensors->td.time, lcd_bar(&lcd, 5, sensors->gpu.usage_core / 100.0)); + lcd_writef(&lcd, 0, 0, "%c%s", 2, P_BYTES(sensors->home.usage.free, 1)); + lcd_writef(&lcd, 7, 0, "%c%s", 5, P_BYTES(sensors->gry.usage.free, 1)); + lcd_writef(&lcd, 15, 0, "%s%c", sensors->td.time, lcd_bar(&lcd, 5, sensors->gpu.usage_core / 100.0)); lcd_writef(&lcd, 26, 0, "%s %s %s", P_NUM(sensors->loadavg[0]), P_NUM(sensors->loadavg[1]), P_NUM(sensors->loadavg[2])); lcd_writef(&lcd, 0, 1, "%d/%d%c", sensors->cpu.tctl, sensors->cpu.tccd1, 0); @@ -148,8 +153,7 @@ static void *display_thread(void *arg) { lcd_writef(&lcd, 32, 2, "%3d/%3dW", sensors->gpu.power_avg, sensors->gpu.power_cap); lcd_writef(&lcd, 0, 3, "%dMHz", sensors->cpu.avg_freq); - lcd_writef(&lcd, 8, 3, "%c%luG", 2, sensors->home.usage.free / 1024 / 1024 / 1024); - lcd_writef(&lcd, 15, 3, "%c%luG", 'g', sensors->gry.usage.free / 1024 / 1024 / 1024); + lcd_writef(&lcd, 8, 3, "%4dR-%c", sensors->aio.pump_speed, modes[sensors->aio.mode]); lcd_writef(&lcd, 21, 3, "%12s", gpuclock); lcd_writef(&lcd, 34, 3, "%.3fV", sensors->gpu.vcore); }