Skip to content

Commit cfc11bf

Browse files
committed
Rename the LED pins to use the color and number
1 parent 890588c commit cfc11bf

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

Firmware/LoRaSerial/Arch_SAMD.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ void samdBeginBoard()
7777
pin_rst = 6;
7878
pin_cts = 30;
7979
pin_rts = 38;
80-
pin_txLED = 31;
81-
pin_rxLED = A5;
82-
pin_rssi1LED = A3;
83-
pin_rssi2LED = A4;
84-
pin_rssi3LED = 8;
85-
pin_rssi4LED = 9;
80+
pin_blue_LED = 31;
81+
pin_yellow_LED = A5;
82+
pin_green_1_LED = A3;
83+
pin_green_2_LED = A4;
84+
pin_green_3_LED = 8;
85+
pin_green_4_LED = 9;
8686

8787
pin_trainButton = 4;
8888

@@ -96,19 +96,19 @@ void samdBeginBoard()
9696
pinMode(pin_cts, INPUT_PULLUP);
9797

9898
//LEDs
99-
pinMode(pin_rssi1LED, OUTPUT);
100-
digitalWrite(pin_rssi1LED, LOW);
101-
pinMode(pin_rssi2LED, OUTPUT);
102-
digitalWrite(pin_rssi2LED, LOW);
103-
pinMode(pin_rssi3LED, OUTPUT);
104-
digitalWrite(pin_rssi3LED, LOW);
105-
pinMode(pin_rssi4LED, OUTPUT);
106-
digitalWrite(pin_rssi4LED, LOW);
107-
108-
pinMode(pin_txLED, OUTPUT);
109-
digitalWrite(pin_txLED, LOW);
110-
pinMode(pin_rxLED, OUTPUT);
111-
digitalWrite(pin_rxLED, LOW);
99+
pinMode(pin_green_1_LED, OUTPUT);
100+
digitalWrite(pin_green_1_LED, LOW);
101+
pinMode(pin_green_2_LED, OUTPUT);
102+
digitalWrite(pin_green_2_LED, LOW);
103+
pinMode(pin_green_3_LED, OUTPUT);
104+
digitalWrite(pin_green_3_LED, LOW);
105+
pinMode(pin_green_4_LED, OUTPUT);
106+
digitalWrite(pin_green_4_LED, LOW);
107+
108+
pinMode(pin_blue_LED, OUTPUT);
109+
digitalWrite(pin_blue_LED, LOW);
110+
pinMode(pin_yellow_LED, OUTPUT);
111+
digitalWrite(pin_yellow_LED, LOW);
112112

113113
//Train button input
114114
pinMode(pin_trainButton, INPUT_PULLUP);

Firmware/LoRaSerial/LoRaSerial.ino

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ uint8_t pin_dio0 = PIN_UNDEFINED;
9797
uint8_t pin_dio1 = PIN_UNDEFINED;
9898
uint8_t pin_rts = PIN_UNDEFINED;
9999
uint8_t pin_cts = PIN_UNDEFINED;
100-
uint8_t pin_txLED = PIN_UNDEFINED;
101-
uint8_t pin_rxLED = PIN_UNDEFINED;
100+
uint8_t pin_blue_LED = PIN_UNDEFINED;
101+
uint8_t pin_yellow_LED = PIN_UNDEFINED;
102102
uint8_t pin_trainButton = PIN_UNDEFINED;
103-
uint8_t pin_rssi1LED = PIN_UNDEFINED;
104-
uint8_t pin_rssi2LED = PIN_UNDEFINED;
105-
uint8_t pin_rssi3LED = PIN_UNDEFINED;
106-
uint8_t pin_rssi4LED = PIN_UNDEFINED;
103+
uint8_t pin_green_1_LED = PIN_UNDEFINED;
104+
uint8_t pin_green_2_LED = PIN_UNDEFINED;
105+
uint8_t pin_green_3_LED = PIN_UNDEFINED;
106+
uint8_t pin_green_4_LED = PIN_UNDEFINED;
107107
uint8_t pin_boardID = PIN_UNDEFINED;
108108

