Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extra Pipes #215

Merged
merged 4 commits into from
Sep 26, 2023
Merged

Extra Pipes #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
639dc4f
Extra Pipes
TMRh20 Sep 26, 2023
48e97cd
Fix comment
TMRh20 Sep 26, 2023
285e68e
Update RF24Network_config.h
TMRh20 Sep 26, 2023
793bfcb
Update RF24Network.cpp
TMRh20 Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions RF24Network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void ESBNetwork<radio_t>::begin(uint8_t _channel, uint16_t _node_address)
setup_address();

// Open up all listening pipes
uint8_t i = 6;
uint8_t i = NUM_PIPES;
while (i--)
radio.openReadingPipe(i, pipe_address(_node_address, i));

Expand Down Expand Up @@ -956,7 +956,7 @@ void ESBNetwork<radio_t>::logicalToPhysicalAddress(logicalToPhysicalStruct* conv
//}
}
else if (is_descendant(*to_node)) {
pre_conversion_send_pipe = 5; // Send to its listening pipe
pre_conversion_send_pipe = NUM_PIPES - 1; // Send to its listening pipe
// If the node is a direct child,
if (is_direct_child(*to_node)) {
// Send directly
Expand Down Expand Up @@ -1131,7 +1131,7 @@ bool ESBNetwork<radio_t>::is_valid_address(uint16_t node)
#endif
while (node) {
uint8_t digit = node & 0x07;
if (digit < 1 || digit > 5) {
if (digit < 1 || digit > (NUM_PIPES - 1)) {
result = false;
IF_SERIAL_DEBUG_MINIMAL(printf_P(PSTR("*** WARNING *** Invalid address 0%o\n\r"), origNode););
break;
Expand Down Expand Up @@ -1181,7 +1181,14 @@ template<class radio_t>
uint64_t ESBNetwork<radio_t>::pipe_address(uint16_t node, uint8_t pipe)
{

static uint8_t address_translation[] = {0xc3, 0x3c, 0x33, 0xce, 0x3e, 0xe3, 0xec};
static uint8_t address_translation[] = {0xc3, 0x3c, 0x33, 0xce, 0x3e, 0xe3, 0xec
#if NUM_PIPES > 6
, 0xee
#if NUM_PIPES > 7
, 0xed
#endif
#endif
};
uint64_t result = 0xCCCCCCCCCCLL;
uint8_t* out = reinterpret_cast<uint8_t*>(&result);

Expand Down
6 changes: 6 additions & 0 deletions RF24Network_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
/** Enable dynamic payloads - If using different types of nRF24L01 modules, some may be incompatible when using this feature **/
#define ENABLE_DYNAMIC_PAYLOADS
#endif // DISABLE_DYNAMIC_PAYLOADS

/** The number of 'pipes' available for addressing in the current device
* Networks with NRF24L01 devices only have 6 pipes
* NRF52x networks support up to 8 pipes
*/
#define NUM_PIPES 6

/* Debug Options */
//#define SERIAL_DEBUG
Expand Down