merge with master

master_sq9mdd
Christian OE3CJB Bauer 2021-01-01 19:58:00 +01:00
rodzic f0b4f1e98e
commit b762577a89
3 zmienionych plików z 7 dodań i 5 usunięć

Wyświetl plik

@ -42,6 +42,8 @@ Now the BME280 is supported as well - uncomment line 38: // #define USE_BME280
by uncommenting <b>// #define SHOW_RX_PACKET</b> the tracker shows received LoRa APRS packets in raw format for the time in milliseconds defined in SHOW_RX_TIME - both in ...config.h<br>
<br>
<b>new features:</b><br>
- Trackermode setable via config file
- BME280 sensor implemented (Temp und Hum only)
- compressed packets in tracker mode
- symbol RV added
- show RX packets

Wyświetl plik

@ -249,7 +249,7 @@ void setup_data(void);
DHTesp dht; // Initialize DHT sensor for normal 16mhz Arduino
#endif
#endif
boolean tempsensoravailable=true;
// SoftwareSerial ss(RXPin, TXPin); // The serial connection to the GPS device
HardwareSerial ss(1); // TTGO has HW serial
@ -448,8 +448,8 @@ void setup()
if (!bme_status)
{
Serial.println("Could not find a valid BME280 sensor, check wiring!");
writedisplaytext("LoRa-APRS","","Init:","BME280 ERROR!","","",250);
while (1);
writedisplaytext("LoRa-APRS","","Init:","BME280 ERROR!","","",3000);
tempsensoravailable = false;
}
#else
dht.setup(DHTPIN,dht.AUTO_DETECT); // initialize DHT22

Wyświetl plik

@ -35,13 +35,13 @@
// SET temperature sensor type
// #define DS18B20 // use this if you use DS18B20, default is DHT22
#define USE_BME280 // use this if you use BME280,m default is DHT22
// #define USE_BME280 // use this if you use BME280,m default is DHT22
// USER DATA - USE THESE LINES TO MODIFY YOUR PREFERENCES
// IF NOT CHANGED you have to go through the configuration routine at first boot up of the TTGO T-Beam
// #define DONT_USE_FLASH_MEMORY // uncomment if you don't want to use Flashmemory - instead data below must be corrected
#define TRACKERMODE 0 // 0=TRACKER, 1=WX_TRACKER, 2=WX_MOVE, 3=WX_FIXED
#define TRACKERMODE 0 // preset MODE here, if flash not used >> 0=TRACKER, 1=WX_TRACKER, 2=WX_MOVE, 3=WX_FIXED
#define CALLSIGN "OE3CJB-11" // enter your callsign here - less then 6 letter callsigns please add "spaces" so total length is 6 (without SSID)
#define WX_CALLSIGN "OE3CJB-11" // use same callsign but you can use different SSID
#define LONGITUDE_PRESET "01539.85E" // please in APRS notation DDDMM.mmE or DDDMM.mmW