Merge branch 'nano-revision-2.1' into nano-revision-2.2

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

Software/LCDReceiver/LCDReceiver.ino

@@ -21,19 +21,17 @@
 #define LCD_D6 6
 #define LCD_D7 7
 
-#define PROGRAM "RS485-Nano 2.1 / LCDReceive 1.2"
-
+#define PROGRAM "RS485-Nano 2.2 / LCDReceive 1.2"
 
 // initialize the library by associating any needed LCD interface pin with the arduino pin number it is connected to
 LiquidCrystal lcd(LCD_RS, LCD_EN, LCD_D4, LCD_D5, LCD_D6, LCD_D7);
 
-
 void setup() {
   Serial.begin(115200);
   init485(Max485_RO,Max485_RE,Max485_DE,Max485_DI); // library initialization:
-  invert485polarity(true);
+
   // set up the LCD's number of columns and rows:
-  lcd.begin(16, 2);
+  lcd.begin(16, 4);
   // Print a message to the LCD.
   printMessage(PROGRAM);
 
@@ -41,15 +39,21 @@ void setup() {
 
 void printMessage(String s){
     Serial.println(s);
-    lcd.clear();
-    lcd.setCursor(0, 0);
-    lcd.print(s);
-    if (s.length()>16) {
-      lcd.setCursor(0, 1);
-      s=s.substring(16);
-      s.trim();
-      lcd.print(s);
-    }  
+    lcd.clear();    
+    int line = 0;
+    int col = 0;
+    auto cstr = s.c_str();
+    for (int i=0;i<s.length();i++){
+      if (col == 0 && cstr[i] == ' ') continue;
+      if (cstr[i] == '{' || cstr[i] == '}') continue;
+      lcd.print(cstr[i]);
+      col++;
+      if (cstr[i]==',' || col==16){
+        line++;
+        col=0;
+        lcd.setCursor(col, line);
+      }
+    }
 }
 
 void loop() {

Software/Sender/Sender.ino

@@ -9,7 +9,18 @@
 // include the library code:
 #include <SoftRS485.h>
 
-#define PROGRAM "RS485-Nano 2.1 / Sender 1.1"
+// 0=Test
+// 1=Flur
+// 2=Wohnzimmer
+// 3=Bad EG
+// 4=Treppenhaus
+// 5=Arbeitszimmer
+// 6=Bad OG
+
+#define ID 0
+#define PROGRAM "Sender"
+#define SW_VERSION "1.3"
+#define HW_VERSION "2.2"
 
 #define BTN_INT 3 // button interrupt pin
 #define Max485_RO 2 // read-output of Max485
@@ -17,22 +28,26 @@
 #define Max485_DE 8 // data enable of Max485
 #define Max485_DI 9 // data input of Max485
 
-#define TRESHOLD 200000 // 200ms
-#define ID 0
-// 0=Test
-// 1=Arbeitszimmer
-// 2=Küche
-// 3=Bad
+#define TRESHOLD 1024
+#define TRIGGER_LEVEL 200
 
+//#define DEBUG
 //#define LOG_TO_SERIAL
 #define SEND_485
 
+boolean raw_states[8];
 boolean states[8];
+unsigned long capacitor[8];
 unsigned long times[8];
 
 
 
 void setup(){
+  for (int i=0; i<8;i++) {
+    capacitor[i] = 0;
+    raw_states[i] = LOW;
+    states[i] = LOW;
+  }
   Serial.begin(115200);
   init485(Max485_RO,Max485_RE,Max485_DE,Max485_DI); // library initialization:
   pinMode(BTN_INT,INPUT_PULLUP);
@@ -45,58 +60,65 @@ void setup(){
   pinMode(20,INPUT_PULLUP);
   pinMode(21,INPUT_PULLUP);
 
-  attachInterrupt(digitalPinToInterrupt(2),isr,CHANGE);
-  // Print a message to the LCD.
-  Serial.println(PROGRAM);
+  attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
+  String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
+  Serial.println(s);
+  send485(s.c_str());
 #ifdef LOG_TO_SERIAL
   Serial.println("14 15 16 17 18 19 20 21");
 #endif
 }
 
 void isr(){
-  states[0] = !digitalRead(14);
-  states[1] = !digitalRead(15);
-  states[2] = !digitalRead(16);
-  states[3] = !digitalRead(17);
+  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;
 
-  states[4] = !digitalRead(18);
-  states[5] = !digitalRead(19);
-  states[6] = !(analogRead(20)>200);
-  states[7] = !(analogRead(21)>200);
+  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(" "); Serial.print(states[i]); Serial.print(" ");
+    Serial.print(" ");
+    Serial.print(raw_states[i]);
+    Serial.print(" ");
   }
   Serial.println();
 #endif
 }
 
+void send(int btn, long duration){
+  String s = "{nano:"+String(ID)+",btn:"+String(btn)+",ms:"+String(duration)+"}";
 #ifdef SEND_485
-void send(int btn){
-  String s = "{nano:"+String(ID)+",btn:"+String(btn)+"}";
   for (int i = 0; i<10; i++){
     if (send485(s.c_str())) break;
     Serial.println("collision detected, trying again:");
   }
-}
+#else
+  Serial.println(s);
 #endif
+}
 
 void loop(){
   unsigned long now = micros();
-  boolean pause = true;
   for (int i=0;i<8;i++){
-    if (states[i]){
-      if (pause){
-        delay(5);
-        pause=false;
-      }
-      if (now - times[i] > TRESHOLD){
-#ifdef SEND_485
-        send(i+1);
-#endif
-        times[i] = now;
-      }
-      states[i] = 0;
+    // we emulate a capacitor:
+    // when the button is pressed, it slowly loads, if the button is released, it unloads.
+    capacitor[i] = raw_states[i] ? capacitor[i]+1 : capacitor[i]>>1;
+
+    // if the capacitor reaches a certain treshold, the state is changed
+    boolean new_state = capacitor[i]>TRESHOLD;
+
+    // TODO: drop state after a maximum HIGH time
+
+    // when the state changes, the duration of the last state is calculated
+    if (states[i] != new_state){      
+      long diff = (now - times[i])/1000;
+      times[i] = now;
+      if (states[i]) send(i+1,diff); // old state was HIGH → we are going LOW
+      states[i] = new_state;
     }
   }
 }

Software/SerialTransceiver/SerialTransceiver.ino

@@ -0,0 +1,38 @@
+/*
+ *  Demonstrates how to use LCDisplay in conjunction with SoftRS485:
+ *
+ *  The main _loop_ of this program listens on the RS485 bus.
+ *  Whenever a message is received from the bus, it is displayed on the LCD.
+ */
+
+// include the library code:
+#include <SoftRS485.h>
+
+
+#define Max485_RO 2 // read-output of Max485
+#define Max485_RE 3 // not-read-enable of Max485
+#define Max485_DE 8 // data enable of Max485
+#define Max485_DI 9 // data input of Max485
+
+#define PROGRAM "{hw:RS485-Nano rev 2.1,firmware:Transceiver,version:1.0}"
+
+String message = "";
+char c;
+void setup() {
+  Serial.begin(115200);
+  init485(Max485_RO,Max485_RE,Max485_DE,Max485_DI); // library initialization:
+  send485(PROGRAM);
+}
+
+void loop() {
+  if (available485()) Serial.println(get485message());
+  while (Serial.available()) {
+    c = (char)Serial.read();
+    if (c == '\n') {
+      send485(message.c_str());
+      message = "";
+    } else {
+      message += c;    
+    }
+  }  
+}

Software/TempSender/TempSender.ino

@@ -4,41 +4,62 @@
  * If a button is pressed, a corresponding flag is set.
  * The main loop checks for the state of those flags and
  * sends a message on the RS485 bus whenever a flag is set.
+ * 
+ * Additionally, the temperature is read from a DHT22 sensor once per minute
  */
 
 // include the library code:
 #include <SoftRS485.h>
-#include <AM2302-Sensor.h>
+#include <SimpleDHT.h>
 
-#define PROGRAM "RS485-Nano 2.1 / TempSender 1.1"
+// 0=Test
+// 1=Flur
+// 2=Wohnzimmer
+// 3=Bad EG
+// 4=Treppenhaus
+// 5=Arbeitszimmer
+// 6=Bad OG
+
+#define ID 0
+#define HW_VERSION "2.2"
+#define PROGRAM "TempSender"
+#define SW_VERSION "1.5"
 
 #define BTN_INT 3 // button interrupt pin
 #define Max485_RO 2 // read-output of Max485
 #define Max485_RE 3 // not-read-enable of Max485
 #define Max485_DE 8 // data enable of Max485
 #define Max485_DI 9 // data input of Max485
-#define DHT_PIN 4
-#define TRESHOLD 100000 // 100ms
-#define PERIOD   100000000 // 100s
-#define ID 3
-// 0=Test
-// 1=Arbeitszimmer
-// 2=Küche
-// 3=Bad
 
+#define TRESHOLD 1024
+#define TRIGGER_LEVEL 200
+
+#define DHT_PIN 4
+#define PERIOD   100000000 // 100s
+
+//#define DEBUG
 //#define LOG_TO_SERIAL
 #define SEND_485
 
-AM2302::AM2302_Sensor am2302{DHT_PIN};
-
+boolean raw_states[8];
 boolean states[8];
+unsigned long capacitor[8];
 unsigned long times[8];
-unsigned long sensor_time = PERIOD;
+unsigned long sensor_time = 0;
 
+// these values are used for temperature processing
+SimpleDHT22 sensor(DHT_PIN);
+float temperature = 0;
+float humidity = 0;
+int err = SimpleDHTErrSuccess;
 
 void setup(){
+  for (int i=0; i<8;i++) {
+    capacitor[i] = 0;
+    raw_states[i] = LOW;
+    states[i] = LOW;
+  }
   Serial.begin(115200);
-  am2302.begin();
   init485(Max485_RO,Max485_RE,Max485_DE,Max485_DI); // library initialization:
   pinMode(BTN_INT,INPUT_PULLUP);
   pinMode(14,INPUT_PULLUP);
@@ -50,67 +71,73 @@ void setup(){
   pinMode(20,INPUT_PULLUP);
   pinMode(21,INPUT_PULLUP);
 
-  attachInterrupt(digitalPinToInterrupt(2),isr,FALLING);
-  // Print a message to the LCD.
-  Serial.println(PROGRAM);
+  attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
+  String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
+  Serial.println(s);
+  send485(s.c_str());
 #ifdef LOG_TO_SERIAL
   Serial.println("14 15 16 17 18 19 20 21");
 #endif
 }
 
 void isr(){
-  states[0] = !digitalRead(14);
-  states[1] = !digitalRead(15);
-  states[2] = !digitalRead(16);
-  states[3] = !digitalRead(17);
+  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;
 
-  states[4] = !digitalRead(18);
-  states[5] = !digitalRead(19);
-  states[6] = !(analogRead(20)>200);
-  states[7] = !(analogRead(21)>200);
+  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(" "); Serial.print(states[i]); Serial.print(" ");
+    Serial.print(" ");    
+    Serial.print(raw_states[i]);
+    Serial.print(" ");
   }
   Serial.println();
 #endif
 }
 
+void send(int btn, long duration){
+  String s = "{nano:"+String(ID)+",btn:"+String(btn)+",ms:"+String(duration)+"}";
 #ifdef SEND_485
-void send(int btn){
-  String s = "{nano:"+String(ID)+",btn:"+String(btn)+"}";
   for (int i = 0; i<10; i++){
     if (send485(s.c_str())) break;
     Serial.println("collision detected, trying again:");
   }
-}
+#else
+  Serial.println(s);
 #endif
+}
 
 void loop(){
   unsigned long now = micros();
   for (int i=0;i<8;i++){
-    if (states[i]){
-      delay(1);
-      if (now - times[i] > TRESHOLD){
-#ifdef SEND_485
-        send(i+1);
-#endif
-        times[i] = now;
-      }
-      states[i] = 0;
+    // we emulate a capacitor:
+    // when the button is pressed, it slowly loads, if the button is released, it unloads.
+    capacitor[i] = raw_states[i] ? capacitor[i]+1 : capacitor[i]>>1;
+
+    // if the capacitor reaches a certain treshold, the state is changed
+    boolean new_state = capacitor[i]>TRESHOLD;
+
+    // TODO: drop state after a maximum HIGH time
+
+    // when the state changes, the duration of the last state is calculated
+    if (states[i] != new_state){      
+      long diff = (now - times[i])/1000;
+      times[i] = now;
+      if (states[i]) send(i+1,diff); // old state was HIGH → we are going LOW
+      states[i] = new_state;
     }
   }
 
   if (now - sensor_time > PERIOD){
     sensor_time = now;
-    auto status = am2302.read();
-    if (status == 0){
-      String s = "{nano:"+String(ID)+",temp:"+String(am2302.get_Temperature())+",humi:"+String(am2302.get_Hunidity())+"}";
+    if ((err = sensor.read2(&temperature, &humidity, NULL)) == SimpleDHTErrSuccess) {
+      String s = "{nano:"+String(ID)+",temp:"+String(temperature,1)+",humi:"+String(humidity,1)+"}";
       send485(s.c_str());
-#ifdef LOG_TO_SERIAL
-      Serial.println(s);
-#endif
     }
   }
-  
 }

Software/TempSenderPlusIR/TempSenderPlusIR.ino

@@ -0,0 +1,194 @@
+/*
+ *  Demonstrates how to use Read Buttons in conjunction with SoftRS485:
+ *
+ * If a button is pressed, a corresponding flag is set.
+ * The main loop checks for the state of those flags and
+ * sends a message on the RS485 bus whenever a flag is set.
+ * 
+ * Additionally, the temperature is read from a DHT22 sensor once per minute
+ */
+
+// include the library code:
+#include <SoftRS485.h>
+#include <SimpleDHT.h>
+#include <TinyIRSender.hpp>
+
+// 0=Test
+// 1=Flur
+// 2=Wohnzimmer
+// 3=Bad EG
+// 4=Treppenhaus
+// 5=Arbeitszimmer
+// 6=Bad OG
+
+#define ID 0
+#define PROGRAM "Temp+IR"
+#define SW_VERSION "0.1"
+#define HW_VERSION "2.1"
+
+#define BTN_INT 3 // button interrupt pin
+#define Max485_RO 2 // read-output of Max485
+#define Max485_RE 3 // not-read-enable of Max485
+#define Max485_DE 8 // data enable of Max485
+#define Max485_DI 9 // data input of Max485
+
+#define TRESHOLD 1024
+#define TRIGGER_LEVEL 200
+
+#define DHT_PIN 4
+#define PERIOD   100000000 // 100s
+
+#define IR_PIN 5
+#define REPEATS 2
+
+//#define DEBUG
+//#define LOG_TO_SERIAL
+#define SEND_485
+
+boolean raw_states[8];
+boolean states[8];
+unsigned long capacitor[8];
+unsigned long times[8];
+unsigned long sensor_time = 0;
+
+// these values are used for temperature processing
+SimpleDHT11 sensor(DHT_PIN);
+byte temperature = 0;
+byte humidity = 0;
+int err = SimpleDHTErrSuccess;
+
+// these constants are used for message parsing in handle(message)
+const char* outer_delimiter = "{,}";
+const char* inner_delimiter = ":";
+
+void setup(){
+  for (int i=0; i<8;i++) {
+    capacitor[i] = 0;
+    raw_states[i] = LOW;
+    states[i] = LOW;
+  }
+  Serial.begin(115200);
+  init485(Max485_RO,Max485_RE,Max485_DE,Max485_DI); // library initialization:
+  pinMode(BTN_INT,INPUT_PULLUP);
+  pinMode(14,INPUT_PULLUP);
+  pinMode(15,INPUT_PULLUP);
+  pinMode(16,INPUT_PULLUP);
+  pinMode(17,INPUT_PULLUP);
+  pinMode(18,INPUT_PULLUP);
+  pinMode(19,INPUT_PULLUP);
+  pinMode(20,INPUT_PULLUP);
+  pinMode(21,INPUT_PULLUP);
+
+  attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
+  String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
+  Serial.println(s);
+  send485(s.c_str());
+#ifdef LOG_TO_SERIAL
+  Serial.println("14 15 16 17 18 19 20 21");
+#endif
+}
+
+void isr(){
+  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(" ");    
+    Serial.print(raw_states[i]);
+    Serial.print(" ");
+  }
+  Serial.println();
+#endif
+}
+
+void send(int btn, long duration){
+  String s = "{nano:"+String(ID)+",btn:"+String(btn)+",ms:"+String(duration)+"}";
+#ifdef SEND_485
+  for (int i = 0; i<10; i++){
+    if (send485(s.c_str())) break;
+    Serial.println("collision detected, trying again:");
+  }
+#else
+  Serial.println(s);
+#endif
+}
+
+
+
+
+void handle(String message){
+#ifdef LOG_TO_SERIAL
+  Serial.println(message);
+#endif   
+  unsigned int ir_cmd = 0;
+  unsigned int ir_addr = 0;
+  unsigned int nano = 0;
+
+  const char* outer_state = NULL;
+  const char* inner_state = NULL;  
+  char* token = strtok_r(message.c_str(), outer_delimiter, &outer_state);
+  
+  while (token != NULL) {    
+    char* key = strtok_r(token,inner_delimiter,&inner_state);
+    char* val = strtok_r(NULL,inner_delimiter,&inner_state);
+    if (strcmp(key,"nano")==0) nano = atoi(val);      
+    if (strcmp(key,"addr")==0) ir_addr = atoi(val);
+    if (strcmp(key,"ir")==0) ir_cmd = atoi(val);
+    token=strtok_r(NULL, outer_delimiter, &outer_state);
+  }
+  
+  if (nano == ID){ // the message is addressed to us!
+ 
+    if (ir_addr && ir_cmd){
+#ifdef LOG_TO_SERIAL
+      Serial.print("Sending 0x");
+      Serial.print(ir_cmd,HEX);
+      Serial.print(" to 0x");
+      Serial.println(ir_addr,HEX);
+#endif
+      sendNECMinimal(IR_PIN, ir_addr, ir_cmd, REPEATS);
+     }
+  }
+}
+
+void loop(){
+  unsigned long now = micros();
+  for (int i=0;i<8;i++){
+    // we emulate a capacitor:
+    // when the button is pressed, it slowly loads, if the button is released, it unloads.
+    capacitor[i] = raw_states[i] ? capacitor[i]+1 : capacitor[i]>>1;
+
+    // if the capacitor reaches a certain treshold, the state is changed
+    boolean new_state = capacitor[i]>TRESHOLD;
+
+    // TODO: drop state after a maximum HIGH time
+
+    // when the state changes, the duration of the last state is calculated
+    if (states[i] != new_state){      
+      long diff = (now - times[i])/1000;
+      times[i] = now;
+      if (states[i]) send(i+1,diff); // old state was HIGH → we are going LOW
+      states[i] = new_state;
+    }
+  }
+
+  if (now - sensor_time > PERIOD){
+    sensor_time = now;
+    if ((err = sensor.read(&temperature, &humidity, NULL)) == SimpleDHTErrSuccess) {
+      String s = "{nano:"+String(ID)+",temp:"+String((int)temperature)+",humi:"+String((int)humidity)+"}";
+#ifdef LOG_TO_SERIAL
+      Serial.println(s);
+#endif
+      send485(s.c_str());
+    }
+  }
+  
+  if (available485()) handle(get485message());
+}