109109
uint8_t pin_trigger = PIN_UNDEFINED;
@@ -125,12 +125,12 @@ uint8_t pin_hop_timer = PIN_UNDEFINED;
125125
USB Serial
126126
*/
127127

128-
#define GREEN_LED_1 pin_rssi1LED //Top right
129-
#define GREEN_LED_2 pin_rssi2LED
130-
#define GREEN_LED_3 pin_rssi3LED
131-
#define GREEN_LED_4 pin_rssi4LED //Top left
132-
#define BLUE_LED pin_txLED
133-
#define YELLOW_LED pin_rxLED //Bottom right
128+
#define GREEN_LED_1 pin_green_1_LED //Top right
129+
#define GREEN_LED_2 pin_green_2_LED
130+
#define GREEN_LED_3 pin_green_3_LED
131+
#define GREEN_LED_4 pin_green_4_LED //Top left
132+
#define BLUE_LED pin_blue_LED
133+
#define YELLOW_LED pin_yellow_LED //Bottom right
134134

135135
#define RADIO_USE_BLINK_MILLIS 15
136136

Firmware/LoRaSerial/System.ino

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -578,24 +578,24 @@ void dumpCircularBuffer(uint8_t * buffer, uint16_t tail, uint16_t bufferLength,
578578
void setRSSI(uint8_t ledBits)
579579
{
580580
if (ledBits & 0b0001)
581-
digitalWrite(pin_rssi1LED, HIGH);
581+
digitalWrite(pin_green_1_LED, HIGH);
582582
else
583-
digitalWrite(pin_rssi1LED, LOW);
583+
digitalWrite(pin_green_1_LED, LOW);
584584

585585
if (ledBits & 0b0010)
586-
digitalWrite(pin_rssi2LED, HIGH);
586+
digitalWrite(pin_green_2_LED, HIGH);
587587
else
588-
digitalWrite(pin_rssi2LED, LOW);
588+
digitalWrite(pin_green_2_LED, LOW);
589589

590590
if (ledBits & 0b0100)
591-
digitalWrite(pin_rssi3LED, HIGH);
591+
digitalWrite(pin_green_3_LED, HIGH);
592592
else
593-
digitalWrite(pin_rssi3LED, LOW);
593+
digitalWrite(pin_green_3_LED, LOW);
594594

595595
if (ledBits & 0b1000)
596-
digitalWrite(pin_rssi4LED, HIGH);
596+
digitalWrite(pin_green_4_LED, HIGH);
597597
else
598-
digitalWrite(pin_rssi4LED, LOW);
598+
digitalWrite(pin_green_4_LED, LOW);
599599
}
600600

601601
//Start the cylon LEDs
@@ -694,12 +694,12 @@ void blinkSerialTxLed(bool illuminate)
694694
switch (settings.selectLedUse)
695695
{
696696
case LEDS_RSSI:
697-
if (pin_txLED != PIN_UNDEFINED)
697+
if (pin_blue_LED != PIN_UNDEFINED)
698698
{
699699
if (illuminate == true)
700-
digitalWrite(pin_txLED, HIGH);
700+
digitalWrite(pin_blue_LED, HIGH);
701701
else
702-
digitalWrite(pin_txLED, LOW);
702+
digitalWrite(pin_blue_LED, LOW);
703703
}
704704
break;
705705
}
@@ -712,9 +712,9 @@ void blinkSerialRxLed(bool illuminate)
712712
{
713713
case LEDS_RSSI:
714714
if (illuminate == true)
715-
digitalWrite(pin_rxLED, HIGH);
715+
digitalWrite(pin_yellow_LED, HIGH);
716716
else
717-
digitalWrite(pin_rxLED, LOW);
717+
digitalWrite(pin_yellow_LED, LOW);
718718
break;
719719

720720
case LEDS_VC:

0 commit comments

Comments
 (0)