pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-26 01:52:48 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use radiolib native tx/rx_en switch control

Browse Source
This commit is contained in:
Ben Meadors 2023-01-25 14:58:50 -06:00
parent f1fd41a378
commit 25096c5c63
1 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/mesh/SX126xInterface.cpp
View File

@ -19,7 +19,8 @@ SX126xInterface<T>::SX126xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq,
/// Initialise the Driver transport hardware and software. /// Initialise the Driver transport hardware and software.
/// Make sure the Driver is properly configured before calling init(). /// Make sure the Driver is properly configured before calling init().
/// \return true if initialisation succeeded. /// \return true if initialisation succeeded.
template <typename T> bool SX126xInterface<T>::init() template <typename T>
bool SX126xInterface<T>::init()
{ {
#ifdef SX126X_POWER_EN #ifdef SX126X_POWER_EN
digitalWrite(SX126X_POWER_EN, HIGH); digitalWrite(SX126X_POWER_EN, HIGH);
@ -67,11 +68,6 @@ template <typename T> bool SX126xInterface<T>::init()
LOG_DEBUG("Current limit set to %f\n", currentLimit); LOG_DEBUG("Current limit set to %f\n", currentLimit);
LOG_DEBUG("Current limit set result %d\n", res); LOG_DEBUG("Current limit set result %d\n", res);
#if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
// lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
if (res == RADIOLIB_ERR_NONE)
res = lora.setDio2AsRfSwitch(false);
#endif
#ifdef SX126X_E22 #ifdef SX126X_E22
// E22 Emulation explicitly requires DIO2 as RF switch, so set it to TRUE again for good measure. In case somebody defines // E22 Emulation explicitly requires DIO2 as RF switch, so set it to TRUE again for good measure. In case somebody defines
// SX126X_TX for an E22 Module // SX126X_TX for an E22 Module
@ -79,13 +75,25 @@ template <typename T> bool SX126xInterface<T>::init()
res = lora.setDio2AsRfSwitch(true); res = lora.setDio2AsRfSwitch(true);
#endif #endif
if (config.lora.sx126x_rx_boosted_gain) { #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
uint16_t result = lora.setRxBoostedGainMode(true); // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
LOG_INFO("Set Rx Boosted Gain mode; result: %d\n", result); if (res == RADIOLIB_ERR_NONE)
} else { {
uint16_t result = lora.setRxBoostedGainMode(false); res = lora.setDio2AsRfSwitch(false);
LOG_INFO("Set Rx Power Saving Gain mode; result: %d\n", result); lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
} }
#endif
if (config.lora.sx126x_rx_boosted_gain)
{
uint16_t result = lora.setRxBoostedGainMode(true);
LOG_INFO("Set Rx Boosted Gain mode; result: %d\n", result);
}
else
{
uint16_t result = lora.setRxBoostedGainMode(false);
LOG_INFO("Set Rx Power Saving Gain mode; result: %d\n", result);
}
#if 0 #if 0
// Read/write a register we are not using (only used for FSK mode) to test SPI comms // Read/write a register we are not using (only used for FSK mode) to test SPI comms
@ -120,7 +128,8 @@ if (config.lora.sx126x_rx_boosted_gain) {
return res == RADIOLIB_ERR_NONE; return res == RADIOLIB_ERR_NONE;
} }
template <typename T> bool SX126xInterface<T>::reconfigure() template <typename T>
bool SX126xInterface<T>::reconfigure()
{ {
RadioLibInterface::reconfigure(); RadioLibInterface::reconfigure();
@ -169,12 +178,14 @@ template <typename T> bool SX126xInterface<T>::reconfigure()
return RADIOLIB_ERR_NONE; return RADIOLIB_ERR_NONE;
} }
template <typename T> void INTERRUPT_ATTR SX126xInterface<T>::disableInterrupt() template <typename T>
void INTERRUPT_ATTR SX126xInterface<T>::disableInterrupt()
{ {
lora.clearDio1Action(); lora.clearDio1Action();
} }
template <typename T> void SX126xInterface<T>::setStandby() template <typename T>
void SX126xInterface<T>::setStandby()
{ {
checkNotification(); // handle any pending interrupts before we force standby checkNotification(); // handle any pending interrupts before we force standby
@ -185,12 +196,12 @@ template <typename T> void SX126xInterface<T>::setStandby()
assert(err == RADIOLIB_ERR_NONE); assert(err == RADIOLIB_ERR_NONE);
#if defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC) // we have RXEN/TXEN control - turn off RX and TX power // #if defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC) // we have RXEN/TXEN control - turn off RX and TX power
digitalWrite(SX126X_RXEN, LOW); // digitalWrite(SX126X_RXEN, LOW);
#endif // #endif
#if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC) // #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
digitalWrite(SX126X_TXEN, LOW); // digitalWrite(SX126X_TXEN, LOW);
#endif // #endif
isReceiving = false; // If we were receiving, not any more isReceiving = false; // If we were receiving, not any more
disableInterrupt(); disableInterrupt();
@ -200,7 +211,8 @@ template <typename T> void SX126xInterface<T>::setStandby()
/** /**
* Add SNR data to received messages * Add SNR data to received messages
*/ */
template <typename T> void SX126xInterface<T>::addReceiveMetadata(meshtastic_MeshPacket *mp) template <typename T>
void SX126xInterface<T>::addReceiveMetadata(meshtastic_MeshPacket *mp)
{ {
// LOG_DEBUG("PacketStatus %x\n", lora.getPacketStatus()); // LOG_DEBUG("PacketStatus %x\n", lora.getPacketStatus());
mp->rx_snr = lora.getSNR(); mp->rx_snr = lora.getSNR();
@ -209,14 +221,15 @@ template <typename T> void SX126xInterface<T>::addReceiveMetadata(meshtastic_Mes
/** We override to turn on transmitter power as needed. /** We override to turn on transmitter power as needed.
*/ */
template <typename T> void SX126xInterface<T>::configHardwareForSend() template <typename T>
void SX126xInterface<T>::configHardwareForSend()
{ {
#if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC) // we have RXEN/TXEN control - turn on TX power / off RX power // #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC) // we have RXEN/TXEN control - turn on TX power / off RX power
digitalWrite(SX126X_TXEN, HIGH); // digitalWrite(SX126X_TXEN, HIGH);
#endif // #endif
#if defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC) // #if defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC)
digitalWrite(SX126X_RXEN, LOW); // digitalWrite(SX126X_RXEN, LOW);
#endif // #endif
RadioLibInterface::configHardwareForSend(); RadioLibInterface::configHardwareForSend();
} }
@ -224,7 +237,8 @@ template <typename T> void SX126xInterface<T>::configHardwareForSend()
// For power draw measurements, helpful to force radio to stay sleeping // For power draw measurements, helpful to force radio to stay sleeping
// #define SLEEP_ONLY // #define SLEEP_ONLY
template <typename T> void SX126xInterface<T>::startReceive() template <typename T>
void SX126xInterface<T>::startReceive()
{ {
#ifdef SLEEP_ONLY #ifdef SLEEP_ONLY
sleep(); sleep();
@ -232,12 +246,12 @@ template <typename T> void SX126xInterface<T>::startReceive()
setStandby(); setStandby();
#if defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC) // we have RXEN/TXEN control - turn on RX power / off TX power // #if defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC) // we have RXEN/TXEN control - turn on RX power / off TX power
digitalWrite(SX126X_RXEN, HIGH); // digitalWrite(SX126X_RXEN, HIGH);
#endif // #endif
#if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC) // #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
digitalWrite(SX126X_TXEN, LOW); // digitalWrite(SX126X_TXEN, LOW);
#endif // #endif
// int err = lora.startReceive(); // int err = lora.startReceive();
int err = lora.startReceiveDutyCycleAuto(); // We use a 32 bit preamble so this should save some power by letting radio sit in int err = lora.startReceiveDutyCycleAuto(); // We use a 32 bit preamble so this should save some power by letting radio sit in
@ -252,7 +266,8 @@ template <typename T> void SX126xInterface<T>::startReceive()
} }
/** Could we send right now (i.e. either not actively receving or transmitting)? */ /** Could we send right now (i.e. either not actively receving or transmitting)? */
template <typename T> bool SX126xInterface<T>::isChannelActive() template <typename T>
bool SX126xInterface<T>::isChannelActive()
{ {
// check if we can detect a LoRa preamble on the current channel // check if we can detect a LoRa preamble on the current channel
int16_t result; int16_t result;
@ -268,7 +283,8 @@ template <typename T> bool SX126xInterface<T>::isChannelActive()
} }
/** Could we send right now (i.e. either not actively receving or transmitting)? */ /** Could we send right now (i.e. either not actively receving or transmitting)? */
template <typename T> bool SX126xInterface<T>::isActivelyReceiving() template <typename T>
bool SX126xInterface<T>::isActivelyReceiving()
{ {
// The IRQ status will be cleared when we start our read operation. Check if we've started a header, but haven't yet // The IRQ status will be cleared when we start our read operation. Check if we've started a header, but haven't yet
// received and handled the interrupt for reading the packet/handling errors. // received and handled the interrupt for reading the packet/handling errors.
@ -285,7 +301,8 @@ template <typename T> bool SX126xInterface<T>::isActivelyReceiving()
return hasPreamble; return hasPreamble;
} }
template <typename T> bool SX126xInterface<T>::sleep() template <typename T>
bool SX126xInterface<T>::sleep()
{ {
// Not keeping config is busted - next time nrf52 board boots lora sending fails tcxo related? - see datasheet // Not keeping config is busted - next time nrf52 board boots lora sending fails tcxo related? - see datasheet
// \todo Display actual typename of the adapter, not just `SX126x` // \todo Display actual typename of the adapter, not just `SX126x`