Moved network startup into main(), so it only fires up the network ON…

…CE. Compiles only, not tested.
nRF24 · Dec 21, 2011 · 37e55d4 · 37e55d4
1 parent e592e2e
commit 37e55d4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/tests/unit/PingTest.test b/tests/unit/PingTest.test
@@ -50,10 +50,6 @@ public:
   }
   void setUp()
   {
-    SPI.begin();
-    radio.begin();
-    network.begin(/* channel */100,/* this node */0);
-
     // Reset remote to initial state
     RF24NetworkHeader header(/*to node*/ 1, /*type*/ 'R' /*Reset*/);
     network.write(header,0,0);

diff --git a/tests/unit/SyncTest.test b/tests/unit/SyncTest.test
@@ -62,10 +62,6 @@ public:
   }
   void setUp()
   {
-    SPI.begin();
-    radio.begin();
-    network.begin(/* channel */100,/* this node */0);
-
     pSync = new Sync(network);
     pSync->begin(/* other node*/ 1);
     p_sync_data = new(sync_data_t);

diff --git a/tests/unit/runner.cpp b/tests/unit/runner.cpp
@@ -12,20 +12,32 @@
 #include <cxxtest/RealDescriptions.h>
 #include <cxxtest/TestMain.h>
 #include <cxxtest/ErrorPrinter.h>
+#include <cxxtest/Root.cpp>
+
+#include <RF24Network_config.h>
+#include <RF24Network.h>
+#include <RF24.h>
 
 extern void board_start(const char*);
+extern RF24Network network;
+extern RF24 radio;
 
-int main( void ) {
-    CxxTest::ErrorPrinter tmp;
+int main( void ) 
+{
+  CxxTest::ErrorPrinter tmp;
 
+  while(1)
+  {
     board_start(__FILE__);
+
+    SPI.begin();
+    radio.begin();
+    network.begin(/* channel */100,/* this node */0);
 
     CxxTest::Main<CxxTest::ErrorPrinter>( tmp, 0, NULL );
 
-    printf("Tests complete.  Stopping\r\n");
-	while(1)
-	{
-	}
+    printf("Tests complete.  Restarting...\r\n");
+  }
 }
-#include <cxxtest/Root.cpp>
 const char* CxxTest::RealWorldDescription::_worldName = "cxxtest";
+// vim:cin:ai:sts=2 sw=2 ft=cpp