Change to RSSI LEDs. Add TX/RX LED.

Author: nseidle

Firmware/LoRaSerial_Firmware/Commands.ino

@@ -54,8 +54,7 @@ void checkCommand()
           generateHopTable(); //Generate freq with new settings
           configureRadio(); //Apply any new settings
 
-          digitalWrite(pin_linkLED, LOW);
-          digitalWrite(pin_activityLED, LOW);
+          setRSSI(0); //Turn off LEDs
           if (settings.pointToPoint == true)
             changeState(RADIO_NO_LINK_RECEIVING_STANDBY);
           else
@@ -713,7 +712,7 @@ void displayParameters()
       systemPrint("R"); //If someone is asking for our settings over RF, respond with 'R' style settings
     else
       systemPrint("A");
-      
+
     systemPrint("TS");
     systemPrint(x);
     systemPrint(":");

Firmware/LoRaSerial_Firmware/LoRaSerial_Firmware.ino

@@ -69,18 +69,21 @@ uint8_t pin_dio0 = 255;
 uint8_t pin_dio1 = 255;
 uint8_t pin_rts = 255;
 uint8_t pin_cts = 255;
-uint8_t pin_linkLED = 255;
-uint8_t pin_activityLED = 255;
 uint8_t pin_txLED = 255;
 uint8_t pin_rxLED = 255;
-uint8_t pin_setupButton = 255;
+uint8_t pin_trainButton = 255;
+uint8_t pin_rssi1LED = 255;
+uint8_t pin_rssi2LED = 255;
+uint8_t pin_rssi3LED = 255;
+uint8_t pin_rssi4LED = 255;
+uint8_t pin_boardID = 255;
 
 uint8_t pin_trigger = 255;
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 //EEPROM for storing settings
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#if defined(ARDUINO_AVR_UNO) || defined(ARDUINO_ARCH_ESP32)
+#if defined(ARDUINO_ARCH_ESP32)
 
 #include <EEPROM.h>
 #define EEPROM_SIZE 1024 //ESP32 emulates EEPROM in non-volatile storage (external flash IC). Max is 508k.
@@ -123,20 +126,15 @@ WDTZero myWatchDog;
 #include <JC_Button.h> // http://librarymanager/All#JC_Button
 Button *trainBtn = NULL; //We can't instantiate the button here because we don't yet know what pin number to use
 
-const int trainButtonTime = 4000; //ms press and hold before entering training
-const int trainWithDefaultsButtonTime = 10000; //ms press and hold before entering training
+const int trainButtonTime = 2000; //ms press and hold before entering training
+const int trainWithDefaultsButtonTime = 5000; //ms press and hold before entering training
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Global variables - Serial
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 //Buffer to store bytes incoming from serial before broadcasting over LoRa
-#if defined(ARDUINO_AVR_UNO)
-//uint8_t serialReceiveBuffer[512]; //Conserve RAM due to limitations
-uint8_t serialReceiveBuffer[32]; //Conserve RAM due to limitations
-#else
 uint8_t serialReceiveBuffer[1024 * 4]; //Bytes received from UART waiting to be RF transmitted. Buffer up to 1s of bytes at 4k
 uint8_t serialTransmitBuffer[1024 * 4]; //Bytes received from RF waiting to be printed out UART. Buffer up to 1s of bytes at 4k
-#endif
 
 uint16_t txHead = 0;
 uint16_t txTail = 0;
@@ -152,7 +150,7 @@ uint16_t commandRXTail = 0;
 
 unsigned long lastByteReceived_ms = 0; //Track when last transmission was. Send partial buffer once time has expired.
 
-char platformPrefix[15]; //Used for printing platform specific device name
+char platformPrefix[25]; //Used for printing platform specific device name, ie "SAMD21 1W 915MHz"
 uint8_t escapeCharsReceived = 0; //Used to enter command mode
 unsigned long lastEscapeReceived_ms = 0; //Tracks end of serial traffic
 const long minEscapeTime_ms = 2000; //Serial traffic must stop this amount before an escape char is recognized
