forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[LR11x0] Rework generic IRQ to allow multiple flags

Browse source
This commit is contained in:
jgromes 2024-08-25 18:12:03 +02:00
parent 644d0ecef8
commit ef5ee1f089
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/modules/LR11x0/LR11x0.cpp
View file

@ -480,10 +480,9 @@ int16_t LR11x0::startReceive(uint32_t timeout, uint32_t irqFlags, uint32_t irqMa
// set DIO mapping // set DIO mapping
uint32_t irq = irqFlags; uint32_t irq = irqFlags;
if(timeout != RADIOLIB_LR11X0_RX_TIMEOUT_INF) { if(timeout != RADIOLIB_LR11X0_RX_TIMEOUT_INF) {
irq |= RADIOLIB_LR11X0_IRQ_TIMEOUT; irq |= (1UL << RADIOLIB_IRQ_TIMEOUT);
} }
state = setDioIrqParams(getIrqMapped(irq));
state = setDioIrqParams(irq);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// clear interrupt flags // clear interrupt flags
@ -1353,12 +1352,6 @@ RadioLibTime_t LR11x0::calculateRxTimeout(RadioLibTime_t timeoutUs) {
return(timeout); return(timeout);
} }
int16_t LR11x0::irqRxDoneRxTimeout(uint32_t &irqFlags, uint32_t &irqMask) {
irqFlags = RADIOLIB_LR11X0_IRQ_RX_DONE | RADIOLIB_LR11X0_IRQ_TIMEOUT; // flags that can appear in the IRQ register
irqMask = irqFlags; // on LR11x0, these are the same
return(RADIOLIB_ERR_NONE);
}
uint32_t LR11x0::getIrqFlags() { uint32_t LR11x0::getIrqFlags() {
return((uint32_t)this->getIrqStatus()); return((uint32_t)this->getIrqStatus());
} }

8
src/modules/LR11x0/LR11x0.h
View file

@ -1216,14 +1216,6 @@ class LR11x0: public PhysicalLayer {
*/ */
RadioLibTime_t calculateRxTimeout(RadioLibTime_t timeoutUs) override; RadioLibTime_t calculateRxTimeout(RadioLibTime_t timeoutUs) override;
/*!
\brief Create the flags that make up RxDone and RxTimeout used for receiving downlinks
\param irqFlags The flags for which IRQs must be triggered
\param irqMask Mask indicating which IRQ triggers a DIO
\returns \ref status_codes
*/
int16_t irqRxDoneRxTimeout(uint32_t &irqFlags, uint32_t &irqMask) override;
/*! /*!
\brief Read currently active IRQ flags. \brief Read currently active IRQ flags.
\returns IRQ flags. \returns IRQ flags.