Merge remote-tracking branch 'origin/main'

# Conflicts:
#	include/LCDDisplay.hpp
#	src/LCDDisplay.cpp
This commit is contained in:
2026-01-15 00:24:55 +01:00
6 changed files with 8 additions and 7 deletions

View File

@@ -19,7 +19,7 @@ int detect(cpuSensors* target, const std::string& pci) {
return -1;
}
target->module = utils::fileExists(target->hwmon + "/in1_input") ? zenpower : k10temp; // idk if this is reliable, we're trying to avoid just reading the name
target->module = utils::fileExists(target->hwmon + "/in1_input") ? zenpower : k10temp; // idk if this is reliable, we're trying to avoid just reading the name
target->num_cores = std::thread::hardware_concurrency();
applog(LOG::INF, "Detected {} cores, module enum #{} in path \"{}\"", target->num_cores, static_cast<uint8_t>(target->module), target->hwmon);
return 0;