From 7d15cd58d89b68bd9835b693193c4a653b2f083d Mon Sep 17 00:00:00 2001
From: feeling <laurent.deleers@gmail.com>
Date: Mon, 15 Feb 2021 09:51:36 +0100
Subject: [PATCH] 1

---
 src/FanStateService.cpp | 10 ++++++----
 src/FanStateService.h   | 15 ++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/FanStateService.cpp b/src/FanStateService.cpp
index b40ce5d..0b4386c 100644
--- a/src/FanStateService.cpp
+++ b/src/FanStateService.cpp
@@ -61,13 +61,15 @@ void FanStateService::save() {
 void FanStateService::compute() {
   unsigned long period = millis() - this->lastpoll;
   this->sensor_intake.requestTemperatures();
-  this->Tin  = this->sensor_intake.getTempCByIndex(0);
+  _state.Tin  = this->sensor_intake.getTempCByIndex(0);
   
-  this->Tout = this->sensor_intake.getTempCByIndex(1);
-  this->RPM = 60000/period*this->ROT/2;  // Hall sensor = 2 tick per rotation
-  Serial.print("Intake: " + (String) this->Tin + " - " + (String) this->Tout + " [ "+ (String) this->RPM + " RPM ]\n");
+  _state.Tout = this->sensor_intake.getTempCByIndex(1);
+  _state.RPM = 60000/period*this->ROT/2;  // Hall sensor = 2 tick per rotation
+  Serial.print("Intake: " + (String) _state.Tin + " - " + (String) _state.Tout + " [ "+ (String) _state.RPM + " RPM ]\n");
   this->ROT=0;
   
   this->_mqttPubSub.setPubTopic("testmqtt1/state");
+
+  
   
 }
\ No newline at end of file
diff --git a/src/FanStateService.h b/src/FanStateService.h
index a7b5a81..dd801eb 100644
--- a/src/FanStateService.h
+++ b/src/FanStateService.h
@@ -45,6 +45,10 @@ class FanState {
   int  thresLow;
   int  thresHigh;
 
+  float Tin;
+  float Tout;
+  float RPM;
+
   int   OneWireGPIO;
   float sensorInTemp;
   float sensorOutTemp;
@@ -103,9 +107,9 @@ class FanState {
 
   static void haRead(FanState& settings, JsonObject& root) {
     root["state"]   = settings.fanStatus ? ON_STATE : OFF_STATE;
-    root["Tinput"]  = settings.sensorInTemp;
-    root["Toutput"] = settings.sensorOutTemp;
-    root["RPM"]     = settings.fanSpeed;
+    root["Tinput"]  = settings.Tin;
+    root["Toutput"] = settings.Tout;
+    root["RPM"]     = settings.RPM;
     String s = root["state"];
     Serial.println(" ** Fan haRead [" + s + "]");
   }
@@ -133,13 +137,10 @@ class FanState {
 class FanStateService : public StatefulService<FanState> {
  public:
   unsigned long lastpoll;
-  float Tin;
-  float Tout;
   OneWire oneWire1;
   DallasTemperature sensor_intake;
-  float RPM;
+
   unsigned int ROT;
-  
 
   FanStateService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager, AsyncMqttClient* mqttClient, FanMqttSettingsService* fanMQTTSettingsService);
   void begin();