@@ -205,6 +203,9 @@ long startTime = 0; //Used for air time of TX frames
 long stopTime = 0;
 
 bool confirmDeliveryBeforeRadioConfig = false; //Goes true when we have remotely configured a radio
+
+int trainCylonNumber = 0b0001;
+int trainCylonDirection = -1;
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 void setup()

Firmware/LoRaSerial_Firmware/Radio.ino

@@ -323,8 +323,6 @@ void configureRadio()
 
 void returnToReceiving()
 {
-  digitalWrite(pin_activityLED, LOW);
-
   if (settings.autoTuneFrequency == true)
     radio.setFrequency(channels[radio.getFHSSChannel()] - frequencyCorrection);
   else
@@ -595,8 +593,6 @@ void sendPacket()
   if (settings.airSpeed == 28800 || settings.airSpeed == 38400)
     delay(2);
 
-  digitalWrite(pin_activityLED, HIGH);
-
   radio.setFrequency(channels[radio.getFHSSChannel()]); //Return home before every transmission
 
   LRS_DEBUG_PRINT("Transmitting @ ");
@@ -702,7 +698,7 @@ void generateHopTable()
 
   if (settings.encryptData == true)
   {
-    for (int x = 0 ; x < sizeof(settings.encryptionKey) ; x++)
+    for (uint8_t x = 0 ; x < sizeof(settings.encryptionKey) ; x++)
       myRandSeed += settings.encryptionKey[x];
   }
 
@@ -829,8 +825,6 @@ bool receiveInProcess()
 //3 is lowest allowed setting using SX1276+RadioLib
 uint8_t covertdBmToSetting(uint8_t userSetting)
 {
-  if(userSetting < 14) return 3; //Error check
-  
   switch (userSetting)
   {
     case 14: return (2); break;
@@ -852,6 +846,4 @@ uint8_t covertdBmToSetting(uint8_t userSetting)
     case 30: return (20); break;
     default: return (3); break;
   }
-
-
 }

Firmware/LoRaSerial_Firmware/Serial.ino

@@ -40,6 +40,8 @@ void updateSerial()
     {
       if (isCTS())
       {
+        txLED(true); //Turn on LED during serial transmissions
+
         //Print data to both ports
         for (int x = 0 ; x < availableTXBytes() ; x++)
         {
@@ -65,6 +67,8 @@ void updateSerial()
           txTail++;
           txTail %= sizeof(serialTransmitBuffer);
         }
+
+        txLED(false); //Turn off LED
       }
     }
   }
@@ -76,6 +80,8 @@ void updateSerial()
   while (Serial.available() && transactionComplete == false)
 #endif
   {
+    rxLED(true); //Turn on LED during serial reception
+
     //Take a break if there are ISRs to attend to
     petWDT();
     if (timeToHop == true) hopChannel();
@@ -158,6 +164,9 @@ void updateSerial()
       serialReceiveBuffer[rxHead++] = incoming; //Push char to holding buffer
       rxHead %= sizeof(serialReceiveBuffer);
     } //End process rx buffer
+
+    rxLED(false); //Turn off LED
+  
   } //End Serial.available()
 
   //Process any remote commands sitting in buffer

Firmware/LoRaSerial_Firmware/States.ino

@@ -17,7 +17,7 @@ void updateRadioState()
           hopChannel();
 
         //Check to see if we need to send a ping
