make it more or less work with 'warning_level=everything'
This commit is contained in:
15
src/main.c
15
src/main.c
@@ -22,13 +22,13 @@ static constexpr char cpu_pcidev[] = "0000:00:18.3";
|
||||
static constexpr char gpu_pcidev[] = "0000:0a:00.0";
|
||||
|
||||
struct control_t {
|
||||
atomic_bool g_running;
|
||||
pthread_mutex_t sensors_mtx;
|
||||
pthread_cond_t sensors_ready;
|
||||
atomic_bool g_running;
|
||||
uint8_t _padding[7];
|
||||
} control;
|
||||
|
||||
struct sensors_t { // NOLINT yes it is
|
||||
struct time_date_t td;
|
||||
struct memory_t ram;
|
||||
struct disk_t home;
|
||||
struct disk_t gry;
|
||||
@@ -37,6 +37,7 @@ struct sensors_t { // NOLINT yes it is
|
||||
struct cpu_sensors_t cpu;
|
||||
struct gpu_sensors_t gpu;
|
||||
struct aio_t aio;
|
||||
struct time_date_t td;
|
||||
double loadavg[3];
|
||||
};
|
||||
|
||||
@@ -139,23 +140,23 @@ static void *display_thread(void *arg) {
|
||||
|
||||
lcd_writef(&lcd, 0, 1, "%d/%d%c", sensors->cpu.tctl, sensors->cpu.tccd1, 0);
|
||||
lcd_writef(&lcd, 7, 1, "%s", P_BYTES(sensors->ram.used, 0));
|
||||
lcd_writef(&lcd, 13, 1, "%.1f%c", sensors->aio.water_temp, 0);
|
||||
lcd_writef(&lcd, 13, 1, "%.1f%c", (double)sensors->aio.water_temp, 0);
|
||||
lcd_writef(&lcd, 18, 1, "%3d%c", sensors->sys.t_sensor, 0);
|
||||
lcd_writef(&lcd, 28, 1, "%4s%c", gpudelta, 0);
|
||||
lcd_writef(&lcd, 25 - gpu_pos, 1, "%6s", P_BYTES(sensors->gpu.vram_used, 1));
|
||||
lcd_writef(&lcd, 34, 1, "%d/%d%c", sensors->gpu.temp_edge, sensors->gpu.temp_hotspot, 0);
|
||||
|
||||
lcd_writef(&lcd, 0, 2, "%.0fW", sensors->cpu.ptotal);
|
||||
lcd_writef(&lcd, 0, 2, "%.0fW", (double)sensors->cpu.ptotal);
|
||||
lcd_writef(&lcd, 5, 2, "%dR", avg_fan_speed);
|
||||
lcd_writef(&lcd, 12, 2, "%5s%c", P_BYTES(sensors->net.upload, 1), 3);
|
||||
lcd_writef(&lcd, 19, 2, "%c%s", 4, P_BYTES(sensors->net.download, 1));
|
||||
lcd_writef(&lcd, 26, 2, "%4dR", sensors->gpu.fan_speed);
|
||||
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, 0, 3, "%uMHz", sensors->cpu.avg_freq);
|
||||
lcd_writef(&lcd, 8, 3, "%4dR-%c", sensors->aio.pump_speed, modes[sensors->aio.pump_mode]);
|
||||
lcd_writef(&lcd, 21, 3, "%12s", gpuclock);
|
||||
lcd_writef(&lcd, 34, 3, "%.3fV", sensors->gpu.vcore);
|
||||
lcd_writef(&lcd, 34, 3, "%.3fV", (double)sensors->gpu.vcore);
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&control.sensors_mtx); // unlock sensor struct
|
||||
@@ -173,7 +174,7 @@ static void *display_thread(void *arg) {
|
||||
|
||||
int main(void) {
|
||||
applog(LOG_START, "linuxSmartie starting");
|
||||
applog(LOG_DBG, "Compiled on %s %s with %s", __DATE__, __TIME__, C_STD);
|
||||
applog(LOG_DBG, "Compiled with %s", C_STD);
|
||||
|
||||
/* see if another instance is up, quit if it is */
|
||||
if (get_instance_lock() < 0)
|
||||
|
||||
Reference in New Issue
Block a user