oops - fix up return logic

Author: thomasjball

cpp/jddisplay.cpp

@@ -103,7 +103,8 @@ JDDisplay::JDDisplay(SPI *spi, Pin *cs, Pin *flow) : spi(spi), cs(cs), flow(flow
 
 void JDDisplay::pollButtons(Event) {
     if (stepWaiting) {
-        stepPrefix();
+        if (stepPrefix())
+            return;
         flushSend();
     }
 }
@@ -225,15 +226,15 @@ void JDDisplay::handleIncoming(jd_packet_t *pkt) {
 }
 
 
-void JDDisplay::stepPrefix() {
+bool JDDisplay::stepPrefix() {
     if (cs)
         cs->setDigitalValue(1);
 
     target_disable_irq();
     if (!flow->getDigitalValue()) {
         stepWaiting = true;
         target_enable_irq();
-        return;
+        return true;
     }
     stepWaiting = false;
     target_enable_irq();
@@ -255,10 +256,12 @@ void JDDisplay::stepPrefix() {
                 break;
         }
     }
+    return false;
 }
 
 void JDDisplay::step() {
-    stepPrefix();
+    if (stepPrefix())
+        return;
 
     if (displayServiceNum == 0) {
         // poke the control service to enumerate

cpp/jddisplay.h

@@ -44,7 +44,7 @@ class JDDisplay {
 
     void *queuePkt(uint32_t service_num, uint32_t service_cmd, uint32_t size);
     void flushSend();
-    void stepPrefix();
+    bool stepPrefix();
     void step();
     void sendDone(JDDisplay* jdd);
     static void stepStatic(void *);

test.ts

@@ -1,15 +1,16 @@
-// controller.B.onEvent(ControllerButtonEvent.Pressed, function () {
-//     screen().fill(8)
-//     screen().drawLine(0, 0, 160, 120, 1)
-//     screen().drawLine(160, 0, 0, 120, 1)
-// })
-// controller.A.onEvent(ControllerButtonEvent.Pressed, function () {
-//     screen().fill(0)
-//     screen().fillCircle(0, 0, 20, 3)
-//     screen().fillCircle(160, 0, 20, 9)
-//     screen().fillCircle(160, 120, 20, 7)
-//     screen().fillCircle(0, 120, 20, 5)
-// })
+controller.left.onEvent(ControllerButtonEvent.Pressed, function () {
+    screen().fill(8)
+    screen().drawLine(0, 0, 160, 120, 1)
+    screen().drawLine(160, 0, 0, 120, 1)
+})
+
+controller.right.onEvent(ControllerButtonEvent.Pressed, function () {
+    screen().fill(0)
+    screen().fillCircle(0, 0, 20, 3)
+    screen().fillCircle(160, 0, 20, 9)
+    screen().fillCircle(160, 120, 20, 7)
+    screen().fillCircle(0, 120, 20, 5)
+})
 
 let presses = 0;
 controller.A.onEvent(