Update library.ts, home.ts, agent.ts

Author: eanders-ms

agent.ts

@@ -15,24 +15,24 @@ namespace kojac {
             this.prog.execute();
         }
 
-        public logBoolean(val: boolean, color: number) {
-            this.home.logBoolean(val, color);
+        public logBoolean(name: string, val: boolean, color: number) {
+            this.home.logBoolean(name, val, color);
         }
 
-        public logNumber(val: number, color: number) {
-            this.home.logNumber(val, color);
+        public logNumber(name: string, val: number, color: number) {
+            this.home.logNumber(name, val, color);
         }
 
-        public logString(val: string, color: number) {
-            this.home.logString(val, color);
+        public logString(name: string, val: string, color: number) {
+            this.home.logString(name, val, color);
         }
 
-        public plotBoolean(val: boolean, color: number) {
-            this.home.plotBoolean(val, color);
+        public plotBoolean(name: string, val: boolean, color: number) {
+            this.home.plotBoolean(name, val, color);
         }
 
-        public plotNumber(val: number, color: number) {
-            this.home.plotNumber(val, color);
+        public plotNumber(name: string, val: number, color: number) {
+            this.home.plotNumber(name, val, color);
         }
     }
 }

home.ts

@@ -24,6 +24,8 @@ namespace kojac {
         currView: HomeView;
         logLines: LogLine[];
         agent: Agent;
+        paused: boolean;
+        singleStep: boolean;
 
         constructor(app: App) {
             super(app, "home");
@@ -50,31 +52,45 @@ namespace kojac {
             this.setView(HomeView.Plot);
         }
 
-        public logBoolean(val: boolean, color: number) {
-            this.log(val ? "true": "false", color);
+        public logBoolean(name: string, val: boolean, color: number) {
+            const text = `${name}: ${val ? "true": "false"}`;
+            this.log(text, color);
         }
 
-        public logNumber(val: number, color: number) {
-            this.log(val.toString(), color);
+        public logNumber(name: string, val: number, color: number) {
+            const text = `${name}: ${val.toString()}`;
+            this.log(text, color);
         }
 
-        public logString(val: string, color: number) {
+        public logString(name: string, val: string, color: number) {
+            const text = `${name}: ${val}`;
             this.log(val, color);
         }
 
-        public plotBoolean(val: boolean, color: number) {
+        public plotBoolean(name: string, val: boolean, color: number) {
             this.plot(val ? 1 : 0, color);
         }
 
-        public plotNumber(val: number, color: number) {
+        public plotNumber(name: string, val: number, color: number) {
             this.plot(val, color);
         }
 
         startup() {
             super.startup();
-            controller.left.onEvent(ControllerButtonEvent.Released, function () {
+            controller.left.onEvent(ControllerButtonEvent.Released, () => {
                 this.app.pushStage(new Editor(this.app));
             });
+            controller.up.onEvent(ControllerButtonEvent.Pressed, () => {
+                this.paused = !this.paused;
+                if (this.paused) {
+                    this.log("program paused");
+                } else {
+                    this.log("program resumed");
+                }
+            });
+            controller.right.onEvent(ControllerButtonEvent.Pressed, () => {
+                this.singleStep = true;
+            });
         }
 
         activate() {
@@ -93,6 +109,7 @@ namespace kojac {
                 this.app.save(SAVESLOT_AUTO, progdef);
             }
             this.agent = new Agent(this, progdef);
+            this.paused = false;
             this.log("program started");
         }
 
@@ -104,7 +121,10 @@ namespace kojac {
 
         update(dt: number) {
             super.update(dt);
-            this.agent.update(dt);
+            if (!this.paused || (this.paused && this.singleStep)) {
+                this.agent.update(dt);
+                this.singleStep = false;
+            }
         }
 
         private setView(view: HomeView) {

library.ts

@@ -65,6 +65,7 @@ namespace kojac {
             const value = (mode === "analog") ? pins.analogReadPin(AnalogPin.P1) : pins.digitalReadPin(DigitalPin.P1);
             rule.state["value"] = value;
             rule.state["value_type"] = "number";
+            rule.state["value_name"] = "P1";
             rule.state["exec"] = true;
         },
 
@@ -111,21 +112,22 @@ namespace kojac {
 
         [tid.actuator.log]: (rule: Rule) => {
             const value_type = rule.state["value_type"];
+            const name = rule.state["value_name"];
             const color = 5; // TODO
             switch (value_type) {
                 case "boolean": {
                     const value: boolean = rule.state["value"];
-                    rule.prog.agent.logBoolean(value, color);
+                    rule.prog.agent.logBoolean(name, value, color);
                     break;
                 }
                 case "number": {
                     const value: number = rule.state["value"];
-                    rule.prog.agent.logNumber(value, color);
+                    rule.prog.agent.logNumber(name, value, color);
                     break;
                 }
                 case "string": {
                     const value: string = rule.state["value"];
-                    rule.prog.agent.logString(value, color);
+                    rule.prog.agent.logString(name, value, color);
                     break;
                 }
             }