blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[FreeBSD] Use thermal-zone 

The zone was hardcoded in #1702.
This commit allows to use the "thermal-zone"
variable.

Follow up #1702
This commit is contained in:
Loïc Bartoletti 2022-10-04 07:29:16 +02:00
parent 5da45ece9d
commit c3e91cd228
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/temperature.cpp
View File

@ -81,8 +81,11 @@ float waybar::modules::Temperature::getTemperature() {
int temp; int temp;
size_t size = sizeof temp; size_t size = sizeof temp;
if (sysctlbyname("hw.acpi.thermal.tz0.temperature", &temp, &size, NULL, 0) != 0) { auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
throw std::runtime_error("sysctl hw.acpi.thermal.tz0.temperature or dev.cpu.0.temperature failed"); auto sysctl_thermal = fmt::format("hw.acpi.thermal.tz{}.temperature", zone);
if (sysctlbyname(sysctl_thermal.c_str(), &temp, &size, NULL, 0) != 0) {
throw std::runtime_error(fmt::format("sysctl {} failed",sysctl_thermal));
} }
auto temperature_c = ((float)temp-2732)/10; auto temperature_c = ((float)temp-2732)/10;
return temperature_c; return temperature_c;