X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=rpi_promini%2Frpi_promini.ino;h=5e98806c1e0565e046d3073fe197fa20a75ae709;hb=199ec5e3f285729f2852324a11eb16f8e97db0a8;hp=fa139a0642ea8593206f60e7f22fa6bc53736600;hpb=73ac0c251a823549ecef2c75d42bd69f279ddc15;p=Arduino

diff --git a/rpi_promini/rpi_promini.ino b/rpi_promini/rpi_promini.ino
index fa139a0..5e98806 100644
--- a/rpi_promini/rpi_promini.ino
+++ b/rpi_promini/rpi_promini.ino
@@ -5,13 +5,13 @@
   RPI pin  Arduino
   RXD      TXD
   TXD      RXD
-  GPIO6    RST
+  BCM25    RST
   GND      GND
   +5V      RAW
 
            2    433Mhz receive
 //           3    433Mhz outdoor temperature sensor receiver # DISABLED
-           8    DHT22
+           8    DHT22 (VCC from arduino VCC)
            10   433Mhz send
            11   DS18B20
            12   315Mhz send
@@ -40,7 +40,7 @@ DallasTemperature sensors(&oneWire);
 int int_0 = 300; // ms
 int int_1 = 900; // ms
 int wait  = 2000; // ms
-int repeat = 20; // times (5 times seem a little low for sensors which are more than 10m away)
+int repeat = 5; // times (5 times seem a little low for sensors which are more than 10m away)
 
 void send_315(char *code) {
   Serial.print("send 315Mhz ");
@@ -76,6 +76,11 @@ void send_315(char *code) {
 #include "DHT.h"
 DHT dht;
 
+#include "RunningAverage.h"
+
+RunningAverage temp_avg(10);
+RunningAverage hum_avg(10);
+
 // setup
 
 void help() {
@@ -86,6 +91,7 @@ void setup() {
   Serial.begin(9600);
   mySwitch.enableReceive(0);  // Receiver on inerrupt 0 => that is pin #2  
   mySwitch.enableTransmit(10); // with sender wired in receiving doesn't work, pin #10
+  mySwitch.setRepeatTransmit(repeat); // or change to be different for 433 and 315 MHz
 
   // DS18B20
   sensors.begin();
@@ -93,13 +99,31 @@ void setup() {
   // DHT22
   dht.setup(8);
 
+    temp_avg.addValue( dht.getTemperature() );
+    hum_avg.addValue( dht.getHumidity() );
+
 }
 
 int serial_pos = 0;
 char serial_data[2]; // socket (0-9), state (0-1)
-char binary_data[24];
+char binary_data[32];
+int dht22_errors = 0;
+
+unsigned long time = millis();
 
 void loop() {
+  if ( millis() - time > 2000 ) {
+    float t = dht.getTemperature();
+    if ( dht.getStatus() == 0 )
+      temp_avg.addValue( t );
+    else dht22_errors++;
+    float h = dht.getHumidity();
+    if ( dht.getStatus() == 0 )
+      hum_avg.addValue( h );
+    else dht22_errors++;
+    time = millis();
+  }
+
   if (mySwitch.available()) {
     Serial.print(mySwitch.getReceivedBitlength());
     Serial.print(" bits ");
@@ -128,6 +152,13 @@ void loop() {
        LED_OFF
      } else
 
+     if ( input == 'R' ) {
+       Serial.readBytesUntil('\n', binary_data, sizeof(binary_data));
+       Serial.print("# send 315 binary ");
+       Serial.println( binary_data );
+       send_315( binary_data );
+     } else
+
     // light sockets at 315 Mhz
      if (input == 'a') {
        send_315("1000100110110000000000010");
@@ -139,14 +170,14 @@ void loop() {
      // DHT22
      if (input == 'd') {
        Serial.print("temperature=");
-       Serial.print(dht.getTemperature());
+       Serial.print(temp_avg.getAverage());
        Serial.print(" humidity=");
-       Serial.print(dht.getHumidity());
-       Serial.print(" status=");
-       Serial.println(dht.getStatusString());
+       Serial.print(hum_avg.getAverage());
+       Serial.print(" errors=");
+       Serial.println(dht22_errors);
      }
 
-     if ( input >= 0x30 && input <= 0x39 ) {
+     if ( input >= 0x30 && input <= 0x39 && serial_pos < 2 ) {
        input = input - 0x30; // ASCII to number
        serial_data[serial_pos++] = input;
      } else {     
@@ -182,6 +213,26 @@ void loop() {
            on	? mySwitch.send("001111110000000011000000")
            	: mySwitch.send("001111110000000000000000");
            break;
+         case 5:
+/*
+		cca. 320Mhz 4 channel 4.8A 220V relay
+
+		A       1101001010011010011100010
+		B       1101001010011010011101000
+		C       1101001010011010011100100
+		D       1101001010011010011110000
+		off     1101001010011010011111000
+		on      1101001010011010011100110
+*/
+		switch ( on ) {
+			case '0': send_315( "1101001010011010011111000" );
+			case '1': send_315( "1101001010011010011100110" );
+			case 'A': send_315( "1101001010011010011100010" );
+			case 'B': send_315( "1101001010011010011101000" );
+			case 'C': send_315( "1101001010011010011100100" );
+			case 'D': send_315( "1101001010011010011110000" );
+			default:  Serial.println("# ERROR: use 0-off 1-on A B C D");
+		}
          default:
            Serial.print("# invalid switch number ");
            Serial.println(serial_data[0], DEC);