Entrpellung implementiert – noch nicht getestet

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

BiDi/BiDi.ino

@@ -1,95 +0,0 @@
-/* RS 485-Implementierung, die sowohl Schreiben als auch Lesen kann */
-/* Basis für andere Projekte */
-
-#define BUTTON 2
-#define RECEIVE 3
-#define RECEIVE_ENABLE 4
-#define SEND 5
-#define SEND_ENABLE 6
-
-#define MAX_LEN 128
-
-void setup() {
-  // Buttons connected to analog input lines
-  pinMode(A0,INPUT_PULLUP);
-  pinMode(A1,INPUT_PULLUP);
-  pinMode(A2,INPUT_PULLUP);
-  pinMode(A3,INPUT_PULLUP);
-  pinMode(A4,INPUT_PULLUP);
-  pinMode(A5,INPUT_PULLUP);
-  pinMode(A6,INPUT_PULLUP);
-  pinMode(A7,INPUT_PULLUP);
-  // Currently, all buttons are also connected via a diode to an interruptable pin, to notify on input changes.
-  // This interruptable pin should be assgined to BUTTON
-  pinMode(BUTTON,INPUT_PULLUP);
-  attachInterrupt(digitalPinToInterrupt(BUTTON),button,FALLING); // interrupt for button change
-
-  // Set up pins for RS485 connection
-  pinMode(RECEIVE, INPUT);
-  pinMode(RECEIVE_ENABLE, OUTPUT);
-  pinMode(SEND, OUTPUT);
-  pinMode(SEND_ENABLE, OUTPUT);
-  attachInterrupt(digitalPinToInterrupt(RECEIVE),receive,CHANGE); // interrupt for incoming RS485 traffic
-  
-  reset485();
-  buttons = 0x0;
-}
-
-void button() {
-  buttons = 0xFF ^ (digitalRead(A7)<<7 | digitalRead(A6)<<6 | digitalRead(A5)<<5 | digitalRead(A4)<<4 | digitalRead(A3)<<3 | (!digitalRead(A2))<<2 | digitalRead(A1)<<1 | digitalRead(A0));  
-}
-
-void receive(){
-  bool received_bit = digitalRead(RECEIVE);
-  curr = micros();
-  duration = curr - last;
-  Serial.print("Input switched to ");
-  Serial.print(received_bit?"H":"L");  
-  Serial.print(" after ");
-  Serial.print(duration);
-  Serial.println(" ticks");
-  last = curr;
-  if (duration > MAX_TICKS) reset485();
-  received_bit = !received_bit; // received_bit is the current value, the duration of the previous value (=inverted) has been measured
-  duration /= BASE;
-  while (duration > 0){
-    byte_idx--;
-    recv |= received_bit<<byte_idx;
-    if (byte_idx == 0) {
-      msg[msg_idx] = recv;
-      msg_idx++;
-      byte_idx = 8;
-      if (recv == 0x00) message_received();
-    }
-    duration--;
-  }
-}
-
-void reset485(){
-  byte_idx = 8;
-  msg_idx = 0;
-  recv=0x0;
-}
-
-void message_received(){
-  for (int i=0; i<MAX_LEN; i++) message[i]=msg[i];
-  reset485();
-}
-
-void button_pressed(int i){
-  Serial.println("not implemented");
-}
-
-void loop(){
-  if (buttons>0){
-    for (int i=0; i<7; i++){
-      if (buttons & (1<<i)) button_pressed(i);     
-    }    
-  }
-  if (message[0] != 0x0){
-    Serial.print("Received '");
-    Serial.print(message);
-    Serial.println("'");    
-    message[0] = 0x0;
-  }
-}

README.md

@@ -2,3 +2,4 @@
 |-------|------------------|-----------------|---------|---------|
 | 1.0   |               D2 |              D3 |      U7 |      U8 |
 | 2.0   |               D2 |            (D10)|      U8 |      U7 |
+| 2.1   |               D3 |              D2 |      U8 |      U7 | 

Receiver/Receiver.ino

@@ -1,61 +0,0 @@
-// Für Controllino könnte man benutzen: sRx = 20, sTx = 21, enable = 53
-
-int sTx = 2;
-int sRx = 3;
-
-long base = 100;
-long rst = base*10; // reset
-boolean bt = false;
-long dif = 0;
-long lt = 0;
-long now = 0;
-char rcv = 0;
-int idx = 0;
-String message;
-void setup(){
-  pinMode(sRx,INPUT);
-  pinMode(sTx,OUTPUT);
-  attachInterrupt(digitalPinToInterrupt(sRx),change485,CHANGE);
-  Serial.begin(115200);  
-  Serial.println("Receiver ready");
-}
-
-void reset485(long dif){
-    rcv = 0;
-    idx = -1;
-    message.reserve(32);
-}
-void change485(){
-  bool bt = digitalRead(sRx);
-  now = micros();
-  dif = now - lt;
-  lt = now;
-  if (dif > rst){
-    reset485(dif);
-  } else {
-    handle485(!bt,dif);
-  }
-}
-
-void handle485(boolean bt, long dif){
-  long count = dif/base;
-  for (int i=0; i<count; i++) push485(bt);
-}
-
-void push485(boolean bt){
-  if (idx>=0) rcv |= bt<<idx;
-  idx++;
-  
-  if (idx == 8){
-    if (rcv == 13) {
-      Serial.println(message);
-      message = "";
-    } else {
-      message+=rcv;
-    } 
-    idx =0;
-    rcv =0;
-  }
-}
-
-void loop(){}

