From c3bffd5b0344c69727a39c5753fe862b072ff2b8 Mon Sep 17 00:00:00 2001 From: TMRh20 Date: Mon, 29 May 2023 19:44:42 -0600 Subject: [PATCH 1/3] Update examples for new template https://github.com/nRF24/RF24Network/issues/204 --- examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino | 4 ++-- examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino | 4 ++-- .../RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino | 4 ++-- .../RF24Mesh_Example_MasterEncryption.ino | 4 ++-- examples/RF24Network/helloworld_rx/helloworld_rx.ino | 2 +- .../helloworld_rxEncryption/helloworld_rxEncryption.ino | 2 +- examples/RF24Network/helloworld_tx/helloworld_tx.ino | 2 +- .../helloworld_txEncryption/helloworld_txEncryption.ino | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino b/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino index d25730f..4b28293 100644 --- a/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino +++ b/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino @@ -38,8 +38,8 @@ #include nrf_to_nrf radio; -RF24Network network(radio); -RF24Mesh mesh(radio, network); +ESB_Network network(radio); +ESB_Mesh , nrf_to_nrf> mesh(radio, network); RF24EthernetClass RF24Ethernet(radio, network, mesh); IPAddress ip(10, 1, 3, 244); diff --git a/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino b/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino index 0772f46..4a92e7c 100644 --- a/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino +++ b/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino @@ -17,8 +17,8 @@ /**** Configure the nrf24l01 CE and CS pins ****/ nrf_to_nrf radio; -RF24Network network(radio); -RF24Mesh mesh(radio, network); +ESB_Network network(radio); +ESB_Mesh , nrf_to_nrf> mesh(radio, network); /* * User Configuration: nodeID - A unique identifier for each radio. Allows addressing diff --git a/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino b/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino index b4d7c39..027d890 100644 --- a/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino +++ b/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino @@ -19,8 +19,8 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; /**** Configure the nrf24l01 CE and CS pins ****/ nrf_to_nrf radio; -RF24Network network(radio); -RF24Mesh mesh(radio, network); +ESB_Network network(radio); +ESB_Mesh , nrf_to_nrf> mesh(radio, network); /* * User Configuration: nodeID - A unique identifier for each radio. Allows addressing diff --git a/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino b/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino index 0672456..c548b6b 100644 --- a/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino +++ b/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino @@ -24,8 +24,8 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; /***** Configure the chosen CE,CS pins *****/ nrf_to_nrf radio; -RF24Network network(radio); -RF24Mesh mesh(radio, network); +ESB_Network network(radio); +ESB_Mesh , nrf_to_nrf> mesh(radio, network); uint32_t displayTimer = 0; diff --git a/examples/RF24Network/helloworld_rx/helloworld_rx.ino b/examples/RF24Network/helloworld_rx/helloworld_rx.ino index 3399f38..53c1450 100644 --- a/examples/RF24Network/helloworld_rx/helloworld_rx.ino +++ b/examples/RF24Network/helloworld_rx/helloworld_rx.ino @@ -22,7 +22,7 @@ nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -RF24Network network(radio); // Network uses that radio +ESB_Network network(radio); // Network uses that radio const uint16_t this_node = 00; // Address of our node in Octal format (04, 031, etc) const uint16_t other_node = 01; // Address of the other node in Octal format diff --git a/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino b/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino index 8e3b40b..4f19adf 100644 --- a/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino +++ b/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino @@ -24,7 +24,7 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -RF24Network network(radio); // Network uses that radio +ESB_Network network(radio); // Network uses that radio const uint16_t this_node = 00; // Address of our node in Octal format (04, 031, etc) const uint16_t other_node = 01; // Address of the other node in Octal format diff --git a/examples/RF24Network/helloworld_tx/helloworld_tx.ino b/examples/RF24Network/helloworld_tx/helloworld_tx.ino index f24c38a..4f445a2 100644 --- a/examples/RF24Network/helloworld_tx/helloworld_tx.ino +++ b/examples/RF24Network/helloworld_tx/helloworld_tx.ino @@ -21,7 +21,7 @@ nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -RF24Network network(radio); // Network uses that radio +ESB_Network network(radio); // Network uses that radio const uint16_t this_node = 01; // Address of our node in Octal format const uint16_t other_node = 00; // Address of the other node in Octal format diff --git a/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino b/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino index 47e591c..26f927f 100644 --- a/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino +++ b/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino @@ -24,7 +24,7 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -RF24Network network(radio); // Network uses that radio +ESB_Network network(radio); // Network uses that radio const uint16_t this_node = 01; // Address of our node in Octal format const uint16_t other_node = 00; // Address of the other node in Octal format From 0ee831bf11a8dd07a69aadb328b9b8508ad7235f Mon Sep 17 00:00:00 2001 From: TMRh20 Date: Tue, 30 May 2023 04:47:23 -0600 Subject: [PATCH 2/3] Update examples --- examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino | 4 ++-- .../RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino | 4 ++-- .../RF24Mesh_Example_MasterEncryption.ino | 4 ++-- examples/RF24Network/helloworld_rx/helloworld_rx.ino | 2 +- .../helloworld_rxEncryption/helloworld_rxEncryption.ino | 2 +- examples/RF24Network/helloworld_tx/helloworld_tx.ino | 2 +- .../helloworld_txEncryption/helloworld_txEncryption.ino | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino b/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino index 4a92e7c..0b16011 100644 --- a/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino +++ b/examples/RF24Mesh/RF24Mesh_Example/RF24Mesh_Example.ino @@ -17,8 +17,8 @@ /**** Configure the nrf24l01 CE and CS pins ****/ nrf_to_nrf radio; -ESB_Network network(radio); -ESB_Mesh , nrf_to_nrf> mesh(radio, network); +RF52Network network(radio); +RF52Mesh mesh(radio, network); /* * User Configuration: nodeID - A unique identifier for each radio. Allows addressing diff --git a/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino b/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino index 027d890..74aa45c 100644 --- a/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino +++ b/examples/RF24Mesh/RF24Mesh_ExampleEncryption/RF24Mesh_ExampleEncryption.ino @@ -19,8 +19,8 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; /**** Configure the nrf24l01 CE and CS pins ****/ nrf_to_nrf radio; -ESB_Network network(radio); -ESB_Mesh , nrf_to_nrf> mesh(radio, network); +RF52Network network(radio); +RF52Mesh mesh(radio, network); /* * User Configuration: nodeID - A unique identifier for each radio. Allows addressing diff --git a/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino b/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino index c548b6b..8122be1 100644 --- a/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino +++ b/examples/RF24Mesh/RF24Mesh_Example_MasterEncryption/RF24Mesh_Example_MasterEncryption.ino @@ -24,8 +24,8 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; /***** Configure the chosen CE,CS pins *****/ nrf_to_nrf radio; -ESB_Network network(radio); -ESB_Mesh , nrf_to_nrf> mesh(radio, network); +RF52Network network(radio); +RF52Mesh mesh(radio, network); uint32_t displayTimer = 0; diff --git a/examples/RF24Network/helloworld_rx/helloworld_rx.ino b/examples/RF24Network/helloworld_rx/helloworld_rx.ino index 53c1450..d9cdb89 100644 --- a/examples/RF24Network/helloworld_rx/helloworld_rx.ino +++ b/examples/RF24Network/helloworld_rx/helloworld_rx.ino @@ -22,7 +22,7 @@ nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -ESB_Network network(radio); // Network uses that radio +RF52Network network(radio); // Network uses that radio const uint16_t this_node = 00; // Address of our node in Octal format (04, 031, etc) const uint16_t other_node = 01; // Address of the other node in Octal format diff --git a/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino b/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino index 4f19adf..dd27645 100644 --- a/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino +++ b/examples/RF24Network/helloworld_rxEncryption/helloworld_rxEncryption.ino @@ -24,7 +24,7 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -ESB_Network network(radio); // Network uses that radio +RF52Network network(radio); // Network uses that radio const uint16_t this_node = 00; // Address of our node in Octal format (04, 031, etc) const uint16_t other_node = 01; // Address of the other node in Octal format diff --git a/examples/RF24Network/helloworld_tx/helloworld_tx.ino b/examples/RF24Network/helloworld_tx/helloworld_tx.ino index 4f445a2..aacc171 100644 --- a/examples/RF24Network/helloworld_tx/helloworld_tx.ino +++ b/examples/RF24Network/helloworld_tx/helloworld_tx.ino @@ -21,7 +21,7 @@ nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -ESB_Network network(radio); // Network uses that radio +RF52Network network(radio); // Network uses that radio const uint16_t this_node = 01; // Address of our node in Octal format const uint16_t other_node = 00; // Address of the other node in Octal format diff --git a/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino b/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino index 26f927f..140fb61 100644 --- a/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino +++ b/examples/RF24Network/helloworld_txEncryption/helloworld_txEncryption.ino @@ -24,7 +24,7 @@ uint8_t myKey[16] = {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; nrf_to_nrf radio; // nRF24L01(+) radio attached using Getting Started board -ESB_Network network(radio); // Network uses that radio +RF52Network network(radio); // Network uses that radio const uint16_t this_node = 01; // Address of our node in Octal format const uint16_t other_node = 00; // Address of the other node in Octal format From 79f372bfb1da8eb17701be3d2d133e4e9ab4d103 Mon Sep 17 00:00:00 2001 From: TMRh20 Date: Sat, 3 Jun 2023 05:17:36 -0600 Subject: [PATCH 3/3] Update mqtt_basic.ino --- examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino b/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino index 4b28293..2023846 100644 --- a/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino +++ b/examples/RF24Ethernet/mqtt_basic/mqtt_basic.ino @@ -38,9 +38,9 @@ #include nrf_to_nrf radio; -ESB_Network network(radio); -ESB_Mesh , nrf_to_nrf> mesh(radio, network); -RF24EthernetClass RF24Ethernet(radio, network, mesh); +RF52Network network(radio); +RF52Mesh mesh(radio, network); +RF52EthernetClass RF24Ethernet(radio, network, mesh); IPAddress ip(10, 1, 3, 244); IPAddress gateway(10, 1, 3, 33); //Specify the gateway in case different from the server