From 8624f652f23f2b9975eed7a6b1ae43b7e2304fee Mon Sep 17 00:00:00 2001
From: 033zhek <033zhek@gmail.com>
Date: Sun, 8 Oct 2023 08:55:50 +0300
Subject: [PATCH] changed temperature sensor

---
 cybergarden-sensor/lib/Sensors/Sensors.cpp |  9 ++---
 cybergarden-sensor/lib/Sensors/Sensors.h   | 10 +-----
 cybergarden-sensor/src/main.cpp            | 38 +++++++++++++++++++---
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/cybergarden-sensor/lib/Sensors/Sensors.cpp b/cybergarden-sensor/lib/Sensors/Sensors.cpp
index 904a4b1..9fd7591 100644
--- a/cybergarden-sensor/lib/Sensors/Sensors.cpp
+++ b/cybergarden-sensor/lib/Sensors/Sensors.cpp
@@ -1,15 +1,12 @@
 #include <Sensors.h>
 
 
-float Sensor::temperatureSensor(){
-      tempSens->requestTemperatures();
-      while (!tempSens->isConversionComplete());
-      float temp = tempSens->getTempCByIndex(1);
-      return temp;
+float Sensor::temperatureSensor(){ 
+      return analogRead(TEMP_SENS); 
 }
 
 float Sensor::humiditySensor(){
-      float h = dht->readHumidity(); 
+      float h = dht->readHumidity();
       if (isnan(h)) {
             return -1;
             }
diff --git a/cybergarden-sensor/lib/Sensors/Sensors.h b/cybergarden-sensor/lib/Sensors/Sensors.h
index 6faeec6..446d320 100644
--- a/cybergarden-sensor/lib/Sensors/Sensors.h
+++ b/cybergarden-sensor/lib/Sensors/Sensors.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Arduino.h"
-#include "DallasTemperature.h"
 #include "DHT.h"
+#include "math.h"
 
 ///////////////////////////////////////////////////////
 //                    Pins Definitions
@@ -14,9 +14,6 @@
 class Sensor{
 
   private:
-        // KY-001 
-        OneWire *oneWire;
-        DallasTemperature *tempSens;
         //KY-015 
         DHT *dht;
         
@@ -28,12 +25,7 @@ class Sensor{
 
 Sensor()
   {
-    oneWire = new OneWire(TEMP_SENS);
-    tempSens = new DallasTemperature(oneWire);
     dht = new DHT(HUM_SENS, DHT11);
-    tempSens->begin();
     dht->begin();
   }
-
-
 };
diff --git a/cybergarden-sensor/src/main.cpp b/cybergarden-sensor/src/main.cpp
index e23b2c1..d3d579f 100644
--- a/cybergarden-sensor/src/main.cpp
+++ b/cybergarden-sensor/src/main.cpp
@@ -19,10 +19,38 @@ uint16_t getMockSensorData() {
 }
 
 void loop() {
-  MeasureData measureData;
-  measureData.sensor_id = 0xA5;
-  measureData.sensor_type = 0x01;
-  measureData.payload = getMockSensorData();
+  MeasureData measureData_temp;
+  measureData_temp.sensor_id = 0xA5;
+  measureData_temp.sensor_type = 0x01;
+  measureData_temp.payload = sensors.temperatureSensor();
+  transmissionModule.transmit(measureData_temp);
+
+  delay(100);
+
+  MeasureData measureData_hum;
+  measureData_hum.sensor_id = 0xA5;
+  measureData_hum.sensor_type = 0x02;
+  measureData_hum.payload = sensors.humiditySensor();
+  transmissionModule.transmit(measureData_hum);
+
+  delay(100);
+
+  MeasureData measureData_photo;
+  measureData_photo.sensor_id = 0xA5;
+  measureData_photo.sensor_type = 0x03;
+  measureData_photo.payload = sensors.photoSensor();
+  transmissionModule.transmit(measureData_photo);
+
+  delay(100);
+
+  MeasureData measureData_vibro;
+  measureData_vibro.sensor_id = 0xA5;
+  measureData_vibro.sensor_type = 0x04;
+  measureData_vibro.payload = sensors.photoSensor();
+  transmissionModule.transmit(measureData_vibro);
+
+  delay(100);
+
   Serial.print(sensors.humiditySensor(), DEC);
   Serial.print(" ");
   Serial.print(sensors.temperatureSensor(), DEC);
@@ -30,6 +58,6 @@ void loop() {
   Serial.print(sensors.photoSensor(), DEC);
   Serial.print(" ");
   Serial.println(sensors.vibroSensor(), DEC);
-  transmissionModule.transmit(measureData);
+  
   delay(100);
 }
\ No newline at end of file