Fix order of event stop and event start (#14)

Author: microbit-robert

autogenerated.ts

@@ -13,16 +13,24 @@ namespace ml {
   events = [event.Unknown, event.Shake, event.Still, event.DrawCircle];
 
   control.onEvent(MlRunnerIds.MlRunnerInference, 1, () => {
-    maybeUpdateEventStats(event.Unknown);
+    if (!event.Unknown.onStartHandler) {
+      maybeUpdateEventStats(event.Unknown);
+    }
   });
   control.onEvent(MlRunnerIds.MlRunnerInference, 2, () => {
-    maybeUpdateEventStats(event.Shake);
+    if (!event.Shake.onStartHandler) {
+      maybeUpdateEventStats(event.Shake);
+    }
   });
   control.onEvent(MlRunnerIds.MlRunnerInference, 3, () => {
-    maybeUpdateEventStats(event.Still);
+    if (!event.Still.onStartHandler) {
+      maybeUpdateEventStats(event.Still);
+    }
   });
   control.onEvent(MlRunnerIds.MlRunnerInference, 4, () => {
-    maybeUpdateEventStats(event.DrawCircle);
+    if (!event.DrawCircle.onStartHandler) {
+      maybeUpdateEventStats(event.DrawCircle);
+    }
   });
 
   getModelBlob = (): Buffer => {

pxtextension.ts

@@ -4,6 +4,7 @@ class MlEvent {
   eventValue: number;
   eventLabel: string;
   lastDuration: number;
+  onStartHandler: () => void;
   onStopHandler: () => void;
   onStopDetailedHandler: (duration: number) => void;
 
@@ -23,30 +24,33 @@ namespace ml {
   }
 
   export let events = [event.Unknown];
-  let prevEventInstance: MlEvent = event.Unknown;
+  let prevEvent: MlEvent | undefined;
   let currentEvent: MlEvent = event.Unknown;
   let lastEventTimestamp: number = 0;
 
   export function maybeUpdateEventStats(currentEvent: MlEvent) {
-    if (currentEvent !== prevEventInstance) {
-      let now = input.runningTime();
-      prevEventInstance.lastDuration = now - lastEventTimestamp;
+    const now = input.runningTime();
+    if (!prevEvent) {
+      lastEventTimestamp = now;
+      prevEvent = currentEvent;
+      return;
+    }
+    if (currentEvent !== prevEvent) {
+      prevEvent.lastDuration = now - lastEventTimestamp;
 
-      if (prevEventInstance.onStopDetailedHandler) {
-        prevEventInstance.onStopDetailedHandler(prevEventInstance.lastDuration);
+      if (prevEvent.onStopDetailedHandler) {
+        prevEvent.onStopDetailedHandler(prevEvent.lastDuration);
       }
 
-      if (prevEventInstance.onStopHandler) {
-        prevEventInstance.onStopHandler();
+      if (prevEvent.onStopHandler) {
+        prevEvent.onStopHandler();
       }
 
       lastEventTimestamp = now;
-      prevEventInstance = currentEvent;
+      prevEvent = currentEvent;
     }
   }
 
-  const deviceIsSim = control.deviceName().slice(0, 3) === "sim";
-
   /**
    * Run this code when the model detects the input label has been predicted.
    *
@@ -63,12 +67,11 @@ namespace ml {
   //% parts="v2"
   //% group="micro:bit (V2)"
   export function onStart(event: MlEvent, body: () => void): void {
+    event.onStartHandler = body;
     const wrappedBody = () => {
-      if (prevEventInstance !== event || deviceIsSim) {
-        body();
-      }
-      if (prevEventInstance !== event && deviceIsSim) {
+      if (prevEvent !== event) {
         maybeUpdateEventStats(event);
+        body();
       }
     };
     if (!isRunning()) {