Skip to content

Commit 50d3ec4

Browse files
nseidlenseidle
authored
Merge pull request #487 from LeeLeahy2/define-led-use
Replace the mode specific defines with LED color defines
2 parents 9e7414d + 890588c commit 50d3ec4

File tree

2 files changed

+49
-46
lines changed

2 files changed

+49
-46
lines changed

‎Firmware/LoRaSerial/LoRaSerial.ino‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,28 +109,31 @@ uint8_t pin_boardID = PIN_UNDEFINED;
109109
uint8_t pin_trigger = PIN_UNDEFINED;
110110
uint8_t pin_hop_timer = PIN_UNDEFINED;
111111

112-
#define GREEN_LED_1 pin_rssi1LED
112+
/*
113+
Antenna Qwiic
114+
+---------------------------+
115+
| |
116+
| G4 G3 G2 G1 |
117+
| |
118+
| |
119+
| Red |
120+
| |
121+
| |
122+
| Blue Yellow |
123+
| |
124+
+---------------------------+
125+
USB Serial
126+
*/
127+
128+
#define GREEN_LED_1 pin_rssi1LED //Top right
113129
#define GREEN_LED_2 pin_rssi2LED
114130
#define GREEN_LED_3 pin_rssi3LED
115-
#define GREEN_LED_4 pin_rssi4LED
131+
#define GREEN_LED_4 pin_rssi4LED //Top left
116132
#define BLUE_LED pin_txLED
117-
#define YELLOW_LED pin_rxLED
133+
#define YELLOW_LED pin_rxLED //Bottom right
118134

119135
#define RADIO_USE_BLINK_MILLIS 15
120136

121-
#define RADIO_USE_RX_DATA_LED GREEN_LED_1 //Green
122-
#define RADIO_USE_LINK_LED GREEN_LED_2 //Green
123-
#define RADIO_USE_RSSI_LED GREEN_LED_3 //Green
124-
#define RADIO_USE_TX_DATA_LED GREEN_LED_4 //Green
125-
#define RADIO_USE_BAD_FRAMES_LED BLUE_LED //Blue
126-
#define RADIO_USE_BAD_CRC_LED YELLOW_LED //Yellow
127-
128-
#define LED_MP_HEARTBEAT BLUE_LED
129-
#define LED_MP_HOP_CHANNEL YELLOW_LED
130-
131-
#define CYLON_TX_DATA_LED BLUE_LED
132-
#define CYLON_RX_DATA_LED YELLOW_LED
133-
134137
#define LED_ON HIGH
135138
#define LED_OFF LOW
136139

‎Firmware/LoRaSerial/System.ino‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -664,12 +664,12 @@ void blinkRadioRssiLed()
664664
//The RSSI value ranges from -164 to 30 dB
665665
ledRssiPulseWidth = (150 + rssi) / 10;
666666
if (ledRssiPulseWidth > 0)
667-
digitalWrite(RADIO_USE_RSSI_LED, LED_ON);
667+
digitalWrite(GREEN_LED_3, LED_ON);
668668
}
669669

670670
//Check for time to turn off the LED
671671
else if ((currentMillis - ledPreviousRssiMillis) >= ledRssiPulseWidth)
672-
digitalWrite(RADIO_USE_RSSI_LED, LED_OFF);
672+
digitalWrite(GREEN_LED_3, LED_OFF);
673673
break;
674674

675675
//Update the 4 green LEDs based upon the RSSI value
@@ -719,9 +719,9 @@ void blinkSerialRxLed(bool illuminate)
719719

