kopia lustrzana https://github.com/lora-aprs/LoRa_APRS_iGate
first try to add support for sx1262
Peter Buchegger
rodzic
1c4d9ffca4
commit
f3fd705aa4
|
|
@ -7,7 +7,7 @@
|
|||
OledPins::OledPins(int8_t sda, int8_t scl, int8_t reset, int8_t addr) : Sda(sda), Scl(scl), Reset(reset), Addr(addr) {
|
||||
}
|
||||
|
||||
LoraPins::LoraPins(int8_t sck, int8_t miso, int8_t mosi, int8_t cs, int8_t reset, int8_t irq) : Sck(sck), Miso(miso), Mosi(mosi), CS(cs), Reset(reset), IRQ(irq) {
|
||||
LoraPins::LoraPins(int8_t sck, int8_t miso, int8_t mosi, int8_t cs, int8_t reset, int8_t irq, LoraModem modem) : Sck(sck), Miso(miso), Mosi(mosi), CS(cs), Reset(reset), IRQ(irq), Modem(modem) {
|
||||
}
|
||||
|
||||
GpsPins::GpsPins(int8_t rx, int8_t tx) : Rx(rx), Tx(tx) {
|
||||
|
|
@ -30,6 +30,7 @@ BoardConfig const *BoardFinder::searchBoardConfig(logging::Logger &logger) {
|
|||
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, MODULE_NAME, "searching for OLED...");
|
||||
|
||||
for (BoardConfig const *boardconf : _boardConfigs) {
|
||||
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, MODULE_NAME, "trying board config: %s", boardconf->Name.c_str());
|
||||
if (boardconf->needCheckPowerChip && checkPowerConfig(boardconf, logger) == boardconf->powerCheckStatus) {
|
||||
PowerManagement powerManagement;
|
||||
Wire.begin(boardconf->Oled.Sda, boardconf->Oled.Scl);
|
||||
|
|
@ -48,6 +49,7 @@ BoardConfig const *BoardFinder::searchBoardConfig(logging::Logger &logger) {
|
|||
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, MODULE_NAME, "could not find OLED, will search for the modem now...");
|
||||
|
||||
for (BoardConfig const *boardconf : _boardConfigs) {
|
||||
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, MODULE_NAME, "trying board config: %s", boardconf->Name.c_str());
|
||||
if (boardconf->needCheckPowerChip && checkPowerConfig(boardconf, logger) == boardconf->powerCheckStatus) {
|
||||
PowerManagement powerManagement;
|
||||
Wire.begin(boardconf->Oled.Sda, boardconf->Oled.Scl);
|
||||
|
|
@ -148,16 +150,16 @@ bool BoardFinder::checkPowerConfig(BoardConfig const *boardConfig, logging::Logg
|
|||
}
|
||||
|
||||
// clang-format off
|
||||
BoardConfig TTGO_LORA32_V1 ("TTGO_LORA32_V1", eTTGO_LORA32_V1, OledPins( 4, 15), LoraPins( 5, 19, 27, 18, 14, 26));
|
||||
BoardConfig TTGO_LORA32_V2 ("TTGO_LORA32_V2", eTTGO_LORA32_V2, OledPins(21, 22), LoraPins( 5, 19, 27, 18, 14, 26));
|
||||
BoardConfig TTGO_T_Beam_V0_7 ("TTGO_T_Beam_V0_7", eTTGO_T_Beam_V0_7, OledPins(21, 22), LoraPins( 5, 19, 27, 18, 14, 26), GpsPins(15, 12), EthernetPins(), ButtonPins(38), true);
|
||||
BoardConfig TTGO_T_Beam_V1_0 ("TTGO_T_Beam_V1_0", eTTGO_T_Beam_V1_0, OledPins(21, 22), LoraPins( 5, 19, 27, 18, 14, 26), GpsPins(12, 34), EthernetPins(), ButtonPins(38), true, true);
|
||||
BoardConfig LILYGO_POE_ETH_BOARD ("LILYGO_POE_ETH_BOARD", eLILYGO_POE_ETH_BOARD, OledPins(33, 32), LoraPins(14, 2, 15, 12, 4, 36), GpsPins(), EthernetPins(23, 18, 5, 0, -1, ETH_CLOCK_GPIO17_OUT, ETH_PHY_LAN8720));
|
||||
BoardConfig WT32_ETH_BOARD ("WT32_ETH_BOARD", eWT32_ETH_BOARD, OledPins(17, 5), LoraPins( 4, 12, 14, 15, 33, 32), GpsPins(), EthernetPins(23, 18, -1, 1, 16, ETH_CLOCK_GPIO0_IN, ETH_PHY_LAN8720));
|
||||
BoardConfig TRACKERD ("TRACKERD", eTRACKERD, OledPins( 5, 4), LoraPins(18, 19, 23, 16, 14, 26));
|
||||
BoardConfig HELTEC_WIFI_LORA_32_V1 ("HELTEC_WIFI_LORA_32_V1", eHELTEC_WIFI_LORA_32_V1, OledPins( 4, 15, 16), LoraPins( 5, 19, 27, 18, 14, 26));
|
||||
BoardConfig HELTEC_WIFI_LORA_32_V2 ("HELTEC_WIFI_LORA_32_V2", eHELTEC_WIFI_LORA_32_V2, OledPins( 4, 15, 16), LoraPins( 5, 19, 27, 18, 14, 26));
|
||||
BoardConfig HELTEC_WIFI_LORA_32_V3 ("HELTEC_WIFI_LORA_32_V3", eHELTEC_WIFI_LORA_32_V3, OledPins( 17, 18, 21), LoraPins( 9, 11, 10, 8, 12, 13));
|
||||
BoardConfig GUALTHERIUS_LORAHAM_v100("GUALTHERIUS_LORAHAM_v100", eGUALTHERIUS_LORAHAM_v100, OledPins(17, 16), LoraPins(18, 19, 23, 5, 13, 35));
|
||||
BoardConfig GUALTHERIUS_LORAHAM_v106("GUALTHERIUS_LORAHAM_v106", eGUALTHERIUS_LORAHAM_v106, OledPins(17, 16), LoraPins(18, 19, 23, 2, 13, 35));
|
||||
BoardConfig TTGO_LORA32_V1 ("TTGO_LORA32_V1", eTTGO_LORA32_V1, OledPins( 4, 15), LoraPins( 5, 19, 27, 18, 14, 26, eSX1278));
|
||||
BoardConfig TTGO_LORA32_V2 ("TTGO_LORA32_V2", eTTGO_LORA32_V2, OledPins(21, 22), LoraPins( 5, 19, 27, 18, 14, 26, eSX1278));
|
||||
BoardConfig TTGO_T_Beam_V0_7 ("TTGO_T_Beam_V0_7", eTTGO_T_Beam_V0_7, OledPins(21, 22), LoraPins( 5, 19, 27, 18, 14, 26, eSX1278), GpsPins(15, 12), EthernetPins(), ButtonPins(38), true);
|
||||
BoardConfig TTGO_T_Beam_V1_0 ("TTGO_T_Beam_V1_0", eTTGO_T_Beam_V1_0, OledPins(21, 22), LoraPins( 5, 19, 27, 18, 14, 26, eSX1278), GpsPins(12, 34), EthernetPins(), ButtonPins(38), true, true);
|
||||
BoardConfig LILYGO_POE_ETH_BOARD ("LILYGO_POE_ETH_BOARD", eLILYGO_POE_ETH_BOARD, OledPins(33, 32), LoraPins(14, 2, 15, 12, 4, 36, eSX1278), GpsPins(), EthernetPins(23, 18, 5, 0, -1, ETH_CLOCK_GPIO17_OUT, ETH_PHY_LAN8720));
|
||||
BoardConfig WT32_ETH_BOARD ("WT32_ETH_BOARD", eWT32_ETH_BOARD, OledPins(17, 5), LoraPins( 4, 12, 14, 15, 33, 32, eSX1278), GpsPins(), EthernetPins(23, 18, -1, 1, 16, ETH_CLOCK_GPIO0_IN, ETH_PHY_LAN8720));
|
||||
BoardConfig TRACKERD ("TRACKERD", eTRACKERD, OledPins( 5, 4), LoraPins(18, 19, 23, 16, 14, 26, eSX1278));
|
||||
BoardConfig HELTEC_WIFI_LORA_32_V1 ("HELTEC_WIFI_LORA_32_V1", eHELTEC_WIFI_LORA_32_V1, OledPins( 4, 15, 16), LoraPins( 5, 19, 27, 18, 14, 26, eSX1278));
|
||||
BoardConfig HELTEC_WIFI_LORA_32_V2 ("HELTEC_WIFI_LORA_32_V2", eHELTEC_WIFI_LORA_32_V2, OledPins( 4, 15, 16), LoraPins( 5, 19, 27, 18, 14, 26, eSX1278));
|
||||
BoardConfig HELTEC_WIFI_LORA_32_V3 ("HELTEC_WIFI_LORA_32_V3", eHELTEC_WIFI_LORA_32_V3, OledPins(17, 18, 21), LoraPins( 9, 11, 10, 8, 12, 14, eSX1262));
|
||||
BoardConfig GUALTHERIUS_LORAHAM_v100("GUALTHERIUS_LORAHAM_v100", eGUALTHERIUS_LORAHAM_v100, OledPins(17, 16), LoraPins(18, 19, 23, 5, 13, 35, eSX1278));
|
||||
BoardConfig GUALTHERIUS_LORAHAM_v106("GUALTHERIUS_LORAHAM_v106", eGUALTHERIUS_LORAHAM_v106, OledPins(17, 16), LoraPins(18, 19, 23, 2, 13, 35, eSX1278));
|
||||
// clang-format on
|
||||
|
|
|
|||
|
|
@ -21,16 +21,22 @@ public:
|
|||
int8_t Addr;
|
||||
};
|
||||
|
||||
enum LoraModem {
|
||||
eSX1278,
|
||||
eSX1262,
|
||||
};
|
||||
|
||||
class LoraPins {
|
||||
public:
|
||||
explicit LoraPins(int8_t sck, int8_t miso, int8_t mosi, int8_t cs, int8_t reset, int8_t irq);
|
||||
explicit LoraPins(int8_t sck, int8_t miso, int8_t mosi, int8_t cs, int8_t reset, int8_t irq, LoraModem modem);
|
||||
|
||||
int8_t Sck;
|
||||
int8_t Miso;
|
||||
int8_t Mosi;
|
||||
int8_t CS;
|
||||
int8_t Reset;
|
||||
int8_t IRQ;
|
||||
int8_t Sck;
|
||||
int8_t Miso;
|
||||
int8_t Mosi;
|
||||
int8_t CS;
|
||||
int8_t Reset;
|
||||
int8_t IRQ;
|
||||
LoraModem Modem;
|
||||
};
|
||||
|
||||
class GpsPins {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,127 @@
|
|||
#include "LoRaModem.h"
|
||||
|
||||
// SX1278
|
||||
int16_t Modem_SX1278::begin(const LoraPins &lora_pins, const Configuration::LoRa &lora_config, const uint16_t preambleLength, void (*setFlag)()) {
|
||||
float _frequencyRx = (float)lora_config.frequencyRx / 1000000;
|
||||
float BWkHz = (float)lora_config.signalBandwidth / 1000;
|
||||
|
||||
SPI.begin(lora_pins.Sck, lora_pins.Miso, lora_pins.Mosi, lora_pins.CS);
|
||||
_module = new Module(lora_pins.CS, lora_pins.IRQ, lora_pins.Reset);
|
||||
|
||||
_radio = new SX1278(_module);
|
||||
int16_t state = _radio->begin(_frequencyRx, BWkHz, lora_config.spreadingFactor, lora_config.codingRate4, RADIOLIB_SX127X_SYNC_WORD, lora_config.power, preambleLength, lora_config.gainRx);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
return state;
|
||||
}
|
||||
|
||||
state = _radio->setCRC(true);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
return state;
|
||||
}
|
||||
|
||||
_radio->setDio0Action(setFlag, RISING);
|
||||
|
||||
if (lora_config.tx_enable && lora_config.power > 17) {
|
||||
_radio->setCurrentLimit(140);
|
||||
}
|
||||
return RADIOLIB_ERR_NONE;
|
||||
}
|
||||
|
||||
int16_t Modem_SX1278::readData(String &str) {
|
||||
return _radio->readData(str);
|
||||
}
|
||||
|
||||
int16_t Modem_SX1278::setFrequency(float freq) {
|
||||
return _radio->setFrequency(freq);
|
||||
}
|
||||
|
||||
int16_t Modem_SX1278::startReceive() {
|
||||
return _radio->startReceive();
|
||||
}
|
||||
|
||||
int16_t Modem_SX1278::startTransmit(String &str) {
|
||||
return _radio->startTransmit(str);
|
||||
}
|
||||
|
||||
int16_t Modem_SX1278::receive(String &str) {
|
||||
return _radio->receive(str);
|
||||
}
|
||||
|
||||
float Modem_SX1278::getRSSI() {
|
||||
return _radio->getRSSI();
|
||||
}
|
||||
|
||||
float Modem_SX1278::getSNR() {
|
||||
return _radio->getSNR();
|
||||
}
|
||||
|
||||
float Modem_SX1278::getFrequencyError() {
|
||||
return _radio->getFrequencyError();
|
||||
}
|
||||
|
||||
uint8_t Modem_SX1278::getModemStatus() {
|
||||
return _radio->getModemStatus();
|
||||
}
|
||||
|
||||
// SX1262
|
||||
int16_t Modem_SX1262::begin(const LoraPins &lora_pins, const Configuration::LoRa &lora_config, const uint16_t preambleLength, void (*setFlag)()) {
|
||||
float _frequencyRx = (float)lora_config.frequencyRx / 1000000;
|
||||
float BWkHz = (float)lora_config.signalBandwidth / 1000;
|
||||
|
||||
SPI.begin(lora_pins.Sck, lora_pins.Miso, lora_pins.Mosi, lora_pins.CS);
|
||||
_module = new Module(lora_pins.CS, lora_pins.IRQ, lora_pins.Reset, 13);
|
||||
|
||||
_radio = new SX1262(_module);
|
||||
int16_t state = _radio->begin(_frequencyRx, BWkHz, lora_config.spreadingFactor, lora_config.codingRate4, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, lora_config.power, preambleLength);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
return state;
|
||||
}
|
||||
|
||||
state = _radio->setCRC(true);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
return state;
|
||||
}
|
||||
|
||||
_radio->setDio1Action(setFlag);
|
||||
|
||||
if (lora_config.tx_enable && lora_config.power > 17) {
|
||||
_radio->setCurrentLimit(140);
|
||||
}
|
||||
return RADIOLIB_ERR_NONE;
|
||||
}
|
||||
|
||||
int16_t Modem_SX1262::readData(String &str) {
|
||||
return _radio->readData(str);
|
||||
}
|
||||
|
||||
int16_t Modem_SX1262::setFrequency(float freq) {
|
||||
return _radio->setFrequency(freq);
|
||||
}
|
||||
|
||||
int16_t Modem_SX1262::startReceive() {
|
||||
return _radio->startReceive();
|
||||
}
|
||||
|
||||
int16_t Modem_SX1262::startTransmit(String &str) {
|
||||
return _radio->startTransmit(str);
|
||||
}
|
||||
|
||||
int16_t Modem_SX1262::receive(String &str) {
|
||||
return _radio->receive(str);
|
||||
}
|
||||
|
||||
float Modem_SX1262::getRSSI() {
|
||||
return _radio->getRSSI();
|
||||
}
|
||||
|
||||
float Modem_SX1262::getSNR() {
|
||||
return _radio->getSNR();
|
||||
}
|
||||
|
||||
float Modem_SX1262::getFrequencyError() {
|
||||
return _radio->getFrequencyError();
|
||||
}
|
||||
|
||||
uint8_t Modem_SX1262::getModemStatus() {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
#ifndef LORA_MODEM_H_
|
||||
#define LORA_MODEM_H_
|
||||
|
||||
#include <RadioLib.h>
|
||||
|
||||
#include "BoardFinder.h"
|
||||
#include "project_configuration.h"
|
||||
|
||||
class LoRaModem {
|
||||
public:
|
||||
virtual ~LoRaModem() {
|
||||
}
|
||||
|
||||
virtual int16_t begin(const LoraPins &lora_pins, const Configuration::LoRa &lora_config, const uint16_t preambleLength, void (*setFlag)()) = 0;
|
||||
|
||||
virtual int16_t readData(String &str) = 0;
|
||||
|
||||
virtual int16_t setFrequency(float freq) = 0;
|
||||
virtual int16_t startReceive() = 0;
|
||||
virtual int16_t startTransmit(String &str) = 0;
|
||||
|
||||
virtual int16_t receive(String &str) = 0;
|
||||
|
||||
virtual float getRSSI() = 0;
|
||||
virtual float getSNR() = 0;
|
||||
virtual float getFrequencyError() = 0;
|
||||
virtual uint8_t getModemStatus() = 0;
|
||||
|
||||
protected:
|
||||
Module *_module;
|
||||
};
|
||||
|
||||
class Modem_SX1278 : public LoRaModem {
|
||||
public:
|
||||
int16_t begin(const LoraPins &lora_pins, const Configuration::LoRa &lora_config, const uint16_t preambleLength, void (*setFlag)()) override;
|
||||
|
||||
int16_t readData(String &str) override;
|
||||
|
||||
int16_t setFrequency(float freq) override;
|
||||
int16_t startReceive() override;
|
||||
int16_t startTransmit(String &str) override;
|
||||
|
||||
int16_t receive(String &str) override;
|
||||
|
||||
float getRSSI() override;
|
||||
float getSNR() override;
|
||||
float getFrequencyError() override;
|
||||
uint8_t getModemStatus() override;
|
||||
|
||||
private:
|
||||
SX1278 *_radio;
|
||||
};
|
||||
|
||||
class Modem_SX1262 : public LoRaModem {
|
||||
public:
|
||||
int16_t begin(const LoraPins &lora_pins, const Configuration::LoRa &lora_config, const uint16_t preambleLength, void (*setFlag)()) override;
|
||||
|
||||
int16_t readData(String &str) override;
|
||||
|
||||
int16_t setFrequency(float freq) override;
|
||||
int16_t startReceive() override;
|
||||
int16_t startTransmit(String &str) override;
|
||||
|
||||
int16_t receive(String &str) override;
|
||||
|
||||
float getRSSI() override;
|
||||
float getSNR() override;
|
||||
float getFrequencyError() override;
|
||||
uint8_t getModemStatus() override;
|
||||
|
||||
private:
|
||||
SX1262 *_radio;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -60,16 +60,16 @@ void setup() {
|
|||
std::list<BoardConfig const *> boardConfigs;
|
||||
boardConfigs.push_back(&TTGO_LORA32_V1);
|
||||
boardConfigs.push_back(&TTGO_LORA32_V2);
|
||||
boardConfigs.push_back(&TTGO_T_Beam_V0_7);
|
||||
boardConfigs.push_back(&TTGO_T_Beam_V1_0);
|
||||
boardConfigs.push_back(&LILYGO_POE_ETH_BOARD);
|
||||
boardConfigs.push_back(&WT32_ETH_BOARD);
|
||||
boardConfigs.push_back(&TRACKERD);
|
||||
boardConfigs.push_back(&HELTEC_WIFI_LORA_32_V1);
|
||||
boardConfigs.push_back(&HELTEC_WIFI_LORA_32_V2);
|
||||
boardConfigs.push_back(&HELTEC_WIFI_LORA_32_V3);
|
||||
boardConfigs.push_back(&LILYGO_POE_ETH_BOARD);
|
||||
boardConfigs.push_back(&WT32_ETH_BOARD);
|
||||
boardConfigs.push_back(&TRACKERD);
|
||||
boardConfigs.push_back(&GUALTHERIUS_LORAHAM_v100);
|
||||
boardConfigs.push_back(&GUALTHERIUS_LORAHAM_v106);
|
||||
boardConfigs.push_back(&TTGO_T_Beam_V0_7);
|
||||
boardConfigs.push_back(&TTGO_T_Beam_V1_0);
|
||||
|
||||
ProjectConfigurationManagement confmg(LoRaSystem.getLogger());
|
||||
confmg.readConfiguration(LoRaSystem.getLogger(), userConfig);
|
||||
|
|
|
|||
|
|
@ -4,20 +4,15 @@
|
|||
|
||||
#include "TaskRadiolib.h"
|
||||
|
||||
volatile bool RadiolibTask::_modemInterruptOccured = false;
|
||||
volatile bool RadiolibTask::_modemInterruptOccurred = false;
|
||||
|
||||
RadiolibTask::RadiolibTask(TaskQueue<std::shared_ptr<APRSMessage>> &fromModem, TaskQueue<std::shared_ptr<APRSMessage>> &toModem) : Task(TASK_RADIOLIB, TaskRadiolib), _module(0), _radio(0), _rxEnable(false), _txEnable(false), _fromModem(fromModem), _toModem(toModem), _transmitFlag(false), _frequencyTx(0.0), _frequencyRx(0.0), _frequenciesAreSame(false) {
|
||||
RadiolibTask::RadiolibTask(TaskQueue<std::shared_ptr<APRSMessage>> &fromModem, TaskQueue<std::shared_ptr<APRSMessage>> &toModem) : Task(TASK_RADIOLIB, TaskRadiolib), _modem(0), _rxEnable(false), _txEnable(false), _fromModem(fromModem), _toModem(toModem) {
|
||||
}
|
||||
|
||||
RadiolibTask::~RadiolibTask() {
|
||||
_radio->clearDio0Action();
|
||||
}
|
||||
|
||||
bool RadiolibTask::setup(System &system) {
|
||||
SPI.begin(system.getBoardConfig()->Lora.Sck, system.getBoardConfig()->Lora.Miso, system.getBoardConfig()->Lora.Mosi, system.getBoardConfig()->Lora.CS);
|
||||
_module = new Module(system.getBoardConfig()->Lora.CS, system.getBoardConfig()->Lora.IRQ, system.getBoardConfig()->Lora.Reset);
|
||||
_radio = new SX1278(_module);
|
||||
|
||||
_rxEnable = true;
|
||||
_txEnable = system.getUserConfig()->lora.tx_enable;
|
||||
|
||||
|
|
@ -28,30 +23,24 @@ bool RadiolibTask::setup(System &system) {
|
|||
_frequenciesAreSame = true;
|
||||
}
|
||||
|
||||
float BWkHz = (float)system.getUserConfig()->lora.signalBandwidth / 1000;
|
||||
|
||||
const uint16_t preambleLength = 8;
|
||||
|
||||
int16_t state = _radio->begin(_frequencyRx, BWkHz, system.getUserConfig()->lora.spreadingFactor, system.getUserConfig()->lora.codingRate4, RADIOLIB_SX127X_SYNC_WORD, system.getUserConfig()->lora.power, preambleLength, system.getUserConfig()->lora.gainRx);
|
||||
if (system.getBoardConfig()->Lora.Modem == eSX1278) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] using SX1278", timeString().c_str());
|
||||
_modem = new Modem_SX1278();
|
||||
} else if (system.getBoardConfig()->Lora.Modem == eSX1262) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] using SX1262", timeString().c_str());
|
||||
_modem = new Modem_SX1262();
|
||||
} else {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] Modem not correctly defined!", timeString().c_str());
|
||||
}
|
||||
|
||||
int16_t state = _modem->begin(system.getBoardConfig()->Lora, system.getUserConfig()->lora, preambleLength, setFlag);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
decodeError(system, state);
|
||||
}
|
||||
|
||||
state = _radio->setCRC(true);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] setCRC failed, code %d", timeString().c_str(), state);
|
||||
decodeError(system, state);
|
||||
}
|
||||
|
||||
_radio->setDio0Action(setFlag, RISING);
|
||||
|
||||
if (_rxEnable) {
|
||||
startRX(system);
|
||||
}
|
||||
|
||||
if (system.getUserConfig()->lora.tx_enable && system.getUserConfig()->lora.power > 17) {
|
||||
_radio->setCurrentLimit(140);
|
||||
}
|
||||
startRX(system);
|
||||
|
||||
uint32_t preambleDurationMilliSec = ((uint64_t)(preambleLength + 4) << (system.getUserConfig()->lora.spreadingFactor + 10 /* to milli-sec */)) / system.getUserConfig()->lora.signalBandwidth;
|
||||
_txWaitTimer.setTimeout(preambleDurationMilliSec * 2);
|
||||
|
|
@ -61,7 +50,15 @@ bool RadiolibTask::setup(System &system) {
|
|||
}
|
||||
|
||||
bool RadiolibTask::loop(System &system) {
|
||||
if (_modemInterruptOccured) {
|
||||
String str;
|
||||
int state = _modem->receive(str);
|
||||
if (state == RADIOLIB_ERR_NONE) {
|
||||
Serial.println("RadiolibTask::loop: RADIOLIB_ERR_NONE");
|
||||
} else if (state == RADIOLIB_ERR_RX_TIMEOUT) {
|
||||
Serial.println("RadiolibTask::loop: RADIOLIB_ERR_RX_TIMEOUT");
|
||||
}
|
||||
|
||||
if (_modemInterruptOccurred) {
|
||||
handleModemInterrupt(system);
|
||||
} else if (_txWaitTimer.check() && !_toModem.empty()) {
|
||||
handleTXing(system);
|
||||
|
|
@ -70,11 +67,12 @@ bool RadiolibTask::loop(System &system) {
|
|||
}
|
||||
|
||||
void RadiolibTask::setFlag(void) {
|
||||
_modemInterruptOccured = true;
|
||||
Serial.println("RadiolibTask::setFlag");
|
||||
_modemInterruptOccurred = true;
|
||||
}
|
||||
|
||||
void RadiolibTask::handleModemInterrupt(System &system) {
|
||||
_modemInterruptOccured = false;
|
||||
_modemInterruptOccurred = false;
|
||||
|
||||
if (_transmitFlag) { // transmitted
|
||||
_transmitFlag = false;
|
||||
|
|
@ -86,20 +84,20 @@ void RadiolibTask::handleModemInterrupt(System &system) {
|
|||
|
||||
// received
|
||||
String str;
|
||||
int state = _radio->readData(str);
|
||||
int state = _modem->readData(str);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] readData failed, code %d", timeString().c_str(), state);
|
||||
return;
|
||||
}
|
||||
if (str.substring(0, 3) != "<\xff\x01") {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Unknown packet '%s' with RSSI %.0fdBm, SNR %.2fdB and FreqErr %fHz", timeString().c_str(), str.c_str(), _radio->getRSSI(), _radio->getSNR(), -_radio->getFrequencyError());
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Unknown packet '%s' with RSSI %.0fdBm, SNR %.2fdB and FreqErr %fHz", timeString().c_str(), str.c_str(), _modem->getRSSI(), _modem->getSNR(), -_modem->getFrequencyError());
|
||||
return;
|
||||
}
|
||||
|
||||
std::shared_ptr<APRSMessage> msg = std::shared_ptr<APRSMessage>(new APRSMessage());
|
||||
msg->decode(str.substring(3));
|
||||
_fromModem.addElement(msg);
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Received packet '%s' with RSSI %.0fdBm, SNR %.2fdB and FreqErr %fHz", timeString().c_str(), msg->toString().c_str(), _radio->getRSSI(), _radio->getSNR(), -_radio->getFrequencyError());
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Received packet '%s' with RSSI %.0fdBm, SNR %.2fdB and FreqErr %fHz", timeString().c_str(), msg->toString().c_str(), _modem->getRSSI(), _modem->getSNR(), -_modem->getFrequencyError());
|
||||
system.getDisplay().addFrame(std::shared_ptr<DisplayFrame>(new TextFrame("LoRa", msg->toString().c_str())));
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +119,7 @@ void RadiolibTask::handleTXing(System &system) {
|
|||
|
||||
// we are currently RXing
|
||||
static bool rxsignaldetected_print = false;
|
||||
if (_frequenciesAreSame && (_radio->getModemStatus() & 0x01) == 0x01) {
|
||||
if (_frequenciesAreSame && (_modem->getModemStatus() & 0x01) == 0x01) {
|
||||
if (!rxsignaldetected_print) {
|
||||
rxsignaldetected_print = true;
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] RX signal detected. Waiting TX", timeString().c_str());
|
||||
|
|
@ -138,7 +136,7 @@ void RadiolibTask::handleTXing(System &system) {
|
|||
|
||||
void RadiolibTask::startRX(System &system) {
|
||||
if (!_frequenciesAreSame) {
|
||||
int16_t state = _radio->setFrequency(_frequencyRx);
|
||||
int16_t state = _modem->setFrequency(_frequencyRx);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] startRX failed, Freq update, code %d", timeString().c_str(), state);
|
||||
decodeError(system, state);
|
||||
|
|
@ -146,7 +144,7 @@ void RadiolibTask::startRX(System &system) {
|
|||
}
|
||||
}
|
||||
|
||||
int16_t state = _radio->startReceive();
|
||||
int16_t state = _modem->startReceive();
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] startRX failed, code %d", timeString().c_str(), state);
|
||||
decodeError(system, state);
|
||||
|
|
@ -155,7 +153,7 @@ void RadiolibTask::startRX(System &system) {
|
|||
|
||||
void RadiolibTask::startTX(System &system, String &str) {
|
||||
if (!_frequenciesAreSame) {
|
||||
int16_t state = _radio->setFrequency(_frequencyTx);
|
||||
int16_t state = _modem->setFrequency(_frequencyTx);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] startTX failed, Freq update, code %d", timeString().c_str(), state);
|
||||
decodeError(system, state);
|
||||
|
|
@ -164,7 +162,7 @@ void RadiolibTask::startTX(System &system, String &str) {
|
|||
}
|
||||
}
|
||||
|
||||
int16_t state = _radio->startTransmit(str);
|
||||
int16_t state = _modem->startTransmit(str);
|
||||
if (state != RADIOLIB_ERR_NONE) {
|
||||
system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] startTX failed, code %d", timeString().c_str(), state);
|
||||
decodeError(system, state);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "project_configuration.h"
|
||||
#include <APRS-Decoder.h>
|
||||
#include <BoardFinder.h>
|
||||
#include <RadioLib.h>
|
||||
#include <LoRaModem.h>
|
||||
#include <TaskManager.h>
|
||||
|
||||
class RadiolibTask : public Task {
|
||||
|
|
@ -16,8 +16,7 @@ public:
|
|||
virtual bool loop(System &system) override;
|
||||
|
||||
private:
|
||||
Module *_module;
|
||||
SX1278 *_radio;
|
||||
LoRaModem *_modem;
|
||||
|
||||
bool _rxEnable;
|
||||
bool _txEnable;
|
||||
|
|
@ -25,7 +24,7 @@ private:
|
|||
TaskQueue<std::shared_ptr<APRSMessage>> &_fromModem;
|
||||
TaskQueue<std::shared_ptr<APRSMessage>> &_toModem;
|
||||
|
||||
static volatile bool _modemInterruptOccured;
|
||||
static volatile bool _modemInterruptOccurred;
|
||||
|
||||
Timer _txWaitTimer;
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue