pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-03 20:30:43 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into nrf52

Browse Source
This commit is contained in:
geeksville 2020-05-27 15:54:44 -07:00
commit ed0f79b683
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesh/SX1262Interface.cpp
View File

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

2
src/mesh/SX1262Interface.h
View File

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

2
src/sleep.cpp
View File

@ -273,7 +273,7 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause(); esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
if (cause == ESP_SLEEP_WAKEUP_GPIO) if (cause == ESP_SLEEP_WAKEUP_GPIO)
DEBUG_MSG("Exit light sleep gpio: btn=%d, rf95=%d\n", !digitalRead(BUTTON_PIN), digitalRead(RF95_IRQ_GPIO)); DEBUG_MSG("Exit light sleep gpio: btn=%d\n", !digitalRead(BUTTON_PIN));
return cause; return cause;
} }