ua1zbe
/
LoRa_APRS_Tracker111
mirror of https://github.com/richonguzman/LoRa_APRS_Tracker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1W LoRa 400M30S added

This commit is contained in:
richonguzman 2023-12-10 23:22:06 -03:00
parent 7cf40f6770
commit 7c5911ecf8
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LoRa_APRS_Tracker.cpp
View File

@ -34,7 +34,7 @@ BluetoothSerial SerialBT;
OneButton userButton = OneButton(BUTTON_PIN, true, true);
#endif
String versionDate = "2023.12.08";
String versionDate = "2023.12.11";
int myBeaconsIndex = 0;
int myBeaconsSize = Config.beacons.size();

16
src/lora_utils.cpp
View File

@ -20,7 +20,7 @@ bool enableInterrupt = true;
namespace LoRa_Utils {
void setFlag(void) {
#if defined(TTGO_T_Beam_V1_0_SX1268)
#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS)
transmissionFlag = true;
#endif
}
@ -93,15 +93,9 @@ namespace LoRa_Utils {
NOTIFICATION_Utils::beaconTxBeep();
}
#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS)
//Serial.print("Transmiting... ");
int state = radio.transmit("\x3c\xff\x01" + newPacket);
if (state == RADIOLIB_ERR_NONE) {
/*Serial.println(F("success!"));
Serial.print(F("[SX1268] Datarate:\t")); // print measured data rate
Serial.print(radio.getDataRate());
Serial.println(F(" bps"));*/
//Serial.println(F("success!"));
} else if (state == RADIOLIB_ERR_PACKET_TOO_LONG) {
Serial.println(F("too long!"));
} else if (state == RADIOLIB_ERR_TX_TIMEOUT) {
@ -137,10 +131,9 @@ namespace LoRa_Utils {
int inChar = LoRa.read();
loraPacket += (char)inChar;
}
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "LoRa","Receive data: %s", loraPacket.c_str());
}
#endif
#endif
#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS)
if (transmissionFlag) {
transmissionFlag = false;
@ -148,17 +141,14 @@ namespace LoRa_Utils {
int state = radio.readData(loraPacket);
if (state == RADIOLIB_ERR_NONE) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "LoRa","Receive data: %s", loraPacket.c_str());
//Serial.print(F("[SX1268] Data:\t\t")); Serial.println(loraPacket);
} else if (state == RADIOLIB_ERR_RX_TIMEOUT) {
// timeout occurred while waiting for a packet
//Serial.println(F("timeout!"));
} else if (state == RADIOLIB_ERR_CRC_MISMATCH) {
Serial.println(F("CRC error!"));
} else {
Serial.print(F("failed, code "));
Serial.println(state);
}
//radio.startReceive();
}
#endif
return loraPacket;