removed halt and added delayedReboot

Displays a error message before rebooting.

Author: wel97459

examples/companion_radio/main.cpp

@@ -101,8 +101,16 @@ MyMesh the_mesh(radio_driver, fast_rng, rtc_clock, tables, store
 
 /* END GLOBAL OBJECTS */
 
-void halt() {
-  delay(10000);
+void delayedReboot(DisplayDriver* disp, const char *msg, const unsigned long delayms) {
+  #ifdef DISPLAY_CLASS
+    char tmp[32];
+    sprintf(tmp, "Rebooting in %3.1fs", delayms/1000.0);
+    disp->startFrame();
+    disp->drawTextCentered(disp->width() / 2, 24, msg);
+    disp->drawTextCentered(disp->width() / 2, 32, tmp);
+    disp->endFrame();
+  #endif
+  delay(delayms);
   board.reboot();
 }
 
@@ -123,7 +131,13 @@ void setup() {
   }
 #endif
 
-  if (!radio_init()) { halt(); }
+  if (!radio_init()) {
+    #ifdef DISPLAY_CLASS
+      delayedReboot(disp, "Radio Init Failed!", 5000);
+    #else
+      delayedReboot(NULL, NULL, 5000);
+    #endif
+  }
 
   fast_rng.begin(radio_get_rng_seed());
 

examples/simple_repeater/main.cpp

@@ -13,8 +13,16 @@ SimpleMeshTables tables;
 
 MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);
 
-void halt() {
-  delay(10000);
+void delayedReboot(DisplayDriver* disp, const char *msg, const unsigned long delayms) {
+  #ifdef DISPLAY_CLASS
+    char tmp[32];
+    sprintf(tmp, "Rebooting in %3.1fs", delayms/1000.0);
+    disp->startFrame();
+    disp->drawTextCentered(disp->width() / 2, 24, msg);
+    disp->drawTextCentered(disp->width() / 2, 32, tmp);
+    disp->endFrame();
+  #endif
+  delay(delayms);
   board.reboot();
 }
 
@@ -36,7 +44,11 @@ void setup() {
 #endif
 
   if (!radio_init()) {
-    halt();
+    #ifdef DISPLAY_CLASS
+      delayedReboot(disp, "Radio Init Failed!", 5000);
+    #else
+      delayedReboot(NULL, NULL, 5000);
+    #endif
   }
 
   fast_rng.begin(radio_get_rng_seed());

examples/simple_room_server/main.cpp

@@ -12,8 +12,16 @@ StdRNG fast_rng;
 SimpleMeshTables tables;
 MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);
 
-void halt() {
-  delay(10000);
+void delayedReboot(DisplayDriver* disp, const char *msg, const unsigned long delayms) {
+  #ifdef DISPLAY_CLASS
+    char tmp[32];
+    sprintf(tmp, "Rebooting in %3.1fs", delayms/1000.0);
+    disp->startFrame();
+    disp->drawTextCentered(disp->width() / 2, 24, msg);
+    disp->drawTextCentered(disp->width() / 2, 32, tmp);
+    disp->endFrame();
+  #endif
+  delay(delayms);
   board.reboot();
 }
 
@@ -34,7 +42,14 @@ void setup() {
   }
 #endif
 
-  if (!radio_init()) { halt(); }
+    
+  if (!radio_init()) {
+    #ifdef DISPLAY_CLASS
+      delayedReboot(disp, "Radio Init Failed!", 5000);
+    #else
+      delayedReboot(NULL, NULL, 5000);
+    #endif
+  }
 
   fast_rng.begin(radio_get_rng_seed());
 

examples/simple_secure_chat/main.cpp

@@ -550,8 +550,16 @@ StdRNG fast_rng;
 SimpleMeshTables tables;
 MyMesh the_mesh(radio_driver, fast_rng, rtc_clock, tables);
 
-void halt() {
-  delay(10000);
+void delayedReboot(DisplayDriver* disp, const char *msg, const unsigned long delayms) {
+  #ifdef DISPLAY_CLASS
+    char tmp[32];
+    sprintf(tmp, "Rebooting in %3.1fs", delayms/1000.0);
+    disp->startFrame();
+    disp->drawTextCentered(disp->width() / 2, 24, msg);
+    disp->drawTextCentered(disp->width() / 2, 32, tmp);
+    disp->endFrame();
+  #endif
+  delay(delayms);
   board.reboot();
 }
 
@@ -560,7 +568,13 @@ void setup() {
 
   board.begin();
 
-  if (!radio_init()) { halt(); }
+  if (!radio_init()) {
+    #ifdef DISPLAY_CLASS
+      delayedReboot(disp, "Radio Init Failed!", 5000);
+    #else
+      delayedReboot(NULL, NULL, 5000);
+    #endif
+  }
 
   fast_rng.begin(radio_get_rng_seed());
 

examples/simple_sensor/main.cpp

@@ -46,8 +46,16 @@ SimpleMeshTables tables;
 
 MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);
 
-void halt() {
-  delay(10000);
+void delayedReboot(DisplayDriver* disp, const char *msg, const unsigned long delayms) {
+  #ifdef DISPLAY_CLASS
+    char tmp[32];
+    sprintf(tmp, "Rebooting in %3.1fs", delayms/1000.0);
+    disp->startFrame();
+    disp->drawTextCentered(disp->width() / 2, 24, msg);
+    disp->drawTextCentered(disp->width() / 2, 32, tmp);
+    disp->endFrame();
+  #endif
+  delay(delayms);
   board.reboot();
 }
 
@@ -67,7 +75,13 @@ void setup() {
   }
 #endif
 
-  if (!radio_init()) { halt(); }
+  if (!radio_init()) {
+    #ifdef DISPLAY_CLASS
+      delayedReboot(&display, "Radio Init Failed!", 5000);
+    #else
+      delayedReboot(NULL, NULL, 5000);
+    #endif
+  }
 
   fast_rng.begin(radio_get_rng_seed());