-        else if ( (millis() - packetTimestamp) > (settings.heartbeatTimeout + random(0, 1000)) //Avoid pinging each other at same time
+        else if ( (millis() - packetTimestamp) > (unsigned int)(settings.heartbeatTimeout + random(0, 1000)) //Avoid pinging each other at same time
                   || sentFirstPing == false) //Immediately send pings at POR
         {
           if (receiveInProcess() == false)
@@ -46,7 +46,7 @@ void updateRadioState()
             //We're done transmitting our ack packet
             //Yay! Return to normal communication
             packetsLost = 0; //Reset, used for linkLost testing
-            digitalWrite(pin_linkLED, HIGH);
+            updateRSSI(); //Adjust LEDs to RSSI level. We will soon be linked.
             returnToReceiving();
             changeState(RADIO_LINKED_RECEIVING_STANDBY);
           }
@@ -96,7 +96,7 @@ void updateRadioState()
         {
           //Yay! Return to normal communication
           packetsLost = 0; //Reset, used for linkLost testing
-          digitalWrite(pin_linkLED, HIGH);
+          updateRSSI(); //Adjust LEDs to RSSI level
           returnToReceiving();
           changeState(RADIO_LINKED_RECEIVING_STANDBY);
         }
@@ -108,11 +108,14 @@ void updateRadioState()
         else if (packetType == PACKET_PING)
         {
           triggerEvent(TRIGGER_NOLINK_IDENT_PACKET);
+          updateRSSI(); //Adjust LEDs to RSSI level. We will soon be linked.
           sendAckPacket(); //Someone is pinging us
           changeState(RADIO_NO_LINK_TRANSMITTING);
         }
         else if (packetType == PACKET_DATA)
+        {
           ; //No data packets allowed when not linked
+        }
       }
       break;
 
@@ -122,7 +125,7 @@ void updateRadioState()
       {
         if (linkLost())
         {
-          digitalWrite(pin_linkLED, LOW);
+          setRSSI(0);
 
           //Return to home channel and begin linking process
           returnToReceiving();
@@ -139,7 +142,7 @@ void updateRadioState()
         else if (timeToHop == true) //If the dio1ISR has fired, move to next frequency
           hopChannel();
 
-        else if ((millis() - packetTimestamp) > (settings.heartbeatTimeout + random(0, 1000))) //Avoid pinging each other at same time
+        else if ((millis() - packetTimestamp) > (unsigned int)(settings.heartbeatTimeout + random(0, 1000))) //Avoid pinging each other at same time
         {
           if (receiveInProcess() == false)
           {
@@ -190,7 +193,7 @@ void updateRadioState()
                 sendCommandDataPacket();
               }
 
-              if(availableTXCommandBytes() == 0) 
+              if (availableTXCommandBytes() == 0)
                 printerEndpoint = PRINT_TO_SERIAL; //Once the response is received, we need to print it to serial
 
               changeState(RADIO_LINKED_TRANSMITTING);
@@ -285,6 +288,7 @@ void updateRadioState()
             systemPrintln();
           }
           packetsLost = 0; //Reset, used for linkLost testing
+          updateRSSI(); //Adjust LEDs to RSSI level
           frequencyCorrection += radio.getFrequencyError() / 1000000.0;
           returnToReceiving();
           changeState(RADIO_LINKED_RECEIVING_STANDBY);
@@ -294,6 +298,7 @@ void updateRadioState()
           //It's a duplicate. Ack then throw data away.
           triggerEvent(TRIGGER_LINK_DUPLICATE_PACKET);
           packetsLost = 0; //Reset, used for linkLost testing
+          updateRSSI(); //Adjust LEDs to RSSI level
           frequencyCorrection += radio.getFrequencyError() / 1000000.0;
           sendAckPacket();
           changeState(RADIO_LINKED_TRANSMITTING);
@@ -303,6 +308,7 @@ void updateRadioState()
           //Someone is pinging us. Ack back.
           triggerEvent(TRIGGER_LINK_CONTROL_PACKET);
           packetsLost = 0; //Reset, used for linkLost testing
+          updateRSSI(); //Adjust LEDs to RSSI level
           frequencyCorrection += radio.getFrequencyError() / 1000000.0;
           sendAckPacket();
           changeState(RADIO_LINKED_TRANSMITTING);
@@ -331,6 +337,7 @@ void updateRadioState()
           }
 
           packetsLost = 0; //Reset, used for linkLost testing
+          updateRSSI(); //Adjust LEDs to RSSI level
           frequencyCorrection += radio.getFrequencyError() / 1000000.0;
           sendAckPacket(); //Transmit ACK
           changeState(RADIO_LINKED_TRANSMITTING);
@@ -351,6 +358,7 @@ void updateRadioState()
           }
 
           packetsLost = 0; //Reset, used for linkLost testing
