Skip to content

Commit

Permalink
Fix incorrect pipe for node 05, other
Browse files Browse the repository at this point in the history
- Fix node 05 using incorrect pipe
- Remove print at end of write_to_pipe  - delay of startListening()
function causes missed payloads
- Change debug print of node address info to DEBUG_MINIMAL
  • Loading branch information
TMRh20 committed Mar 23, 2016
1 parent 0e102a2 commit 3a42eb9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions RF24Network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ bool RF24Network::logicalToPhysicalAddress(logicalToPhysicalStruct *conversionIn
uint16_t pre_conversion_send_node = parent_node;

// On which pipe
uint8_t pre_conversion_send_pipe = parent_pipe %5;
uint8_t pre_conversion_send_pipe = parent_pipe;

if(*directTo > TX_ROUTED ){
pre_conversion_send_node = *to_node;
Expand Down Expand Up @@ -1045,12 +1045,12 @@ bool RF24Network::write_to_pipe( uint16_t node, uint8_t pipe, bool multicast )

#endif

#if defined (__arm__) || defined (RF24_LINUX)
/* #if defined (__arm__) || defined (RF24_LINUX)
IF_SERIAL_DEBUG(printf_P(PSTR("%u: MAC Sent on %x %s\n\r"),millis(),(uint32_t)out_pipe,ok?PSTR("ok"):PSTR("failed")));
#else
IF_SERIAL_DEBUG(printf_P(PSTR("%lu: MAC Sent on %lx %S\n\r"),millis(),(uint32_t)out_pipe,ok?PSTR("ok"):PSTR("failed")));
#endif

*/
return ok;
}

Expand Down Expand Up @@ -1131,7 +1131,7 @@ void RF24Network::setup_address(void)
}
parent_pipe = i;

IF_SERIAL_DEBUG( printf_P(PSTR("setup_address node=0%o mask=0%o parent=0%o pipe=0%o\n\r"),node_address,node_mask,parent_node,parent_pipe););
IF_SERIAL_DEBUG_MINIMAL( printf_P(PSTR("setup_address node=0%o mask=0%o parent=0%o pipe=0%o\n\r"),node_address,node_mask,parent_node,parent_pipe););

}

Expand Down

0 comments on commit 3a42eb9

Please sign in to comment.