Merge branch 'master' into CMake-4-Linux

nRF24 · Nov 14, 2021 · b3915b2 · b3915b2
2 parents a33695b + b6c6f1c
commit b3915b2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/RF24Mesh.cpp b/RF24Mesh.cpp
@@ -273,7 +273,12 @@ uint16_t RF24Mesh::renewAddress(uint32_t timeout)
     while (!requestAddress(reqCounter)) {
         if (millis() - start > timeout) { return 0; }
 
-        delay(50 + ((totalReqs + 1) * (reqCounter + 1)) * 2);
+        uint32_t timeoutInternal = 50 + ((totalReqs + 1) * (reqCounter + 1)) * 2;
+        uint32_t startInternal = millis();
+        while (millis() - startInternal < timeoutInternal) {
+            MESH_CALLBACK
+            delay(1);
+        }
         reqCounter++;
         reqCounter = reqCounter % 4;
         totalReqs++;

diff --git a/examples_RPi/Makefile b/examples_RPi/Makefile
@@ -40,7 +40,7 @@ all: ${PROGRAMS}
 
 ${PROGRAMS}: ${SOURCES}
 	mkdir -p bin
-	$(CC) ${CCFLAGS} -Wall -I../ -lrf24-bcm -lrf24network -lrf24mesh $@.cpp -o bin/$@
+	$(CC) ${CCFLAGS} -Wall -I../ $@.cpp -lrf24-bcm -lrf24network -lrf24mesh -o bin/$@
 
 clean:
 	rm -rf $(PROGRAMS)

diff --git a/examples_RPi/ncurses/Makefile b/examples_RPi/ncurses/Makefile
@@ -40,7 +40,7 @@ all: ${PROGRAMS}
 
 ${PROGRAMS}: ${SOURCES}
 	mkdir -p bin
-	$(CC) ${CCFLAGS} -Wall -I../ -lncurses -lrf24-bcm -lrf24network -lrf24mesh $@.cpp -o bin/$@
+	$(CC) ${CCFLAGS} -Wall -I../ $@.cpp -lncurses -lrf24-bcm -lrf24network -lrf24mesh -o bin/$@
 
 clean:
 	rm -rf $(PROGRAMS)

diff --git a/examples_RPi/ncurses/RF24Mesh_Ncurses_Master.cpp b/examples_RPi/ncurses/RF24Mesh_Ncurses_Master.cpp
@@ -26,6 +26,7 @@
 #include <RF24Network/RF24Network.h>
 
 RF24 radio(22, 0);
+
 RF24Network network(radio);
 RF24Mesh mesh(radio, network);
 

diff --git a/pyRF24Mesh/pyRF24Mesh.cpp b/pyRF24Mesh/pyRF24Mesh.cpp
@@ -104,4 +104,4 @@ BOOST_PYTHON_MODULE(RF24Mesh)
             //void setStaticAddress(uint8_t nodeID, uint16_t address);
             .def("setStaticAddress", &RF24Mesh::setStaticAddress, (bp::arg("nodeID"), bp::arg("address")));
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,4 +104,4 @@ BOOST_PYTHON_MODULE(RF24Mesh) @@
                 //void setStaticAddress(uint8_t nodeID, uint16_t address);
                 .def("setStaticAddress", &RF24Mesh::setStaticAddress, (bp::arg("nodeID"), bp::arg("address")));
         }
-    }
+    }