Merge remote-tracking branch 'origin/main'
# Conflicts: # include/LCDDisplay.hpp # src/LCDDisplay.cpp
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user