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

Merge pull request #683 from phosit/master 

Add kelvin-scale
pull/684/head
Alex 2020-04-27 08:46:00 +02:00 committed by GitHub
parent e01a081f2f 7b18bfd1a7
commit 64f10f8f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/temperature.hpp
View File

@ -14,7 +14,7 @@ class Temperature : public ALabel {
auto update() -> void; auto update() -> void;
private: private:
std::tuple<uint16_t, uint16_t> getTemperature(); float getTemperature();
bool isCritical(uint16_t); bool isCritical(uint16_t);
std::string file_path_; std::string file_path_;

4
man/waybar-temperature.5.scd
View File

@ -44,7 +44,7 @@ Addressed by *temperature*
*format*: ++ *format*: ++
typeof: string ++ typeof: string ++
default: {temperatureC}°C ++ default: {temperatureC}°C ++
The format (Celsius/Fahrenheit) in which the temperature should be displayed. The format (Celsius/Fahrenheit/Kelvin) in which the temperature should be displayed.
*format-icons*: ++ *format-icons*: ++
typeof: array ++ typeof: array ++
@ -97,6 +97,8 @@ Addressed by *temperature*
*{temperatureF}*: Temperature in Fahrenheit. *{temperatureF}*: Temperature in Fahrenheit.
*{temperatureK}*: Temperature in Kelvin.
# EXAMPLES # EXAMPLES
``` ```

12
src/modules/temperature.cpp
View File

@ -22,7 +22,10 @@ waybar::modules::Temperature::Temperature(const std::string& id, const Json::Val
} }
auto waybar::modules::Temperature::update() -> void { auto waybar::modules::Temperature::update() -> void {
auto [temperature_c, temperature_f] = getTemperature(); auto temperature = getTemperature();
uint16_t temperature_c = std::round(temperature);
uint16_t temperature_f = std::round(temperature * 1.8 + 32);
uint16_t temperature_k = std::round(temperature + 273.15);
auto critical = isCritical(temperature_c); auto critical = isCritical(temperature_c);
auto format = format_; auto format = format_;
if (critical) { if (critical) {
@ -35,12 +38,13 @@ auto waybar::modules::Temperature::update() -> void {
label_.set_markup(fmt::format(format, label_.set_markup(fmt::format(format,
fmt::arg("temperatureC", temperature_c), fmt::arg("temperatureC", temperature_c),
fmt::arg("temperatureF", temperature_f), fmt::arg("temperatureF", temperature_f),
fmt::arg("temperatureK", temperature_k),
fmt::arg("icon", getIcon(temperature_c, "", max_temp)))); fmt::arg("icon", getIcon(temperature_c, "", max_temp))));
// Call parent update // Call parent update
ALabel::update(); ALabel::update();
} }
std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() { float waybar::modules::Temperature::getTemperature() {
std::ifstream temp(file_path_); std::ifstream temp(file_path_);
if (!temp.is_open()) { if (!temp.is_open()) {
throw std::runtime_error("Can't open " + file_path_); throw std::runtime_error("Can't open " + file_path_);
@ -51,9 +55,7 @@ std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() {
} }
temp.close(); temp.close();
auto temperature_c = std::strtol(line.c_str(), nullptr, 10) / 1000.0; auto temperature_c = std::strtol(line.c_str(), nullptr, 10) / 1000.0;
auto temperature_f = temperature_c * 1.8 + 32; return temperature_c;
std::tuple<uint16_t, uint16_t> temperatures(std::round(temperature_c), std::round(temperature_f));
return temperatures;
} }
bool waybar::modules::Temperature::isCritical(uint16_t temperature_c) { bool waybar::modules::Temperature::isCritical(uint16_t temperature_c) {