From 88fc81702706c2ae867f20bb51ace57735254ee5 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Mon, 7 Aug 2023 01:19:09 +0200
Subject: [PATCH] progress

---
 main.py       |  8 ++---
 main/main.ino | 92 +--------------------------------------------------
 2 files changed, 5 insertions(+), 95 deletions(-)

diff --git a/main.py b/main.py
index 477fae0..47b3118 100755
--- a/main.py
+++ b/main.py
@@ -7,7 +7,7 @@
 import serial
 import time
 
-ser = serial.Serial('/dev/ttyACM0', baudrate = 9600, timeout = 1)
+ser = serial.Serial('/dev/ttyACM0', baudrate = 9600, timeout = 6)
 
 #time.sleep(3)
 
@@ -16,9 +16,9 @@ while 1:
 #    ser.readline()
     Data = ser.readline().decode('ascii')
     print(Data)
-    outFile = open("arduino-fridge-powercontrol.json", "w")
-    outFile.write(Data)
-    outFile.close
+    #outFile = open("arduino-fridge-powercontrol.json", "w")
+    #outFile.write(Data)
+    #outFile.close
 
 ##while 1:
 ##    # {  "command": "switch",  "arg": "one",  "state": "off", "ver":"1690931931"}
diff --git a/main/main.ino b/main/main.ino
index 61541e7..435d4ad 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -36,70 +36,20 @@ bool fetState2;
 
 uint8_t addrSensor1[8] = { 0x28, 0xFF, 0x64, 0x1F, 0x79, 0xD1, 0xB1, 0x75 };
 uint8_t addrSensor2[8] = { 0x28, 0xFF, 0x64, 0x1F, 0x79, 0xD7, 0xDA, 0x9A };
-/*
-
-// countLowTemp
-int cLTemp1 = 0;
-int cLTemp2 = 0;
-// countHighTemp
-int cHTemp1 = 0;
-int cHTemp2 = 0;
-// loops to count temp before switching state
-int cTemp = 5;
-
-*/
 
 void setup() {
   // put your setup code here, to run once:
   pinMode(MOSFET1, OUTPUT);
   pinMode(MOSFET2, OUTPUT);
 
- 
   Serial.begin(9600);
   sensors.begin();
 
-
-  // little welcome
-  //Serial.println(".:: arduino-fridge-powercontrol by DeltaLima, 2023 ::.");
-  // locate devices on the bus
-  /*Serial.println("Locating devices...");
-  Serial.print("Found ");
-  deviceCount = sensors.getDeviceCount();
-  Serial.print(deviceCount, DEC);
-  Serial.println(" devices.");
-  Serial.println("");
-  
-  Serial.println("Printing addresses...");
-  for (int i = 0;  i < deviceCount;  i++)
-  {
-    Serial.print("Sensor ");
-    Serial.print(i+1);
-    Serial.print(" : ");
-    sensors.getAddress(Thermometer, i);
-    printAddress(Thermometer);
-  }
-
-  Serial.println("");
-  Serial.print("MOSFET1 start temp: ");
-  Serial.print(HTemp1);
-  Serial.print("°C, stop temp: ");
-  Serial.print(LTemp1);
-  Serial.println("°C");
-  Serial.print("MOSFET2 start temp: ");
-  Serial.print(HTemp2);
-  Serial.print("°C, stop temp: ");
-  Serial.print(LTemp2);
-  Serial.println("°C");
-  */
 }
 
 void loop() {
-  // put your main code here, to run repeatedly:
-
-//if(Serial.available()>0) {
 
   sensors.requestTemperatures(); 
-
   
   tempSensor1 = sensors.getTempC(addrSensor1);
   if(tempSensor1 > HTemp1) {
@@ -119,27 +69,6 @@ void loop() {
     fetState2 = 0;
   }
 
-
-  /*
-  Serial.print("Sens 1 ");  
-  Serial.print("Celsius temperature: ");
-  // Why "byIndex"? You can have more than one IC on the same bus. 0 refers to the first IC on the wire
-  Serial.print(sensors.getTempC(addrSensor1)); 
-  Serial.print(" - Fahrenheit temperature: ");
-  Serial.print(sensors.getTempF(addrSensor1));
-  Serial.print(" - MOSFET1 Sate: ");
-  Serial.println(fetState1);
-
-  Serial.print("Sens 2 ");  
-  Serial.print("Celsius temperature: ");
-  // Why "byIndex"? You can have more than one IC on the same bus. 0 refers to the first IC on the wire
-  Serial.print(sensors.getTempC(addrSensor2)); 
-  Serial.print(" - Fahrenheit temperature: ");
-  Serial.print(sensors.getTempF(addrSensor2));
-  Serial.print(" - MOSFET2 Sate: ");
-  Serial.println(fetState2);
-  */
-
   StaticJsonDocument<96> jsonOut;
   //jsonOut["sensor"] = "1";
   jsonOut[0]["temp"] = tempSensor1;
@@ -149,26 +78,7 @@ void loop() {
   jsonOut[1]["temp"] = tempSensor2;
   jsonOut[1]["state"] = fetState2;
   serializeJson(jsonOut, Serial);
-  Serial.println();
-  /*
-  digitalWrite(MOSFET, HIGH);
-  delay(2000);
-  digitalWrite(MOSFET, LOW);
-  delay(2000);
-  */
+  
   delay(5000);
-//  }
   
 }
-
-void printAddress(DeviceAddress deviceAddress)
-{ 
-  for (uint8_t i = 0; i < 8; i++)
-  {
-    Serial.print("0x");
-    if (deviceAddress[i] < 0x10) Serial.print("0");
-    Serial.print(deviceAddress[i], HEX);
-    if (i < 7) Serial.print(", ");
-  }
-  Serial.println("");
-}