Oled and LED signaling disable from config

pull/22/head
Rysiek Labus 2021-03-05 19:05:08 +01:00
rodzic 7e4657ac91
commit 781d7e3afd
3 zmienionych plików z 25 dodań i 9 usunięć

Wyświetl plik

@ -255,7 +255,9 @@ void sendpacket(){
* @param message
*/
void loraSend(byte lora_LTXPower, float lora_FREQ, const String &message) {
digitalWrite(TXLED, LOW);
#ifdef ENABLE_LED_SIGNALING
digitalWrite(TXLED, LOW);
#endif
lastTX = millis();
int messageSize = min(message.length(), sizeof(lora_TXBUFF) - 1);
@ -265,7 +267,9 @@ void loraSend(byte lora_LTXPower, float lora_FREQ, const String &message) {
rf95.setTxPower(lora_LTXPower);
rf95.sendAPRS(lora_TXBUFF, messageSize);
rf95.waitPacketSent();
digitalWrite(TXLED, HIGH);
#ifdef ENABLE_LED_SIGNALING
digitalWrite(TXLED, HIGH);
#endif
}
void batt_read(){
@ -280,7 +284,9 @@ void writedisplaytext(String HeaderTxt, String Line1, String Line2, String Line3
batt_read();
if (BattVolts < 3.5 && BattVolts > 3.2){
#ifdef T_BEAM_V1_0
# ifdef ENABLE_LED_SIGNALING
axp.setChgLEDMode(AXP20X_LED_BLINK_4HZ);
#endif
#endif
}
display.clearDisplay();
@ -473,11 +479,15 @@ void setup(){
#ifdef T_BEAM_V1_0
if (!axp.begin(Wire, AXP192_SLAVE_ADDRESS)) {
}
axp.setPowerOutPut(AXP192_LDO2, AXP202_ON);
axp.setPowerOutPut(AXP192_LDO2, AXP202_ON); // LoRa
axp.setPowerOutPut(AXP192_LDO3, AXP202_ON); // switch on GPS
axp.setPowerOutPut(AXP192_DCDC2, AXP202_ON);
axp.setPowerOutPut(AXP192_EXTEN, AXP202_ON);
axp.setPowerOutPut(AXP192_DCDC1, AXP202_ON);
#ifdef ENABLE_OLED
axp.setPowerOutPut(AXP192_DCDC1, AXP202_ON); // enable oled
#else
axp.setPowerOutPut(AXP192_DCDC1, AXP202_OFF); // disable oled
#endif
axp.setDCDC1Voltage(3300);
// Enable ADC to measure battery current, USB voltage etc.
axp.adc1Enable(0xfe, true);
@ -634,7 +644,9 @@ void loop() {
if (rf95.waitAvailableTimeout(100)) {
#ifdef T_BEAM_V1_0
axp.setChgLEDMode(AXP20X_LED_LOW_LEVEL);
#ifdef ENABLE_LED_SIGNALING
axp.setChgLEDMode(AXP20X_LED_LOW_LEVEL);
#endif
#endif
#ifdef SHOW_RX_PACKET // only show RX packets when activitated in config
loraReceivedLength = sizeof(lora_RXBUFF); // reset max length before receiving!
@ -652,7 +664,9 @@ void loop() {
}
#endif
#ifdef T_BEAM_V1_0
axp.setChgLEDMode(AXP20X_LED_OFF);
#ifdef ENABLE_LED_SIGNALING
axp.setChgLEDMode(AXP20X_LED_OFF);
#endif
#endif
}

Wyświetl plik

@ -22,6 +22,8 @@
#define TXFREQ 433.775 // Set transmit frequency in MHz
#define TXdbmW 20 // Set transmit power in dBm 17-50mW, 18-63mW, 19-80mW, 20-100mW
#define ENABLE_BLUETOOTH // bluetooth KISS interface enable
#define ENABLE_OLED // enable oled
//#define ENABLE_LED_SIGNALING // enable red and blue led signalling
//#define BLUETOOTH_PIN "0000" // bluetooth pairing pin
//#define ENABLE_TNC_SELF_TELEMETRY //
//#define LOCAL_KISS_ECHO // echoing KISS frame back
@ -32,4 +34,4 @@
//#define ENABLE_WIFI_CLIENT_DEBUG //
#define MAX_TIME_TO_NEXT_TX 360000L // TRANSMIT INTERVAL set here MAXIMUM time in ms(!) for smart beaconing - minimum time is always 1 min = 60 secs = 60000L !!!
#define FIX_BEACON_INTERVAL 1800000L // Fixed beacon interwal (when GPS is disabled and FIXED_BEACON_EN is enabled) 30min default
#define TNC_SELF_TELEMETRY_INTERVAL (5 * 60 * 1000) //
//#define TNC_SELF_TELEMETRY_INTERVAL (5 * 60 * 1000) //

Wyświetl plik

@ -6,9 +6,9 @@ SFE_UBLOX_GPS myGPS;
// Pins for GPS
#ifdef T_BEAM_V1_0
static const int RXPin = 12, TXPin = 34;
static const int RXPin = 12, TXPin = 34;
#else
static const int RXPin = 15, TXPin = 12;
static const int RXPin = 15, TXPin = 12;
#endif
static const uint32_t GPSBaud = 9600; //GPS
HardwareSerial gpsSerial(1); // TTGO has HW serial