Merge commit 'refs/changes/64/1864/1' of ssh://git.numworks.com/CalcOS

Change-Id: I596a0df552272eaeab707170e1da0dbee9e8d1d4

ion/src/device/boot/rt0.cpp

@@ -6,7 +6,6 @@ extern "C" {
 #include <ion.h>
 #include "../device.h"
 #include "../console.h"
-#include "../bench/bench.h"
 
 typedef void (*cxx_constructor)();
 
@@ -62,14 +61,6 @@ void start() {
 
   Ion::Device::init();
 
-  if (Ion::Console::Device::peerConnected()) {
-  /*Ion::Keyboard::State state = Ion::Keyboard::scan();
-  if (Ion::Keyboard::keyDown(Ion::Keyboard::Key::A1, state) &&
-      Ion::Keyboard::keyDown(Ion::Keyboard::Key::I5, state)) {
-      */
-    Ion::Device::Bench::run();
-  }
-
   ion_app();
 
   abort();

ion/src/device/device.cpp

@@ -13,6 +13,7 @@ extern "C" {
 #include "console.h"
 #include "swd.h"
 #include "usb.h"
+#include "bench/bench.h"
 
 #define USE_SD_CARD 0
 
@@ -111,7 +112,13 @@ void init() {
     GPIO(g).PUPDR()->set(0x00000000); // All to "None"
   }
 
+  bool consolePeerConnectedOnBoot = Ion::Console::Device::peerConnected();
+
   initPeripherals();
+
+  if (consolePeerConnectedOnBoot) {
+    Ion::Device::Bench::run();
+  }
 }
 
 void shutdown() {