diff --git a/src/Lora_1W_APRS_Tracker.cpp b/src/Lora_1W_APRS_Tracker.cpp index 2ddd8b9..5d1348a 100644 --- a/src/Lora_1W_APRS_Tracker.cpp +++ b/src/Lora_1W_APRS_Tracker.cpp @@ -32,7 +32,7 @@ void setup_lora_module() { int state = radio.begin(LoraFreqTx, LoraBandWidth, LoraSpreadingFactor, LoraCodingRate, LoraSyncWord, LoraOutro, LoraPreampbleLenght); radio.setOutputPower(Lora_Power); radio.setRfSwitchPins(RXEN, TXEN); - if (state == RADIOLIB_ERR_NONE) { + if (state == RADIOLIB_ERR_NONE) { Serial.println(F("LORA (1 Watt) MODULE Ready (Radiolib success!)")); } else { Serial.println(F("Lora Module Setup failed, code ")); diff --git a/src/beacon_config.h b/src/beacon_config.h index 7263aa7..8cd3e92 100644 --- a/src/beacon_config.h +++ b/src/beacon_config.h @@ -1,13 +1,13 @@ #ifndef BEACON_CONFIG_H_ #define BEACON_CONFIG_H_ -#define SlowRate 120 // Seg -#define SlowSpeed 10 // Km/h (3 Runner , 5 Bike, 10 Car) -#define FastRate 60 // Seg -#define FastSpeed 20 // Km/h (20 Runner y Bike, 70 Car) -#define TurnDegrees 20 // Degrees before Forced Beacon Tx (20 Car , 15 Bike/Runner) -#define MinimumDistanceTx 30 // Mts (20 Runner, 100 Car/Bike) -#define MinimumTimeDeltaBeacon 5 // Seg between Tx +#define SlowRate 120 // Seg +#define SlowSpeed 10 // Km/h (3 Runner , 5 Bike, 10 Car) +#define FastRate 60 // Seg +#define FastSpeed 20 // Km/h (20 Runner y Bike, 70 Car) +#define TurnDegrees 20 // Degrees before Forced Beacon Tx (20 Car , 15 Bike/Runner) +#define MinimumDistanceTx 30 // Mts (20 Runner, 100 Car/Bike) +#define MinimumTimeDeltaBeacon 5 // Seg between Tx #define SendAltitude true // "true" adds Altitude to the APRS packet/message, "false" add Course+Speed #define SendComment false // "true" adds comment to the APRS packet/message diff --git a/src/lora_config.h b/src/lora_config.h index 5ccf404..dd6eee7 100644 --- a/src/lora_config.h +++ b/src/lora_config.h @@ -1,13 +1,13 @@ #ifndef LORA_CONFIG_H_ #define LORA_CONFIG_H_ -#define LoraFreqTx 433.775 -#define LoraBandWidth 125.0 -#define LoraSpreadingFactor 12 -#define LoraCodingRate 5 -#define LoraSyncWord 0x12 -#define LoraOutro 5 -#define LoraPreampbleLenght 8 -#define Lora_Power 20 // Tx Power, 8=100mW, 20=1000mW +#define LoraFreqTx 433.775 +#define LoraBandWidth 125.0 +#define LoraSpreadingFactor 12 +#define LoraCodingRate 5 +#define LoraSyncWord 0x12 +#define LoraOutro 5 +#define LoraPreampbleLenght 8 +#define Lora_Power 20 // Tx Power, 8=100mW, 20=1000mW #endif \ No newline at end of file diff --git a/src/pins.h b/src/pins.h index 34011db..2effd86 100644 --- a/src/pins.h +++ b/src/pins.h @@ -1,8 +1,8 @@ #ifndef PINS_H_ #define PINS_H_ -#define GPS_TXD 16 // Conection Pinout for GPS -#define GPS_RXD 17 +#define GPS_TXD 16 // Conection Pinout for GPS +#define GPS_RXD 17 /* GPS NEO-6M v.2----> ESP32 VCC 3.3V @@ -11,12 +11,12 @@ TXD 16 RXD 17 */ -#define NSS 5 // Conection Pinout Ebyte E22 400M30S LoRa Module -#define DIO1 12 -#define NRST 27 -#define BUSY 14 -#define RXEN 32 -#define TXEN 25 +#define NSS 5 // Conection Pinout Ebyte E22 400M30S LoRa Module +#define DIO1 12 +#define NRST 27 +#define BUSY 14 +#define RXEN 32 +#define TXEN 25 /* 400M30S-------------------> ESP32 1-2-3-4-5-11-12-20-22 GND