General fixes

LoRaReceiverInterrupt/LoRaReceiverInterrupt.ino

-/* 
+/*
  Receiver for exchange commands between LoRa Sender (long range)
 */
 #include <heltec.h>
 
-byte localAddress = 0xBB; // address of this device
-byte destination = 0xAA; // destination to send to
+byte localAddress = 0xDD; // address of this device
+byte destination = 0xDE; // destination to send to
 
 #define RELE_1 17
 #define RELE_2 21
@@ -16,16 +16,18 @@ byte destination = 0xAA; // destination to send to
 String lastCommand = "";
 String signalLevel = "";
 
+#define BAND 868E6
+
 void setup() {
- Heltec.begin(true /*DisplayEnable Enable*/, true /*LoRa Enable*/, true /*Serial Enable*/, true /*LoRa use PABOOST*/, 868E6 /*LoRa RF working band*/);
+ Heltec.begin(true /*DisplayEnable Enable*/, true /*LoRa Enable*/, true /*Serial Enable*/, true /*LoRa use PABOOST*/, BAND /*LoRa RF working band*/);
  Heltec.display -> clear();
- 
+
  Serial.println("LoRa Sender");
 
- LoRa.setTxPowerMax(10);
+ LoRa.setTxPowerMax(15);
  //LoRa.enableCrc();
  LoRa.setPreambleLength(4);
- 
+
  // register the receive callback
  LoRa.onReceive(onReceive);
  // put the radio into receive mode
@@ -36,7 +38,7 @@ void setup() {
  // LoRa.setPreambleLength(1);
 
  //---------------------------------------------
- 
+
  pinMode(RELE_1, OUTPUT);
  pinMode(RELE_2, OUTPUT);
  pinMode(RELE_3, OUTPUT);
@@ -47,42 +49,62 @@ void setup() {
 
 unsigned long previousMillisLed = 0;
 const long intervalLed = 60000 * 10;
+
+unsigned long previousMillisRele = 0;
+const long intervalRele = 1000 * 10;
+
 bool isLoRaOnSenderMode = false;
 bool isLedOff = true;
+bool lockRequestsFor10sec = false;
 
-void loop() { 
+void loop() {
  unsigned long currentMillis = millis();
- 
+
+ if (currentMillis - previousMillisRele > intervalRele) {
+ lockRequestsFor10sec = false;
+ } else {
+ lockRequestsFor10sec = true;
+ Heltec.display -> clear();
+ Heltec.display -> drawString(0, 0, lastCommand);
+ Heltec.display -> display();
+ }
+
  if (isLedOff) {
+ delay(2000);
  isLedOff = false;
  //Reset rele
  digitalWrite(RELE_1, LOW);
  digitalWrite(RELE_2, LOW);
  }
 
- if(currentMillis - previousMillisLed > intervalLed){
+ if (currentMillis - previousMillisLed > intervalLed) {
  digitalWrite(RELE_3, LOW);
  //ESP.restart();
  }
 
- if(isLoRaOnSenderMode)
+ if (isLoRaOnSenderMode)
  {
  isLoRaOnSenderMode = false;
- 
+
+ Heltec.display -> clear();
+ Heltec.display -> drawString(0, 0, lastCommand);
+ Heltec.display -> display();
+
  String outgoing = lastCommand;
 
- for(int i = 0; i < 10; i++){
+ for (int i = 0; i < 10; i++) {
  // send packet
  LoRa.beginPacket();
- 
+
  LoRa.write(destination); // add destination address
  LoRa.write(localAddress); // add sender address
  LoRa.write(outgoing.length()); // add payload length
  LoRa.print(outgoing); // add payload
- 
+
  LoRa.endPacket();
+ delay(2000);
  }
- 
+
  // put the radio into receive mode
  LoRa.receive();
  }
@@ -91,6 +113,7 @@ void loop() {
 String r1 = String(RELE_1, DEC);
 String r2 = String(RELE_2, DEC);
 String r3 = String(RELE_3, DEC);
+String r0 = "0";
 
 String read_r1 = String(RELE_READ_1, DEC);
 String read_r2 = String(RELE_READ_2, DEC);
@@ -134,68 +157,76 @@ void onReceive(int packetSize)
  Serial.println("RSSI: " + String(LoRa.packetRssi()));
  Serial.println("Snr: " + String(LoRa.packetSnr()));
  Serial.println();
- 
+
  // received a packet
  String str = incoming;
 
- if(str.indexOf("p : ") == 0)
- { 
- if(str.indexOf(r1) > 0)
- {
- setRele1();
- }
- if(str.indexOf(r2) > 0)
- {
- setRele2();
- }
- if(str.indexOf(r3) > 0)
- {
- setRele3();
+ if (str.indexOf("p : ") == 0)
+ {
+ if (lockRequestsFor10sec == false) {
+ lastCommand = str;
+ previousMillisRele = millis();
+ isLedOff = true;
+ if (str.indexOf(r1) > 0)
+ {
+ setRele1();
+ }
+ if (str.indexOf(r2) > 0)
+ {
+ setRele2();
+ }
+ if (str.indexOf(r3) > 0)
+ {
+ setRele3();
+ }
+ if (str.indexOf(r0) > 0)
+ {
+ setRele0();
+ }
  }
-
- lastCommand = str;
-
- isLoRaOnSenderMode = true;
  }
- 
- if(str.indexOf("r : ") == 0)
+
+ if (str.indexOf("r : ") == 0)
  {
  val = "";
- if(str.indexOf(read_r1) > 0)
+ if (str.indexOf(read_r1) > 0)
  {
  val = readRele1();
  }
- else if(str.indexOf(read_r2) > 0)
+ else if (str.indexOf(read_r2) > 0)
  {
  val = readRele2();
  }
 
- isLoRaOnSenderMode = true;
-
  lastCommand = str + " " + val;
+
+ isLoRaOnSenderMode = true;
  }
 }
 
+void setRele0()
+{
+ digitalWrite(RELE_1, HIGH);
+ digitalWrite(RELE_2, HIGH);
+ digitalWrite(RELE_3, HIGH); // LUCI LED
+
+ previousMillisLed = millis();
+}
 void setRele1()
 {
- isLedOff = true;
  digitalWrite(RELE_1, HIGH);
  digitalWrite(RELE_3, HIGH); // LUCI LED
- delay(2000);
 
  previousMillisLed = millis();
 }
 
 void setRele2()
 {
- isLedOff = true;
  digitalWrite(RELE_2, HIGH);
  digitalWrite(RELE_3, HIGH); // LUCI LED
- delay(2000);
 
  previousMillisLed = millis();
 }
-
 void setRele3()
 {
  digitalWrite(RELE_3, HIGH);