720720
case LEDS_VC:
721721
if (illuminate == true)
722-
digitalWrite(RADIO_USE_LINK_LED, HIGH);
722+
digitalWrite(GREEN_LED_2, HIGH);
723723
else
724-
digitalWrite(RADIO_USE_LINK_LED, LOW);
724+
digitalWrite(GREEN_LED_2, LOW);
725725
break;
726726
}
727727
}
@@ -733,19 +733,19 @@ void blinkRadioRxLed(bool on)
733733
{
734734
case LEDS_CYLON:
735735
if (on)
736-
digitalWrite(CYLON_RX_DATA_LED, LED_ON);
736+
digitalWrite(YELLOW_LED, LED_ON);
737737
else if ((millis() - linkDownTimer) >= RADIO_USE_BLINK_MILLIS)
738-
digitalWrite(CYLON_RX_DATA_LED, LED_OFF);
738+
digitalWrite(YELLOW_LED, LED_OFF);
739739
break;
740740

741741
case LEDS_MULTIPOINT:
742742
case LEDS_P2P:
743743
case LEDS_RADIO_USE:
744744
case LEDS_VC:
745745
if (on)
746-
digitalWrite(RADIO_USE_RX_DATA_LED, LED_ON);
746+
digitalWrite(GREEN_LED_1, LED_ON);
747747
else if ((millis() - linkDownTimer) >= RADIO_USE_BLINK_MILLIS)
748-
digitalWrite(RADIO_USE_RX_DATA_LED, LED_OFF);
748+
digitalWrite(GREEN_LED_1, LED_OFF);
749749
break;
750750
}
751751
}
@@ -757,19 +757,19 @@ void blinkRadioTxLed(bool on)
757757
{
758758
case LEDS_CYLON:
759759
if (on)
760-
digitalWrite(CYLON_TX_DATA_LED, LED_ON);
760+
digitalWrite(BLUE_LED, LED_ON);
761761
else if ((millis() - datagramTimer) >= RADIO_USE_BLINK_MILLIS)
762-
digitalWrite(CYLON_TX_DATA_LED, LED_OFF);
762+
digitalWrite(BLUE_LED, LED_OFF);
763763
break;
764764

765765
case LEDS_MULTIPOINT:
766766
case LEDS_P2P:
767767
case LEDS_RADIO_USE:
768768
case LEDS_VC:
769769
if (on)
770-
digitalWrite(RADIO_USE_TX_DATA_LED, LED_ON);
770+
digitalWrite(GREEN_LED_4, LED_ON);
771771
else if ((millis() - datagramTimer) >= RADIO_USE_BLINK_MILLIS)
772-
digitalWrite(RADIO_USE_TX_DATA_LED, LED_OFF);
772+
digitalWrite(GREEN_LED_4, LED_OFF);
773773
break;
774774
}
775775
}
@@ -796,7 +796,7 @@ void radioLeds()
796796
blinkRadioTxLed(false);
797797

798798
//Update the link LED
799-
digitalWrite(RADIO_USE_LINK_LED, isLinked() ? LED_ON : LED_OFF);
799+
digitalWrite(GREEN_LED_2, isLinked() ? LED_ON : LED_OFF);
800800

801801
//Update the RSSI LED
802802
blinkRadioRssiLed();
@@ -807,31 +807,31 @@ void radioLeds()
807807
{
808808
previousBadFrames = badFrames;
809809
badFramesMillis = currentMillis;
810-
digitalWrite(RADIO_USE_BAD_FRAMES_LED, LED_ON);
810+
digitalWrite(BLUE_LED, LED_ON);
811811
}
812812
else if (badFramesMillis && ((currentMillis - badFramesMillis) >= RADIO_USE_BLINK_MILLIS))
813813
{
814814
badFramesMillis = 0;
815-
digitalWrite(RADIO_USE_BAD_FRAMES_LED, LED_OFF);
815+
digitalWrite(BLUE_LED, LED_OFF);
816816
}
817817

818818
//Blink the bad CRC or duplicate frames LED
819819
if (settings.enableCRC16 && (badCrc != previousBadCrc))
820820
{
821821
previousBadCrc = badCrc;
822822
badCrcMillis = currentMillis;
823-
digitalWrite(RADIO_USE_BAD_CRC_LED, LED_ON);
823+
digitalWrite(YELLOW_LED, LED_ON);
824824
}
825825
if ((!settings.enableCRC16) && (duplicateFrames != previousBadCrc))
826826
{
827827
previousBadCrc = duplicateFrames;
828828
badCrcMillis = currentMillis;
829-
digitalWrite(RADIO_USE_BAD_CRC_LED, LED_ON);
829+
digitalWrite(YELLOW_LED, LED_ON);
830830
}
831831
else if (badCrcMillis && ((currentMillis - badCrcMillis) >= RADIO_USE_BLINK_MILLIS))
832832
{
833833
badCrcMillis = 0;
834-
digitalWrite(RADIO_USE_BAD_CRC_LED, LED_OFF);
834+
digitalWrite(YELLOW_LED, LED_OFF);
835835
}
836836
}
837837

