From 2145816e1efbb07063c29b6d1d705e8979dcb7ec Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Sat, 28 Nov 2020 21:18:10 +0100
Subject: [PATCH] - add Fans to the Sensors module (#197)

---
 Modules/Sensors/readers.swift |  2 +-
 Modules/Sensors/values.swift  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Modules/Sensors/readers.swift b/Modules/Sensors/readers.swift
index b6c23244..b291a94f 100644
--- a/Modules/Sensors/readers.swift
+++ b/Modules/Sensors/readers.swift
@@ -26,7 +26,7 @@ internal class SensorsReader: Reader<[Sensor_t]> {
         
         available = available.filter({ (key: String) -> Bool in
             switch key.prefix(1) {
-            case "T", "V", "P":
+            case "T", "V", "P", "F":
                 if SensorsList.firstIndex(where: { $0.key == key }) == nil {
                     os_log(.debug, "Missing sensor key %s on the list", key)
                 }
diff --git a/Modules/Sensors/values.swift b/Modules/Sensors/values.swift
index 50e13394..83f91732 100644
--- a/Modules/Sensors/values.swift
+++ b/Modules/Sensors/values.swift
@@ -24,6 +24,7 @@ enum SensorType: SensorType_t {
     case Temperature = "Temperature"
     case Voltage = "Voltage"
     case Power = "Power"
+    case Fan = "Fan"
 }
 
 struct Sensor_t {
@@ -43,6 +44,8 @@ struct Sensor_t {
                 return "V"
             case SensorType.Power.rawValue:
                 return "W"
+            case SensorType.Fan.rawValue:
+                return "RPM"
             default: return ""
             }
         }
@@ -59,6 +62,8 @@ struct Sensor_t {
             case SensorType.Power.rawValue:
                 let val = value >= 100 ? "\(Int(value))" : String(format: "%.2f", value)
                 return "\(val)\(unit)"
+            case SensorType.Fan.rawValue:
+                return "\(Int(value)) \(unit)"
             default: return String(format: "%.2f", value)
             }
         }
@@ -74,6 +79,8 @@ struct Sensor_t {
             case SensorType.Power.rawValue:
                 let val = value >= 100 ? "\(Int(value))" : String(format: "%.1f", value)
                 return "\(val)\(unit)"
+            case SensorType.Fan.rawValue:
+                return "\(Int(value)) \(unit)"
             default: return String(format: "%.1f", value)
             }
         }
@@ -195,4 +202,16 @@ let SensorsList: [Sensor_t] = [
     Sensor_t(key: "PPBR", name: "Battery", group: SensorGroup.Sensor.rawValue, type: SensorType.Power.rawValue),
     Sensor_t(key: "PDTR", name: "DC In", group: SensorGroup.Sensor.rawValue, type: SensorType.Power.rawValue),
     Sensor_t(key: "PSTR", name: "System total", group: SensorGroup.Sensor.rawValue, type: SensorType.Power.rawValue),
+    
+     /// Fans
+    Sensor_t(key: "F0Ac", name: "Fan #0", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F1Ac", name: "Fan #1", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F2Ac", name: "Fan #2", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F3Ac", name: "Fan #3", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F4Ac", name: "Fan #4", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F5Ac", name: "Fan #5", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F6Ac", name: "Fan #6", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F7Ac", name: "Fan #7", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F8Ac", name: "Fan #8", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
+    Sensor_t(key: "F9Ac", name: "Fan #9", group: SensorGroup.Sensor.rawValue, type: SensorType.Fan.rawValue),
 ]