Skip to content

Commit 7ec3e7a

Browse files
committed
Merge branch 'FixForDelays' of https://github.com/nRF24/RF24Network into FixForDelays
2 parents cb91c78 + c001de3 commit 7ec3e7a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

RF24Network.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,8 +1315,8 @@ bool ESBNetwork<radio_t>::sleepNode(unsigned int cycles, int interruptPin, uint8
13151315

13161316
while (sleep_cycles_remaining) {
13171317
sleep_mode(); // System sleeps here
1318-
} // The WDT_vect interrupt wakes the MCU from here
1319-
sleep_disable(); // System continues execution here when watchdog timed out
1318+
} // The WDT_vect interrupt wakes the MCU from here
1319+
sleep_disable(); // System continues execution here when watchdog timed out
13201320
detachInterrupt(interruptPin);
13211321

13221322
#if defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)

RF24Network.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,12 +973,12 @@ class ESBNetwork
973973
#else // Not Linux:
974974

975975
#if defined(DISABLE_USER_PAYLOADS)
976-
uint8_t frame_queue[1]; /** Space for a small set of frames that need to be delivered to the app layer */
976+
uint8_t frame_queue[1]; /** Space for a small set of frames that need to be delivered to the app layer */
977977
#else
978978
uint8_t frame_queue[MAIN_BUFFER_SIZE]; /** Space for a small set of frames that need to be delivered to the app layer */
979979
#endif
980980

981-
uint8_t* next_frame; /** Pointer into the @p frame_queue where we should place the next received frame */
981+
uint8_t* next_frame; /** Pointer into the @p frame_queue where we should place the next received frame */
982982

983983
#if !defined(DISABLE_FRAGMENTATION)
984984
RF24NetworkFrame frag_queue; /* a cache for re-assembling incoming message fragments */

0 commit comments

Comments
 (0)