From 509f23e34350b410bbab1c9eb2662215562cbae6 Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Tue, 11 Jun 2024 10:48:29 +0200
Subject: [PATCH] improving code

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
---
 Software/Sender/Sender.ino         | 26 +++++++++++--------
 Software/TempSender/TempSender.ino | 40 ++++++++++++++++--------------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/Software/Sender/Sender.ino b/Software/Sender/Sender.ino
index 5b8324b..c44b6ad 100644
--- a/Software/Sender/Sender.ino
+++ b/Software/Sender/Sender.ino
@@ -9,8 +9,16 @@
 // include the library code:
 #include <SoftRS485.h>
 
-#define ID 4
-#define PROGRAM "RS485-Nano 2.0 / Sender 1.3"
+// 0=Test
+// 1=Arbeitszimmer
+// 2=Küche
+// 3=Bad
+// 4=Treppenhaus
+
+#define ID 1
+#define PROGRAM "Sender"
+#define VERSION "1.3"
+#define REVISION "2.0"
 
 #define BTN_INT 2 // button interrupt pin
 #define Max485_RO 3 // read-output of Max485
@@ -20,15 +28,10 @@
 
 #define TRESHOLD 1024
 #define TRIGGER_LEVEL 200
-// 0=Test
-// 1=Arbeitszimmer
-// 2=Küche
-// 3=Bad
-// 4=Treppenhaus
 
 #define DEBUG
-#define LOG_TO_SERIAL
-//#define SEND_485
+//#define LOG_TO_SERIAL
+#define SEND_485
 
 boolean raw_states[8];
 boolean states[8];
@@ -56,8 +59,9 @@ void setup(){
   pinMode(21,INPUT_PULLUP);
 
   attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
-  // Print a message to the LCD.
-  Serial.println(PROGRAM);
+  String s = "{nano:"+String(ID)+",hw:"+REVISION+","+PROGRAM+":"+VERSION+"}";
+  Serial.println(s);
+  send485(s.c_str());
 #ifdef LOG_TO_SERIAL
   Serial.println("14 15 16 17 18 19 20 21");
 #endif
diff --git a/Software/TempSender/TempSender.ino b/Software/TempSender/TempSender.ino
index 7bd0221..d33f78a 100644
--- a/Software/TempSender/TempSender.ino
+++ b/Software/TempSender/TempSender.ino
@@ -12,7 +12,16 @@
 #include <SoftRS485.h>
 #include <AM2302-Sensor.h>
 
-#define VERSION "1.2"
+// 0=Test
+// 1=Arbeitszimmer
+// 2=Küche
+// 3=Bad
+// 4=Treppenhaus
+
+#define ID 1
+#define PROGRAM "TempSender"
+#define VERSION "1.3"
+#define REVISION "2.0"
 
 #define BTN_INT 2 // button interrupt pin
 #define Max485_RO 3 // read-output of Max485
@@ -21,16 +30,12 @@
 #define Max485_DI 8 // data input of Max485
 
 #define TRESHOLD 1024
+#define TRIGGER_LEVEL 200
 
 #define DHT_PIN 4
 #define PERIOD   100000000 // 100s
 
-#define ID 0
-// 0=Test
-// 1=Arbeitszimmer
-// 2=Küche
-// 3=Bad
-
+//define DEBUG
 //#define LOG_TO_SERIAL
 #define SEND_485
 
@@ -63,8 +68,7 @@ void setup(){
   pinMode(21,INPUT_PULLUP);
 
   attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
-  // Print a message to the LCD.
-  String s = "{nano:"+String(ID)+",revision:2.0,TempSender:"+VERSION+"}";
+  String s = "{nano:"+String(ID)+",hw:"+REVISION+","+PROGRAM+":"+VERSION+"}";
   Serial.println(s);
   send485(s.c_str());
 #ifdef LOG_TO_SERIAL
@@ -73,15 +77,15 @@ void setup(){
 }
 
 void isr(){
-  raw_states[0] = analogRead(14)<400;
-  raw_states[1] = analogRead(15)<400;
-  raw_states[2] = analogRead(16)<400;
-  raw_states[3] = analogRead(17)<400;
-
-  raw_states[4] = analogRead(18)<400;
-  raw_states[5] = analogRead(19)<400;
-  raw_states[6] = analogRead(20)<400;
-  raw_states[7] = analogRead(21)<400;
+  raw_states[0] = analogRead(14)<TRIGGER_LEVEL;
+  raw_states[1] = analogRead(15)<TRIGGER_LEVEL;
+  raw_states[2] = analogRead(16)<TRIGGER_LEVEL;
+  raw_states[3] = analogRead(17)<TRIGGER_LEVEL;
+
+  raw_states[4] = analogRead(18)<TRIGGER_LEVEL;
+  raw_states[5] = analogRead(19)<TRIGGER_LEVEL;
+  raw_states[6] = analogRead(20)<TRIGGER_LEVEL;
+  raw_states[7] = analogRead(21)<TRIGGER_LEVEL;
 #ifdef LOG_TO_SERIAL
   for (int i=0;i<8;i++){
     Serial.print(" ");