Merge branch 'master' into nrf52

This commit is contained in:
geeksville
2020-05-27 15:54:44 -07:00
3 changed files with 7 additions and 2 deletions

View File

@@ -71,6 +71,11 @@ bool SX1262Interface::reconfigure()
return ERR_NONE;
}
void INTERRUPT_ATTR SX1262Interface::disableInterrupt()
{
lora.clearDio1Action();
}
void SX1262Interface::setStandby()
{
int err = lora.standby();

View File

@@ -29,7 +29,7 @@ class SX1262Interface : public RadioLibInterface
/**
* Glue functions called from ISR land
*/
virtual void INTERRUPT_ATTR disableInterrupt() { lora.clearDio1Action(); }
virtual void disableInterrupt();
/**
* Enable a particular ISR callback glue function