Software/LCDReceiver/LCDReceiver.ino

@@ -9,20 +9,19 @@
 #include <LiquidCrystal.h>
 #include <SoftRS485.h>
 
-#define PROGRAM "RS485-Nano Rev 2.0 / LCDReceive 1.2"
+#define Max485_RO 2 // read-output of Max485
+#define Max485_RE 8 // not-read-enable of Max485
+#define Max485_DE 8 // data enable of Max485
+#define Max485_DI 9 // data input of Max485
 
-#define Max485_RO 3 // read-output of Max485
-#define Max485_RE 5 // not-read-enable of Max485
-#define Max485_DE 9 // data enable of Max485
-#define Max485_DI 8 // data input of Max485
-
-#define LCD_RS 4
-#define LCD_EN 6
-#define LCD_D4 7
-#define LCD_D5 11
-#define LCD_D6 12
-#define LCD_D7 13
+#define LCD_RS 10
+#define LCD_EN 11
+#define LCD_D4 4
+#define LCD_D5 5
+#define LCD_D6 6
+#define LCD_D7 7
 
+#define PROGRAM "RS485-Nano 2.1 / LCDReceive 1.2"
 
 
 // initialize the library by associating any needed LCD interface pin with the arduino pin number it is connected to
@@ -36,14 +35,11 @@ void setup() {
   // set up the LCD's number of columns and rows:
   lcd.begin(16, 2);
   // Print a message to the LCD.
-  Serial.println(PROGRAM);
-  lcd.print(PROGRAM);
+  printMessage(PROGRAM);
 
 }
 
-void loop() {
-  if (available485()) {
-    String s = get485message();
+void printMessage(String s){
     Serial.println(s);
     lcd.clear();
     lcd.setCursor(0, 0);
@@ -53,6 +49,11 @@ void loop() {
       s=s.substring(16);
       s.trim();
       lcd.print(s);
-    }
+    }  
+}
+
+void loop() {
+  if (available485()) {
+    printMessage(get485message());
   }
 }

Software/Sender/Sender.ino

@@ -9,15 +9,15 @@
 // include the library code:
 #include <SoftRS485.h>
 
-#define PROGRAM "RS485-Nano 2.0 / Sender 1.1"
+#define PROGRAM "RS485-Nano 2.1 / Sender 1.1"
 
-#define BTN_INT 2 // button interrupt pin
-#define Max485_RO 3 // read-output of Max485
-#define Max485_RE 5 // not-read-enable of Max485
-#define Max485_DE 9 // data enable of Max485
-#define Max485_DI 8 // data input of Max485
+#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 200000 // 200ms
+#define TRESHOLD 100
 #define ID 0
 // 0=Test
 // 1=Arbeitszimmer
@@ -26,13 +26,21 @@
 
 //#define LOG_TO_SERIAL
 #define SEND_485
+#define DEBUG
 
+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);
@@ -54,26 +62,26 @@ void setup(){
 }
 
 void isr(){
-  states[0] = !digitalRead(14);
-  states[1] = !digitalRead(15);
-  states[2] = !digitalRead(16);
-  states[3] = !digitalRead(17);
+  raw_states[0] = !digitalRead(14);
+  raw_states[1] = !digitalRead(15);
+  raw_states[2] = !digitalRead(16);
+  raw_states[3] = !digitalRead(17);
 
-  states[4] = !digitalRead(18);
-  states[5] = !digitalRead(19);
-  states[6] = !(analogRead(20)>200);
-  states[7] = !(analogRead(21)>200);
+  raw_states[4] = !digitalRead(18);
+  raw_states[5] = !digitalRead(19);
+  raw_states[6] = !(analogRead(20)>400);
+  raw_states[7] = !(analogRead(21)>400);
 #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
 }
 
 #ifdef SEND_485
-void send(int btn){
-  String s = "{nano:"+String(ID)+",btn:"+String(btn)+"}";
+void send(int btn, long duration){
+  String s = "{nano:"+String(ID)+",btn:"+String(btn)+",dura:"+String(duration)+"}";
   for (int i = 0; i<10; i++){
     if (send485(s.c_str())) break;
     Serial.println("collision detected, trying again:");
@@ -85,18 +93,31 @@ 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){
+    // 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;
+
+#ifdef DEBUG
+    if (capacitor[i]) {
+      Serial.print("cap "); Serial.print(i); Serial.print(": "); Serial.println(capacitor[i]);
+    }
+#endif    
+
+    // 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];
+      times[i] = now;
 #ifdef SEND_485
-        send(i+1);
-#endif
-        times[i] = now;
+      if (states[i]){ // old state was HIGH → we are going LOW
+        send(i+1,diff);
       }
-      states[i] = 0;
+#endif      
+      states[i] = new_state;
     }
   }
 }

Software/TempSender/TempSender.ino

@@ -10,13 +10,13 @@
 #include <SoftRS485.h>
 #include <AM2302-Sensor.h>
 
-#define PROGRAM "RS485-Nano 2.0 / TempSender 1.1"
+#define PROGRAM "RS485-Nano 2.1 / TempSender 1.1"
 
-#define BTN_INT 2 // button interrupt pin
-#define Max485_RO 3 // read-output of Max485
-#define Max485_RE 5 // not-read-enable of Max485
-#define Max485_DE 9 // data enable of Max485
-#define Max485_DI 8 // data input of Max485
+#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