Merge pull request #54 from ARMmbed/portability-improvements

Make some portability improvements

Author: meriac

source/btn.cpp

@@ -15,11 +15,14 @@
  * limitations under the License.
  */
 #include "mbed-drivers/mbed.h"
+#include "minar/minar.h"
 #include "uvisor-lib/uvisor-lib.h"
 #include "btn.h"
 #include "main-hw.h"
 #include "box-challenge.h"
 
+using mbed::util::FunctionPointer0;
+
 InterruptIn btn(MAIN_BTN);
 extern Serial pc;
 
@@ -33,10 +36,26 @@ static void btn_onpress(void)
     pc.printf(" done\n\r");
 }
 
+static void btn_set_fall(void)
+{
+    btn.fall(&btn_onpress);
+}
+
 void btn_init(void)
 {
     /* configure pushbutton */
     btn.mode(MAIN_BTN_PUPD);
-    wait(.01);
-    btn.fall(&btn_onpress);
+
+    /* Register the button fall handler after a short delay. */
+    minar::Scheduler::postCallback(FunctionPointer0<void>(btn_set_fall).bind())
+        .delay(minar::milliseconds(10))
+        .tolerance(minar::milliseconds(1));
+
+    /* Set a callback to do the equivalent of pushing the button for us. Every
+     * period, press the button automatically. Pressing the button
+     * automatically after a certain period of time allows us to trigger button
+     * presses even for platforms without physically pressable buttons. */
+    minar::Scheduler::postCallback(FunctionPointer0<void>(btn_onpress).bind())
+        .period(minar::milliseconds(10000))
+        .tolerance(minar::milliseconds(100));
 }

source/main.cpp

@@ -31,7 +31,7 @@ MAIN_ACL(g_main_acl);
 UVISOR_SET_MODE_ACL(UVISOR_ENABLED, g_main_acl);
 
 DigitalOut led(MAIN_LED);
-Serial pc(USBTX, USBRX);
+Serial pc(STDIO_UART_TX, STDIO_UART_RX);
 
 uint8_t g_challenge[CHALLENGE_SIZE];
 minar::Scheduler *g_scheduler;