+          updateRSSI(); //Adjust LEDs to RSSI level
           frequencyCorrection += radio.getFrequencyError() / 1000000.0;
           sendCommandAckPacket(); //Transmit ACK
           changeState(RADIO_LINKED_TRANSMITTING);
@@ -363,6 +371,7 @@ void updateRadioState()
             Serial.write(lastPacket[x]);
 
           packetsLost = 0; //Reset, used for linkLost testing
+          updateRSSI(); //Adjust LEDs to RSSI level
           frequencyCorrection += radio.getFrequencyError() / 1000000.0;
           sendCommandResponseAckPacket(); //Transmit ACK
           changeState(RADIO_LINKED_TRANSMITTING);
@@ -378,8 +387,7 @@ void updateRadioState()
             generateHopTable(); //Generate freq with new settings
             configureRadio(); //Apply any new settings
 
-            digitalWrite(pin_linkLED, LOW);
-            digitalWrite(pin_activityLED, LOW);
+            setRSSI(0); //Turn off RSSI LEDs
             if (settings.pointToPoint == true)
               changeState(RADIO_NO_LINK_RECEIVING_STANDBY);
             else
@@ -388,6 +396,7 @@ void updateRadioState()
           else //It was just an ACK
           {
             packetsLost = 0; //Reset, used for linkLost testing
+            updateRSSI(); //Adjust LEDs to RSSI level
             frequencyCorrection += radio.getFrequencyError() / 1000000.0;
             returnToReceiving();
             changeState(RADIO_LINKED_RECEIVING_STANDBY);
@@ -440,11 +449,15 @@ void updateRadioState()
           if (millis() - lastLinkBlink > 500) //Blink at 2Hz
           {
             lastLinkBlink = millis();
-            digitalWrite(pin_linkLED, !digitalRead(pin_linkLED)); //Toggle LED
+            //Toggle all RSSI LEDs
+            if (digitalRead(pin_rssi1LED) == HIGH)
+              setRSSI(0);
+            else
+              setRSSI(0b1111); //All on
           }
         }
         else
-          digitalWrite(pin_linkLED, LOW); //No link
+          setRSSI(0); //No link
       }
       break;
 
@@ -455,7 +468,7 @@ void updateRadioState()
           transactionComplete = false; //Reset ISR flag
           returnToReceiving();
           changeState(RADIO_BROADCASTING_RECEIVING_STANDBY); //No ack response when in broadcasting mode
-          digitalWrite(pin_activityLED, LOW);
+          setRSSI(0); //Turn off RSSI LEDs
         }
 
         else if (timeToHop == true) //If the dio1ISR has fired, move to next frequency
@@ -518,14 +531,15 @@ void updateRadioState()
       }
       break;
 
+    //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
     case RADIO_TRAINING_TRANSMITTING:
       {
         if (transactionComplete == true) //If dio0ISR has fired, we are done transmitting
         {
           transactionComplete = false; //Reset ISR flag
           returnToReceiving();
           changeState(RADIO_TRAINING_ACK_WAIT);
-          digitalWrite(pin_activityLED, LOW);
         }
       }
       break;
@@ -556,6 +570,21 @@ void updateRadioState()
           transactionComplete = false; //Reset ISR flag
           changeState(RADIO_TRAINING_RECEIVED_PACKET);
         }
+        else if ( (millis() - lastTrainBlink) > 75) //Blink while unit waits in training state
+        {
+          lastTrainBlink = millis();
+
+          //Cylon the RSSI LEDs
+          setRSSI(trainCylonNumber);
+
+          if (trainCylonNumber == 0b1000 || trainCylonNumber == 0b0001)
+            trainCylonDirection *= -1; //Change direction
+
+          if(trainCylonDirection > 0)
+            trainCylonNumber <<= 1;
+          else
+            trainCylonNumber >>= 1;
+        }
       }
       break;