fix: clear status light state after 2 announce cycles

microsoft · Jul 17, 2023 · ce86a4e · ce86a4e
1 parent c32b44e
commit ce86a4e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/jdom/device.ts b/src/jdom/device.ts
@@ -772,6 +772,9 @@ export class JDDevice extends JDNode {
             this.bus.emit(CHANGE)
             this.emit(CHANGE)
         }
+
+        // update status led
+        this.statusLight?.processAnnouncement()
     }
 
     /**
@@ -851,7 +854,7 @@ export class JDDevice extends JDNode {
             pkt.isCommand &&
             pkt.serviceCommand == ControlCmd.SetStatusLight
         )
-            pkt.device.statusLight?.handlePacket(pkt)
+            pkt.device.statusLight?.processPacket(pkt)
     }
 
     /**

diff --git a/src/jdom/ledcontroller.ts b/src/jdom/ledcontroller.ts
@@ -15,6 +15,7 @@ function trgbToValues(trgb: number) {
 
 export class LEDController extends JDEventSource {
     private _color: number
+    private _announces = 0
 
     constructor(
         public readonly service: JDService,
@@ -30,6 +31,8 @@ export class LEDController extends JDEventSource {
     async setColor(color: number) {
         if (color !== this._color) {
             this._color = color
+            this._announces = 0
+
             if (this._color !== undefined) {
                 const data = jdpack(
                     ControlCmdPack.SetStatusLight,
@@ -51,7 +54,18 @@ export class LEDController extends JDEventSource {
         }
     }
 
-    handlePacket(pkt: Packet) {
+    processAnnouncement() {
+        if (this._color === undefined) return
+        this._announces++
+        if (this._announces > 2) {
+            // jacdac will blink at least once per announce cycle
+            this._color = undefined
+            this._announces = 0
+            this.emit(CHANGE)
+        }
+    }
+
+    processPacket(pkt: Packet) {
         const [toRed, toGreen, toBlue] = jdunpack<
             [number, number, number, number]
         >(pkt.data, ControlCmdPack.SetStatusLight)