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

Initial add RX TX Parameters

Browse source
This commit is contained in:
dj1an 2021-08-25 20:07:13 +02:00
parent fda1e37c8c
commit 9acfce8ee2
5 changed files with 104 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/TaskModem.cpp
View file

@ -26,9 +26,12 @@ bool ModemTask::setup(System &system) {
_lora_aprs.setRxFrequency(system.getUserConfig()->lora.frequencyRx);
_lora_aprs.setTxFrequency(system.getUserConfig()->lora.frequencyTx);
_lora_aprs.setTxPower(system.getUserConfig()->lora.power);
_lora_aprs.setSpreadingFactor(system.getUserConfig()->lora.spreadingFactor);
_lora_aprs.setSignalBandwidth(system.getUserConfig()->lora.signalBandwidth);
_lora_aprs.setCodingRate4(system.getUserConfig()->lora.codingRate4);
_lora_aprs.setRxSpreadingFactor(system.getUserConfig()->lora.spreadingFactorRx);
_lora_aprs.setRxSignalBandwidth(system.getUserConfig()->lora.signalBandwidthRx);
_lora_aprs.setRxCodingRate4(system.getUserConfig()->lora.codingRate4Rx);
_lora_aprs.setTxSpreadingFactor(system.getUserConfig()->lora.spreadingFactorTx);
_lora_aprs.setTxSignalBandwidth(system.getUserConfig()->lora.signalBandwidthTx);
_lora_aprs.setTxCodingRate4(system.getUserConfig()->lora.codingRate4Tx);
_lora_aprs.enableCrc();
_stateInfo = "";

36
src/project_configuration.cpp
View file

@ -36,18 +36,21 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.aprs_is.server = data["aprs_is"]["server"].as<String>();
conf.aprs_is.port = data["aprs_is"]["port"] | 14580;
conf.digi.active = data["digi"]["active"] | false;
conf.digi.beacon = data["digi"]["beacon"] | false;
conf.lora.frequencyRx = data["lora"]["frequency_rx"] | 433775000;
conf.lora.frequencyTx = data["lora"]["frequency_tx"] | 433775000;
conf.lora.power = data["lora"]["power"] | 20;
conf.lora.spreadingFactor = data["lora"]["spreading_factor"] | 12;
conf.lora.signalBandwidth = data["lora"]["signal_bandwidth"] | 125000;
conf.lora.codingRate4 = data["lora"]["coding_rate4"] | 5;
conf.display.alwaysOn = data["display"]["always_on"] | true;
conf.display.timeout = data["display"]["timeout"] | 10;
conf.display.overwritePin = data["display"]["overwrite_pin"] | 0;
conf.display.turn180 = data["display"]["turn180"] | true;
conf.digi.active = data["digi"]["active"] | false;
conf.digi.beacon = data["digi"]["beacon"] | false;
conf.lora.frequencyRx = data["lora"]["frequency_rx"] | 433775000;
conf.lora.frequencyTx = data["lora"]["frequency_tx"] | 433775000;
conf.lora.power = data["lora"]["power"] | 20;
conf.lora.spreadingFactorRx = data["lora"]["spreading_factor_rx"] | 12;
conf.lora.signalBandwidthRx = data["lora"]["signal_bandwidth_rx"] | 125000;
conf.lora.codingRate4Rx = data["lora"]["coding_rate4_rx"] | 5;
conf.lora.spreadingFactorTx = data["lora"]["spreading_factor_tx"] | 12;
conf.lora.signalBandwidthTx = data["lora"]["signal_bandwidth_tx"] | 125000;
conf.lora.codingRate4Tx = data["lora"]["coding_rate4_tx"] | 5;
conf.display.alwaysOn = data["display"]["always_on"] | true;
conf.display.timeout = data["display"]["timeout"] | 10;
conf.display.overwritePin = data["display"]["overwrite_pin"] | 0;
conf.display.turn180 = data["display"]["turn180"] | true;
conf.ftp.active = data["ftp"]["active"] | false;
JsonArray users = data["ftp"]["user"].as<JsonArray>();
@ -101,9 +104,12 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co
data["lora"]["frequency_rx"] = conf.lora.frequencyRx;
data["lora"]["frequency_tx"] = conf.lora.frequencyTx;
data["lora"]["power"] = conf.lora.power;
data["lora"]["spreading_factor"] = conf.lora.spreadingFactor;
data["lora"]["signal_bandwidth"] = conf.lora.signalBandwidth;
data["lora"]["coding_rate4"] = conf.lora.codingRate4;
data["lora"]["spreading_factor_rx"] = conf.lora.spreadingFactorRx;
data["lora"]["signal_bandwidth_rx"] = conf.lora.signalBandwidthRx;
data["lora"]["coding_rate4_rx"] = conf.lora.codingRate4Rx;
data["lora"]["spreading_factor_tx"] = conf.lora.spreadingFactorTx;
data["lora"]["signal_bandwidth_tx"] = conf.lora.signalBandwidthTx;
data["lora"]["coding_rate4_tx"] = conf.lora.codingRate4Tx;
data["display"]["always_on"] = conf.display.alwaysOn;
data["display"]["timeout"] = conf.display.timeout;
data["display"]["overwrite_pin"] = conf.display.overwritePin;

11
src/project_configuration.h
View file

@ -66,15 +66,18 @@ public:
class LoRa {
public:
LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactor(12), signalBandwidth(125000), codingRate4(5) {
LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactorRx(12), signalBandwidthRx(125000), codingRate4Rx(5), spreadingFactorTx(12), signalBandwidthTx(125000), codingRate4Tx(5) {
}
long frequencyRx;
long frequencyTx;
int power;
int spreadingFactor;
long signalBandwidth;
int codingRate4;
int spreadingFactorRx;
long signalBandwidthRx;
int codingRate4Rx;
int spreadingFactorTx;
long signalBandwidthTx;
int codingRate4Tx;
};
class Display {