bunch of shit clang-tidy and clion made me do
This commit is contained in:
11
src/gpu.cpp
11
src/gpu.cpp
@@ -50,11 +50,10 @@ void updateFromMetrics(gpuSensors* g) {
|
||||
char raw_metrics[max_metrics_length];
|
||||
if (!utils::readFile(g->hwmon + rel_metrics_path, raw_metrics, sizeof(raw_metrics))) return;
|
||||
|
||||
auto header = reinterpret_cast<metrics::metrics_table_header*>(raw_metrics);
|
||||
switch (header->format_revision * 10 + header->content_revision) {
|
||||
switch (const auto header = reinterpret_cast<metrics::metrics_table_header*>(raw_metrics); header->format_revision * 10 + header->content_revision) {
|
||||
/* rx5700xt, rx7800xt */
|
||||
case 13: {
|
||||
auto metrics = reinterpret_cast<metrics::gpu_metrics_v1_3*>(raw_metrics);
|
||||
const auto metrics = reinterpret_cast<metrics::gpu_metrics_v1_3*>(raw_metrics);
|
||||
g->usage_core = metrics->average_gfx_activity;
|
||||
g->usage_umc = metrics->average_umc_activity;
|
||||
g->usage_media = metrics->average_mm_activity;
|
||||
@@ -81,7 +80,7 @@ void updateFromMetrics(gpuSensors* g) {
|
||||
|
||||
/* ryzen 5 5600g */
|
||||
case 22: {
|
||||
auto metrics = reinterpret_cast<metrics::gpu_metrics_v2_2*>(raw_metrics);
|
||||
const auto metrics = reinterpret_cast<metrics::gpu_metrics_v2_2*>(raw_metrics);
|
||||
g->temp_edge = metrics->temperature_gfx / 100;
|
||||
break;
|
||||
}
|
||||
@@ -99,9 +98,9 @@ void update(gpuSensors* g) {
|
||||
fillMissingMetrics(g);
|
||||
|
||||
if (g->hasGpuMetrics)
|
||||
gpu::updateFromMetrics(g);
|
||||
updateFromMetrics(g);
|
||||
else
|
||||
gpu::updateFromFs(g);
|
||||
updateFromFs(g);
|
||||
|
||||
if (g->fan_speed > 9999) g->fan_speed = 9999; // sanity check fan speed
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user