diff --git a/Kit/module/widget.swift b/Kit/module/widget.swift index 703efd56..4443fa3f 100644 --- a/Kit/module/widget.swift +++ b/Kit/module/widget.swift @@ -83,7 +83,7 @@ public enum widget_t: String { case is BarChart: if module == "GPU" || module == "RAM" || module == "Disk" || module == "Battery" { width = 11 + (Constants.Widget.margin.x*2) - } else if module == "Fans" { + } else if module == "Sensors" { width = 22 + (Constants.Widget.margin.x*2) } else if module == "CPU" { width = 30 + (Constants.Widget.margin.x*2) diff --git a/Modules/Sensors/config.plist b/Modules/Sensors/config.plist index f8da317d..682f00c1 100644 --- a/Modules/Sensors/config.plist +++ b/Modules/Sensors/config.plist @@ -27,6 +27,24 @@ Order 1 + bar_chart + + Default + + Preview + + Value + 0.36,0.3 + Color + + + Unsupported colors + + pressure + + Order + 2 + diff --git a/Modules/Sensors/main.swift b/Modules/Sensors/main.swift index 55c38ef7..57e6fb32 100644 --- a/Modules/Sensors/main.swift +++ b/Modules/Sensors/main.swift @@ -67,9 +67,14 @@ public class Sensors: Module { } var list: [KeyValue_t] = [] + var flatList: [[ColorValue]] = [] + value.forEach { (s: Sensor_p) in if s.state { list.append(KeyValue_t(key: s.key, value: s.formattedMiniValue)) + if let f = s as? Fan { + flatList.append([ColorValue(((f.value*100)/f.maxSpeed)/100)]) + } } } @@ -78,6 +83,7 @@ public class Sensors: Module { self.widgets.filter{ $0.isActive }.forEach { (w: Widget) in switch w.item { case let widget as SensorsWidget: widget.setValues(list) + case let widget as BarChart: widget.setValue(flatList) default: break } } diff --git a/Modules/Sensors/popup.swift b/Modules/Sensors/popup.swift index e68605e0..77dccea9 100644 --- a/Modules/Sensors/popup.swift +++ b/Modules/Sensors/popup.swift @@ -597,7 +597,7 @@ internal class FanView: NSStackView { var speed = "" if value.value != 1 { if self.fan.maxSpeed == 1 || self.fan.maxSpeed == 0 { - speed = "\(Int(value.value))RPM" + speed = "\(Int(value.value)) RPM" } else { speed = "\((100*Int(value.value)) / Int(self.fan.maxSpeed))%" }