Merge branch 'master' of https://github.com/SQ9MDD/TTGO-T-Beam-LoRa-APRS into master_sq9mdd
Conflicts: src/TTGO_T-Beam_LoRa_APRS.ino src/TTGO_T-Beam_LoRa_APRS_config.hpull/10/head
commit
d4649e96c9
|
@ -12,6 +12,7 @@
|
|||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/src",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/lib/KISS_TO_TNC2",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/lib/BG_RF95",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/.pio/libdeps/ttgo-t-beam/OneWire",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/.pio/libdeps/ttgo-t-beam/AXP202X_Library/src",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/.pio/libdeps/ttgo-t-beam/Adafruit Unified Sensor",
|
||||
|
@ -87,7 +88,6 @@
|
|||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src",
|
||||
|
@ -117,6 +117,7 @@
|
|||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/src",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/lib/KISS_TO_TNC2",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/lib/BG_RF95",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/.pio/libdeps/ttgo-t-beam/OneWire",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/.pio/libdeps/ttgo-t-beam/AXP202X_Library/src",
|
||||
"e:/Dokumenty/GitHub/TTGO-T-Beam-LoRa-APRS/.pio/libdeps/ttgo-t-beam/Adafruit Unified Sensor",
|
||||
|
@ -192,7 +193,6 @@
|
|||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src",
|
||||
"C:/Users/rysiek/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src",
|
||||
|
|
|
@ -45,10 +45,19 @@ int button_ctr=0;
|
|||
|
||||
|
||||
// LED for signalling
|
||||
const byte TXLED = 33; //pin number for LED on TX Tracker
|
||||
#ifdef T_BEAM_V1_0
|
||||
const byte TXLED = 4; //pin number for LED on TX Tracker
|
||||
#else
|
||||
const byte TXLED = 14; //pin number for LED on TX Tracker
|
||||
#endif
|
||||
|
||||
// Button of TTGO T-Beam
|
||||
#define BUTTON 38 //pin number for Button on TTGO T-Beam
|
||||
#ifdef T_BEAM_V1_0
|
||||
// const byte BUTTON = 38; //pin number for Button on TTGO T-Beam
|
||||
#define BUTTON 38 //pin number for Button on TTGO T-Beam
|
||||
#else
|
||||
#define BUTTON 39 //pin number for Button on TTGO T-Beam
|
||||
#endif
|
||||
|
||||
// Pins for LoRa module
|
||||
const byte lora_PReset = 23; //pin where LoRa device reset line is connected
|
||||
|
@ -111,8 +120,9 @@ void displayInvalidGPS();
|
|||
|
||||
void handleKISSData(char character);
|
||||
|
||||
|
||||
#ifdef T_BEAM_V1_0
|
||||
AXP20X_Class axp;
|
||||
#endif
|
||||
|
||||
// checkRX
|
||||
uint8_t loraReceivedLength = sizeof(lora_RXBUFF);
|
||||
|
@ -312,8 +322,9 @@ void setup(){
|
|||
Serial.begin(115200);
|
||||
Wire.begin(I2C_SDA, I2C_SCL);
|
||||
|
||||
if (!axp.begin(Wire, AXP192_SLAVE_ADDRESS)) {
|
||||
}
|
||||
#ifdef T_BEAM_V1_0
|
||||
if (!axp.begin(Wire, AXP192_SLAVE_ADDRESS)) {
|
||||
}
|
||||
|
||||
axp.setPowerOutPut(AXP192_LDO2, AXP202_ON);
|
||||
axp.setPowerOutPut(AXP192_LDO3, AXP202_ON); // switch on GPS
|
||||
|
@ -323,7 +334,7 @@ void setup(){
|
|||
axp.setDCDC1Voltage(3300);
|
||||
axp.adc1Enable(0xfe, true);
|
||||
axp.adc2Enable(0x80, true);
|
||||
|
||||
#endif
|
||||
if(!display.begin(SSD1306_SWITCHCAPVCC, SSD1306_ADDRESS)) {
|
||||
for(;;); // Don't proceed, loop forever
|
||||
}
|
||||
|
@ -566,4 +577,4 @@ void displayInvalidGPS() {
|
|||
|
||||
}
|
||||
|
||||
// end of main loop
|
||||
// end of main loop
|
||||
|
|
|
@ -16,10 +16,11 @@
|
|||
#define SHOW_RX_PACKET // uncomment to show received LoRa APS packets for the time given below
|
||||
#define SHOW_RX_TIME 10000 // show RX packet for milliseconds (5000 = 5secs)
|
||||
#define TXFREQ 433.775 // Transmit frequency in MHz
|
||||
#define TXdbmW 20 // Transmit power in dBm 17-50mW, 18-63mW, 19-80mW, 20-100mW
|
||||
#define TXdbmW 17 // Transmit power in dBm 17-50mW, 18-63mW, 19-80mW, 20-100mW
|
||||
//#define SHOW_GPS_DATA // uncomment to show on serial port, received data from GPS and debug information
|
||||
#define ENABLE_BLUETOOTH
|
||||
//#define BLUETOOTH_PIN "0000"
|
||||
#define T_BEAM_V1_0 // if enabled t-beam v1.0 disabled t-beam V.0.7
|
||||
//#define KISS_DEBUG
|
||||
|
||||
unsigned long max_time_to_nextTX = 180000L; // TRANSMIT INTERVAL set here MAXIMUM time in ms(!) for smart beaconing - minimum time is always 1 min = 60 secs = 60000L !!!
|
Loading…
Reference in New Issue