Merge pull request #488 from LeeLeahy2/rename-led-pins

Rename the LED pins to use the color and number

Author: nseidle

Firmware/LoRaSerial/Arch_SAMD.h

@@ -77,12 +77,12 @@ void samdBeginBoard()
   pin_rst = 6;
   pin_cts = 30;
   pin_rts = 38;
-  pin_txLED = 31;
-  pin_rxLED = A5;
-  pin_rssi1LED = A3;
-  pin_rssi2LED = A4;
-  pin_rssi3LED = 8;
-  pin_rssi4LED = 9;
+  pin_blue_LED = 31;
+  pin_yellow_LED = A5;
+  pin_green_1_LED = A3;
+  pin_green_2_LED = A4;
+  pin_green_3_LED = 8;
+  pin_green_4_LED = 9;
 
   pin_trainButton = 4;
 
@@ -96,19 +96,19 @@ void samdBeginBoard()
   pinMode(pin_cts, INPUT_PULLUP);
 
   //LEDs
-  pinMode(pin_rssi1LED, OUTPUT);
-  digitalWrite(pin_rssi1LED, LOW);
-  pinMode(pin_rssi2LED, OUTPUT);
-  digitalWrite(pin_rssi2LED, LOW);
-  pinMode(pin_rssi3LED, OUTPUT);
-  digitalWrite(pin_rssi3LED, LOW);
-  pinMode(pin_rssi4LED, OUTPUT);
-  digitalWrite(pin_rssi4LED, LOW);
-
-  pinMode(pin_txLED, OUTPUT);
-  digitalWrite(pin_txLED, LOW);
-  pinMode(pin_rxLED, OUTPUT);
-  digitalWrite(pin_rxLED, LOW);
+  pinMode(pin_green_1_LED, OUTPUT);
+  digitalWrite(pin_green_1_LED, LOW);
+  pinMode(pin_green_2_LED, OUTPUT);
+  digitalWrite(pin_green_2_LED, LOW);
+  pinMode(pin_green_3_LED, OUTPUT);
+  digitalWrite(pin_green_3_LED, LOW);
+  pinMode(pin_green_4_LED, OUTPUT);
+  digitalWrite(pin_green_4_LED, LOW);
+
+  pinMode(pin_blue_LED, OUTPUT);
+  digitalWrite(pin_blue_LED, LOW);
+  pinMode(pin_yellow_LED, OUTPUT);
+  digitalWrite(pin_yellow_LED, LOW);
 
   //Train button input
   pinMode(pin_trainButton, INPUT_PULLUP);

Firmware/LoRaSerial/LoRaSerial.ino

@@ -97,13 +97,13 @@ uint8_t pin_dio0 = PIN_UNDEFINED;
 uint8_t pin_dio1 = PIN_UNDEFINED;
 uint8_t pin_rts = PIN_UNDEFINED;
 uint8_t pin_cts = PIN_UNDEFINED;
-uint8_t pin_txLED = PIN_UNDEFINED;
-uint8_t pin_rxLED = PIN_UNDEFINED;
+uint8_t pin_blue_LED = PIN_UNDEFINED;
+uint8_t pin_yellow_LED = PIN_UNDEFINED;
 uint8_t pin_trainButton = PIN_UNDEFINED;
-uint8_t pin_rssi1LED = PIN_UNDEFINED;
-uint8_t pin_rssi2LED = PIN_UNDEFINED;
-uint8_t pin_rssi3LED = PIN_UNDEFINED;
-uint8_t pin_rssi4LED = PIN_UNDEFINED;
+uint8_t pin_green_1_LED = PIN_UNDEFINED;
+uint8_t pin_green_2_LED = PIN_UNDEFINED;
+uint8_t pin_green_3_LED = PIN_UNDEFINED;
+uint8_t pin_green_4_LED = PIN_UNDEFINED;
 uint8_t pin_boardID = PIN_UNDEFINED;
 
 uint8_t pin_trigger = PIN_UNDEFINED;
@@ -125,12 +125,12 @@ uint8_t pin_hop_timer = PIN_UNDEFINED;
         USB            Serial
 */
 
-#define GREEN_LED_1         pin_rssi1LED //Top right
-#define GREEN_LED_2         pin_rssi2LED
-#define GREEN_LED_3         pin_rssi3LED
-#define GREEN_LED_4         pin_rssi4LED //Top left
-#define BLUE_LED            pin_txLED
-#define YELLOW_LED          pin_rxLED //Bottom right
+#define GREEN_LED_1         pin_green_1_LED //Top right
+#define GREEN_LED_2         pin_green_2_LED
+#define GREEN_LED_3         pin_green_3_LED
+#define GREEN_LED_4         pin_green_4_LED //Top left
+#define BLUE_LED            pin_blue_LED
+#define YELLOW_LED          pin_yellow_LED //Bottom right
 
 #define RADIO_USE_BLINK_MILLIS    15
 

Firmware/LoRaSerial/System.ino

@@ -578,24 +578,24 @@ void dumpCircularBuffer(uint8_t * buffer, uint16_t tail, uint16_t bufferLength,
 void setRSSI(uint8_t ledBits)
 {
   if (ledBits & 0b0001)
-    digitalWrite(pin_rssi1LED, HIGH);
+    digitalWrite(pin_green_1_LED, HIGH);
   else
-    digitalWrite(pin_rssi1LED, LOW);
+    digitalWrite(pin_green_1_LED, LOW);
 
   if (ledBits & 0b0010)
-    digitalWrite(pin_rssi2LED, HIGH);
+    digitalWrite(pin_green_2_LED, HIGH);
   else
-    digitalWrite(pin_rssi2LED, LOW);
+    digitalWrite(pin_green_2_LED, LOW);
 
   if (ledBits & 0b0100)
-    digitalWrite(pin_rssi3LED, HIGH);
+    digitalWrite(pin_green_3_LED, HIGH);
   else
-    digitalWrite(pin_rssi3LED, LOW);
+    digitalWrite(pin_green_3_LED, LOW);
 
   if (ledBits & 0b1000)
-    digitalWrite(pin_rssi4LED, HIGH);
+    digitalWrite(pin_green_4_LED, HIGH);
   else
-    digitalWrite(pin_rssi4LED, LOW);
+    digitalWrite(pin_green_4_LED, LOW);
 }
 
 //Start the cylon LEDs
@@ -694,12 +694,12 @@ void blinkSerialTxLed(bool illuminate)
   switch (settings.selectLedUse)
   {
     case LEDS_RSSI:
-      if (pin_txLED != PIN_UNDEFINED)
+      if (pin_blue_LED != PIN_UNDEFINED)
       {
         if (illuminate == true)
-          digitalWrite(pin_txLED, HIGH);
+          digitalWrite(pin_blue_LED, HIGH);
         else
-          digitalWrite(pin_txLED, LOW);
+          digitalWrite(pin_blue_LED, LOW);
       }
       break;
   }
@@ -712,9 +712,9 @@ void blinkSerialRxLed(bool illuminate)
   {
     case LEDS_RSSI:
       if (illuminate == true)
-        digitalWrite(pin_rxLED, HIGH);
+        digitalWrite(pin_yellow_LED, HIGH);
       else
-        digitalWrite(pin_rxLED, LOW);
+        digitalWrite(pin_yellow_LED, LOW);
       break;
 
     case LEDS_VC: