Move LMIC_startJoining() outside "#ifdef SINGLE_CHANNEL_GATEWAY" (#6), update version to 1.1.1
This commit is contained in:
parent
4d4f0545f7
commit
29533fa70e
@ -1,5 +1,7 @@
|
|||||||
## TTGO T-Beam Tracker for The Things Network
|
## TTGO T-Beam Tracker for The Things Network
|
||||||
|
|
||||||
|
Current version: 1.1.1
|
||||||
|
|
||||||
Uploads GPS data from the TTGO T-Beam to [The Things Network](https://www.thethingsnetwork.org) (TTN) and [TTN Mapper](https://ttnmapper.org) for tracking and determining signal strength of LoRaWAN gateways and nodes.
|
Uploads GPS data from the TTGO T-Beam to [The Things Network](https://www.thethingsnetwork.org) (TTN) and [TTN Mapper](https://ttnmapper.org) for tracking and determining signal strength of LoRaWAN gateways and nodes.
|
||||||
|
|
||||||
#### Based on the code from [xoseperez/ttgo-beam-tracker](https://github.com/xoseperez/ttgo-beam-tracker), with excerpts from [dermatthias/Lora-TTNMapper-T-Beam](https://github.com/dermatthias/Lora-TTNMapper-T-Beam) to fix an issue with incorrect GPS data being transmitted to The Things Network. I also added support for the 915 MHz frequency (North and South America). [lewisxhe/TTGO-T-Beam](https://github.com/lewisxhe/TTGO-T-Beam) was referenced for enabling use on the newer T-Beam board (Rev1).
|
#### Based on the code from [xoseperez/ttgo-beam-tracker](https://github.com/xoseperez/ttgo-beam-tracker), with excerpts from [dermatthias/Lora-TTNMapper-T-Beam](https://github.com/dermatthias/Lora-TTNMapper-T-Beam) to fix an issue with incorrect GPS data being transmitted to The Things Network. I also added support for the 915 MHz frequency (North and South America). [lewisxhe/TTGO-T-Beam](https://github.com/lewisxhe/TTGO-T-Beam) was referenced for enabling use on the newer T-Beam board (Rev1).
|
||||||
|
@ -33,7 +33,7 @@ void ttn_register(void (*callback)(uint8_t message));
|
|||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
#define APP_NAME "TTN MAP-TRACK"
|
#define APP_NAME "TTN MAP-TRACK"
|
||||||
#define APP_VERSION "1.1.0"
|
#define APP_VERSION "1.1.1"
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// Configuration
|
// Configuration
|
||||||
@ -41,7 +41,7 @@ void ttn_register(void (*callback)(uint8_t message));
|
|||||||
|
|
||||||
// Select which T-Beam board is being used. Only uncomment one.
|
// Select which T-Beam board is being used. Only uncomment one.
|
||||||
#define T_BEAM_V07 // AKA Rev0 (first board released)
|
#define T_BEAM_V07 // AKA Rev0 (first board released)
|
||||||
// #define T_BEAM_V10 // AKA Rev1 (second board released)
|
//#define T_BEAM_V10 // AKA Rev1 (second board released)
|
||||||
|
|
||||||
// Select the payload format. Change on TTN as well. Only uncomment one.
|
// Select the payload format. Change on TTN as well. Only uncomment one.
|
||||||
#define PAYLOAD_USE_FULL
|
#define PAYLOAD_USE_FULL
|
||||||
|
@ -115,7 +115,7 @@ void screen_loop() {
|
|||||||
if (axp.isVbusRemoveIRQ()) {
|
if (axp.isVbusRemoveIRQ()) {
|
||||||
baChStatus = "No Charging";
|
baChStatus = "No Charging";
|
||||||
}
|
}
|
||||||
Serial.println(baChStatus); //Prints charging status to screen
|
Serial.println(baChStatus); //Prints charging status to screen
|
||||||
digitalWrite(2, !digitalRead(2));
|
digitalWrite(2, !digitalRead(2));
|
||||||
axp.clearIRQ();
|
axp.clearIRQ();
|
||||||
}
|
}
|
||||||
|
@ -211,11 +211,11 @@ void ttn_join() {
|
|||||||
|
|
||||||
#elif defined(USE_OTAA)
|
#elif defined(USE_OTAA)
|
||||||
|
|
||||||
#ifdef SINGLE_CHANNEL_GATEWAY
|
|
||||||
// Make LMiC initialize the default channels, choose a channel, and
|
// Make LMiC initialize the default channels, choose a channel, and
|
||||||
// schedule the OTAA join
|
// schedule the OTAA join
|
||||||
LMIC_startJoining();
|
LMIC_startJoining();
|
||||||
|
|
||||||
|
#ifdef SINGLE_CHANNEL_GATEWAY
|
||||||
// LMiC will already have decided to send on one of the 3 default
|
// LMiC will already have decided to send on one of the 3 default
|
||||||
// channels; ensure it uses the one we want
|
// channels; ensure it uses the one we want
|
||||||
LMIC.txChnl = SINGLE_CHANNEL_GATEWAY;
|
LMIC.txChnl = SINGLE_CHANNEL_GATEWAY;
|
||||||
|
Loading…
Reference in New Issue
Block a user