From 7868add6389f76f54e8243e926c3f653a0c41760 Mon Sep 17 00:00:00 2001
From: Arity-T <tish.mainmail@gmail.com>
Date: Tue, 11 Feb 2025 17:18:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=80=D0=B5=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D1=82=D0=B5=D0=BC=D0=BF=D0=B5=D1=80=D0=B0=D1=82=D1=83?=
 =?UTF-8?q?=D1=80=D1=8B=20=D0=B8=20=D0=B2=D0=BB=D0=B0=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/spbstu/telematics/java/Controller.java | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/lab3/src/main/java/ru/spbstu/telematics/java/Controller.java b/lab3/src/main/java/ru/spbstu/telematics/java/Controller.java
index da9e727..54b5f09 100644
--- a/lab3/src/main/java/ru/spbstu/telematics/java/Controller.java
+++ b/lab3/src/main/java/ru/spbstu/telematics/java/Controller.java
@@ -45,43 +45,41 @@ public class Controller implements Runnable {
         log("Started sensor, heater and fan threads");
 
         while (!Thread.interrupted()) {
-            double currentTemperature = sensor.getTemperature();
+            double realTemperature = room.getTemperature();
+            double sensorTemperature = sensor.getTemperature();
             double desiredTemperature = settings.getTemperature();
 
-            if (currentTemperature < desiredTemperature * (1 - tolerance)) {
+            if (sensorTemperature < desiredTemperature * (1 - tolerance)) {
                 if (!heater.isOn()) {
                     log(String.format(
-                            "Turning heater ON (current - %.2fC°, desired %.2fC°)",
-                            currentTemperature,
-                            desiredTemperature));
+                            "Turning heater ON (real - %.2fC°, sensor - %.2fC°, desired %.2fC°)",
+                            realTemperature, sensorTemperature, desiredTemperature));
                     heater.turnOn();
                 }
             } else {
                 if (heater.isOn()) {
                     log(String.format(
-                            "Turning heater OFF (current - %.2fC°, desired %.2fC°)",
-                            currentTemperature,
-                            desiredTemperature));
+                            "Turning heater OFF (real - %.2fC°, sensor - %.2fC°, desired %.2fC°)",
+                            realTemperature, sensorTemperature, desiredTemperature));
                     heater.turnOff();
                 }
             }
 
-            double currentHumidity = sensor.getHumidity();
+            double realHumidity = room.getHumidity();
+            double sensorHumidity = sensor.getHumidity();
             double desiredHumidity = settings.getHumidity();
-            if (currentHumidity > desiredHumidity * (1 + tolerance)) {
+            if (sensorHumidity > desiredHumidity * (1 + tolerance)) {
                 if (!fan.isOn()) {
                     log(String.format(
-                            "Turning fan ON (current - %.2f%%, desired %.2f%%)",
-                            currentHumidity * 100,
-                            desiredHumidity * 100));
+                            "Turning fan ON (real - %.2f%%, sensor - %.2f%%, desired %.2f%%)",
+                            realHumidity * 100, sensorHumidity * 100, desiredHumidity * 100));
                     fan.turnOn();
                 }
             } else {
                 if (fan.isOn()) {
                     log(String.format(
-                            "Turning fan OFF (current - %.2f%%, desired %.2f%%)",
-                            currentHumidity * 100,
-                            desiredHumidity * 100));
+                            "Turning fan OFF (real - %.2f%%, sensor - %.2f%%, desired %.2f%%)",
+                            realHumidity * 100, sensorHumidity * 100, desiredHumidity * 100));
                     fan.turnOff();
                 }
             }