lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2026-04-05 06:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Digipeater - Different LoRa Settings for RX and TX"

Browse source
This commit is contained in:
Peter Buchegger 2021-09-19 21:36:51 +02:00 • committed by GitHub
parent b2d5f507d9
commit f8dfdc1246
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

79
lib/LoRa_APRS/LoRa_APRS.cpp
View file

@ -1,6 +1,6 @@
#include "LoRa_APRS.h"
LoRa_APRS::LoRa_APRS() : _rxFrequency(433775000), _rxSpreadingFactor(12), _rxSignalBandwidth(125000), _rxCodingRate4(5), _txFrequency(433775000), _txSpreadingFactor(12), _txSignalBandwidth(125000), _txCodingRate4(5) {
LoRa_APRS::LoRa_APRS() : _RxFrequency(433775000), _TxFrequency(433775000) {
}
bool LoRa_APRS::checkMessage() {
@ -32,10 +32,7 @@ std::shared_ptr<APRSMessage> LoRa_APRS::getMessage() {
}
void LoRa_APRS::sendMessage(const std::shared_ptr<APRSMessage> msg) {
setSpreadingFactor(_txSpreadingFactor);
setSignalBandwidth(_txSignalBandwidth);
setCodingRate4(_txCodingRate4);
setFrequency(_txFrequency);
setFrequency(_TxFrequency);
String data = msg->encode();
beginPacket();
// Header:
@ -45,84 +42,24 @@ void LoRa_APRS::sendMessage(const std::shared_ptr<APRSMessage> msg) {
// APRS Data:
write((const uint8_t *)data.c_str(), data.length());
endPacket();
setSpreadingFactor(_rxSpreadingFactor);
setSignalBandwidth(_rxSignalBandwidth);
setCodingRate4(_rxCodingRate4);
setFrequency(_rxFrequency);
setFrequency(_RxFrequency);
}
void LoRa_APRS::setRxFrequency(long frequency) {
_rxFrequency = frequency;
setFrequency(_rxFrequency);
_RxFrequency = frequency;
setFrequency(_RxFrequency);
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getRxFrequency() const {
return _rxFrequency;
return _RxFrequency;
}
void LoRa_APRS::setTxFrequency(long frequency) {
_txFrequency = frequency;
_TxFrequency = frequency;
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getTxFrequency() const {
return _txFrequency;
}
void LoRa_APRS::setRxSpreadingFactor(int spreadingFactor) {
_rxSpreadingFactor = spreadingFactor;
setSpreadingFactor(_rxSpreadingFactor);
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getRxSpreadingFactor() const {
return _rxSpreadingFactor;
}
void LoRa_APRS::setRxSignalBandwidth(long signalBandwidth) {
_rxSignalBandwidth = signalBandwidth;
setSignalBandwidth(_rxSignalBandwidth);
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getRxSignalBandwidth() const {
return _rxSignalBandwidth;
}
void LoRa_APRS::setRxCodingRate4(int codingRate) {
_rxCodingRate4 = codingRate;
setCodingRate4(_rxCodingRate4);
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getRxCodingRate4() const {
return _rxCodingRate4;
}
void LoRa_APRS::setTxSpreadingFactor(int spreadingFactor) {
_txSpreadingFactor = spreadingFactor;
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getTxSpreadingFactor() const {
return _txSpreadingFactor;
}
void LoRa_APRS::setTxSignalBandwidth(long signalBandwidth) {
_txSignalBandwidth = signalBandwidth;
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getTxSignalBandwidth() const {
return _txSignalBandwidth;
}
void LoRa_APRS::setTxCodingRate4(int codingRate) {
_txCodingRate4 = codingRate;
}
// cppcheck-suppress unusedFunction
long LoRa_APRS::getTxCodingRate4() const {
return _txCodingRate4;
return _TxFrequency;
}

28
lib/LoRa_APRS/LoRa_APRS.h
View file

@ -22,34 +22,10 @@ public:
void setTxFrequency(long frequency);
long getTxFrequency() const;
void setRxSpreadingFactor(int spreadingFactor);
long getRxSpreadingFactor() const;
void setRxSignalBandwidth(long signalBandwidth);
long getRxSignalBandwidth() const;
void setRxCodingRate4(int codingRate);
long getRxCodingRate4() const;
void setTxSpreadingFactor(int spreadingFactor);
long getTxSpreadingFactor() const;
void setTxSignalBandwidth(long signalBandwidth);
long getTxSignalBandwidth() const;
void setTxCodingRate4(int codingRate);
long getTxCodingRate4() const;
private:
std::shared_ptr<APRSMessage> _LastReceivedMsg;
long _rxFrequency;
int _rxSpreadingFactor;
long _rxSignalBandwidth;
int _rxCodingRate4;
long _txFrequency;
int _txSpreadingFactor;
long _txSignalBandwidth;
int _txCodingRate4;
long _RxFrequency;
long _TxFrequency;
};
#endif