@@ -847,11 +847,11 @@ void blinkHeartbeatLed(bool on)
847847
case LEDS_VC:
848848
if (on)
849849
{
850-
digitalWrite(LED_MP_HEARTBEAT, LED_ON);
850+
digitalWrite(BLUE_LED, LED_ON);
851851
ledHeartbeatMillis = millis();
852852
}
853853
else if ((millis() - ledHeartbeatMillis) > RADIO_USE_BLINK_MILLIS)
854-
digitalWrite(LED_MP_HEARTBEAT, LED_OFF);
854+
digitalWrite(BLUE_LED, LED_OFF);
855855
break;
856856
}
857857
}
@@ -865,9 +865,9 @@ void blinkChannelHopLed(bool on)
865865
case LEDS_P2P:
866866
case LEDS_VC:
867867
if (on)
868-
digitalWrite(LED_MP_HOP_CHANNEL, LED_ON);
868+
digitalWrite(YELLOW_LED, LED_ON);
869869
else if ((millis() - radioCallHistory[RADIO_CALL_hopChannel]) >= RADIO_USE_BLINK_MILLIS)
870-
digitalWrite(LED_MP_HOP_CHANNEL, LED_OFF);
870+
digitalWrite(YELLOW_LED, LED_OFF);
871871
break;
872872
}
873873
}
@@ -914,14 +914,14 @@ void multiPointLeds()
914914
blinkRadioTxLed(false);
915915

916916
//Update the sync LED
917-
digitalWrite(RADIO_USE_LINK_LED, isMultiPointSync() ? LED_ON : LED_OFF);
917+
digitalWrite(GREEN_LED_2, isMultiPointSync() ? LED_ON : LED_OFF);
918918

919919
//Update the RSSI LED
920920
blinkRadioRssiLed();
921921

922922
//Update the hop LED
923923
if ((millis() - radioCallHistory[RADIO_CALL_hopChannel]) >= RADIO_USE_BLINK_MILLIS)
924-
digitalWrite(LED_MP_HOP_CHANNEL, LED_OFF);
924+
digitalWrite(YELLOW_LED, LED_OFF);
925925

926926
//Update the HEARTBEAT LED
927927
blinkHeartbeatLed(false);
@@ -942,7 +942,7 @@ void p2pLeds()
942942

943943
//Update the hop LED
944944
if ((millis() - radioCallHistory[RADIO_CALL_hopChannel]) >= RADIO_USE_BLINK_MILLIS)
945-
digitalWrite(LED_MP_HOP_CHANNEL, LED_OFF);
945+
digitalWrite(YELLOW_LED, LED_OFF);
946946

947947
//Update the HEARTBEAT LED
948948
blinkHeartbeatLed(false);
@@ -969,23 +969,23 @@ void vcLeds()
969969

970970
//Turn on the RSSI LED
971971
else if (((currentMillis - blinkSyncMillis) >= (VC_SYNC_BLINK_RATE >> 1))
972-
&& (digitalRead(RADIO_USE_RSSI_LED) == LED_OFF))
973-
digitalWrite(RADIO_USE_RSSI_LED, LED_ON);
972+
&& (digitalRead(GREEN_LED_3) == LED_OFF))
973+
digitalWrite(GREEN_LED_3, LED_ON);
974974

975975
//Turn off the RSSI LED
976976
else if ((!virtualCircuitList[VC_SERVER].vcState)
977977
&& (((currentMillis - blinkSyncMillis) >= VC_SYNC_BLINK_RATE))
978-
&& (digitalRead(RADIO_USE_RSSI_LED) == LED_ON))
978+
&& (digitalRead(GREEN_LED_3) == LED_ON))
979979
{
980-
digitalWrite(RADIO_USE_RSSI_LED, LED_OFF);
980+
digitalWrite(GREEN_LED_3, LED_OFF);
981981
blinkSyncMillis = currentMillis;
982982
}
983983

984984
//Serial RX displayed on the LINK LED (GREEN_LED_2) by blinkSerialRxLed
985985

986986
//Update the hop LED
987987
if ((millis() - radioCallHistory[RADIO_CALL_hopChannel]) >= RADIO_USE_BLINK_MILLIS)
988-
digitalWrite(LED_MP_HOP_CHANNEL, LED_OFF);
988+
digitalWrite(YELLOW_LED, LED_OFF);
989989

990990
//Update the HEARTBEAT LED
991991
blinkHeartbeatLed(false);

0 commit comments

Comments
 (0)