mirror
/
esp32_loraprs
kopia lustrzana https://github.com/sh123/esp32_loraprs
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update SetHardware command

master
sh123 2023-11-16 17:46:24 +02:00
rodzic 3e90abd47f
commit 2083f946d9
2 zmienionych plików z 22 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
include/loraprs_service.h
Wyświetl plik

@ -106,13 +106,18 @@ protected:
private:
struct SetHardware {
uint32_t freq;
uint32_t freqRx;
uint32_t freqTx;
uint8_t modType;
uint16_t pwr;
uint32_t bw;
uint16_t sf;
uint16_t cr;
uint16_t pwr;
uint16_t sync;
uint8_t crc;
uint32_t fskBitRate;
uint32_t fskFreqDev;
uint32_t fskRxBw;
} __attribute__((packed));
struct SignalReport {
@ -125,7 +130,7 @@ private:
} __attribute__((packed));
private:
const String CfgLoraprsVersion = "LoRAPRS 1.0.13";
const String CfgLoraprsVersion = "LoRAPRS 1.0.14";
// processor config
const int CfgConnRetryMs = 500; // connection retry delay, e.g. wifi

20
src/loraprs_service.cpp
Wyświetl plik

@ -781,19 +781,27 @@ void Service::onRadioControlCommand(const std::vector<byte> &rawCommand) {
if (config_.KissEnableExtensions && rawCommand.size() == sizeof(SetHardware)) {
LOG_INFO("Setting new radio parameters");
const struct SetHardware * setHardware = reinterpret_cast<const struct SetHardware*>(rawCommand.data());
// TODO, add support for split set hardware
config_.LoraFreqRx = be32toh(setHardware->freq);
config_.LoraFreqTx = be32toh(setHardware->freq);
config_.LoraFreqRx = be32toh(setHardware->freqRx);
config_.LoraFreqTx = be32toh(setHardware->freqTx);
config_.ModType = setHardware->modType;
config_.LoraBw = be32toh(setHardware->bw);
config_.LoraSf = be16toh(setHardware->sf);
config_.LoraCodingRate = be16toh(setHardware->cr);
config_.LoraPower = be16toh(setHardware->pwr);
config_.LoraSync = be16toh(setHardware->sync);
config_.FskBitRate = be32toh(setHardware->fskBitRate);
config_.FskFreqDev = be32toh(setHardware->fskFreqDev);
config_.FskRxBw = be32toh(setHardware->fskRxBw);
int crcType = setHardware->crc ? config_.LoraCrc : 0;
setupRig(config_.LoraFreqRx, config_.LoraBw, config_.LoraSf,
config_.LoraCodingRate, config_.LoraPower, config_.LoraSync, crcType, config_.LoraExplicit);
if (config_.ModType == CFG_MOD_TYPE_FSK) {
setupRigFsk(config_.LoraFreqRx, config_.FskBitRate, config_.FskFreqDev, config_.FskRxBw, config_.LoraPower);
}
else {
setupRig(config_.LoraFreqRx, config_.LoraBw, config_.LoraSf,
config_.LoraCodingRate, config_.LoraPower, config_.LoraSync, crcType, config_.LoraExplicit);
}
} else {
LOG_ERROR("Radio control command of wrong size");
}