move SPI init into main

This commit is contained in:
geeksville
2020-04-30 17:56:30 -07:00
parent e9ca7792eb
commit 48c045a253
4 changed files with 20 additions and 9 deletions

View File

@@ -14,9 +14,6 @@ RF95Interface::RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOL
/// \return true if initialisation succeeded.
bool RF95Interface::init()
{
// FIXME, move this to main
SPI.begin();
applyModemConfig();
if (power > 20) // This chip has lower power limits than some
power = 20;
@@ -46,6 +43,11 @@ bool RF95Interface::init()
return res == ERR_NONE;
}
void INTERRUPT_ATTR RF95Interface::disableInterrupt()
{
lora->clearDio0Action();
}
bool RF95Interface::reconfigure()
{
applyModemConfig();

View File

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

View File

@@ -12,9 +12,6 @@ SX1262Interface::SX1262Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RA
/// \return true if initialisation succeeded.
bool SX1262Interface::init()
{
// FIXME, move this to main
SPI.begin();
float tcxoVoltage = 0; // None - we use an XTAL
bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC?