From d7dfd6a4080ec25be5bdafa9ab898d4d77ca8190 Mon Sep 17 00:00:00 2001
From: Jake Read <jake.read@cba.mit.edu>
Date: Wed, 6 Nov 2019 15:53:21 -0500
Subject: [PATCH] restore systems fixed
---
hunks/view.js | 2 +
save/contexts/cuttlefish/png-to-vectors.json | 50 +-
save/systems/dbg-l0.json | 179 +++++
save/systems/dbg-l1-3added.json | 509 ++++++++++++++
save/systems/dbg-l1-abcReady.json | 677 +++++++++++++++++++
typeset.js | 8 +-
view/vptch.js | 35 +-
7 files changed, 1434 insertions(+), 26 deletions(-)
create mode 100644 save/systems/dbg-l0.json
create mode 100644 save/systems/dbg-l1-3added.json
create mode 100644 save/systems/dbg-l1-abcReady.json
diff --git a/hunks/view.js b/hunks/view.js
index fef8a94..78bd4fb 100644
--- a/hunks/view.js
+++ b/hunks/view.js
@@ -652,10 +652,12 @@ function View() {
MSGS.writeTo(msg, st.name, 'string')
MSGS.writeTo(msg, st.type, 'string')
MSGS.writeTo(msg, st.value, st.type)
+ /*
if (this.interpreterName === "ponyo" && type === "link") {
console.log(`STATE SER FOR: ${st.value} into ${name}`)
console.log(msg.slice(msgbegin))
}
+ */
}
}
promiseThis(msg, (def) => {
diff --git a/save/contexts/cuttlefish/png-to-vectors.json b/save/contexts/cuttlefish/png-to-vectors.json
index 75cc45c..6b8f27d 100644
--- a/save/contexts/cuttlefish/png-to-vectors.json
+++ b/save/contexts/cuttlefish/png-to-vectors.json
@@ -88,6 +88,10 @@
"inHunkInput": "0"
}
]
+ },
+ {
+ "name": "dpi",
+ "type": "number"
}
],
"states": [
@@ -127,6 +131,26 @@
"inHunkInput": "0"
}
]
+ },
+ {
+ "name": "width",
+ "type": "number",
+ "connections": [
+ {
+ "inHunkIndex": "7",
+ "inHunkInput": "1"
+ }
+ ]
+ },
+ {
+ "name": "height",
+ "type": "number",
+ "connections": [
+ {
+ "inHunkIndex": "7",
+ "inHunkInput": "2"
+ }
+ ]
}
]
},
@@ -159,6 +183,14 @@
{
"name": "image",
"type": "Float32Array"
+ },
+ {
+ "name": "width",
+ "type": "number"
+ },
+ {
+ "name": "height",
+ "type": "number"
}
],
"outputs": [
@@ -178,16 +210,6 @@
"name": "offset",
"type": "number",
"value": "0.5"
- },
- {
- "name": "width",
- "type": "number",
- "value": "190"
- },
- {
- "name": "height",
- "type": "number",
- "value": "266"
}
]
},
@@ -224,6 +246,14 @@
{
"name": "Vectors",
"type": "array"
+ },
+ {
+ "name": "width",
+ "type": "number"
+ },
+ {
+ "name": "height",
+ "type": "number"
}
]
},
diff --git a/save/systems/dbg-l0.json b/save/systems/dbg-l0.json
new file mode 100644
index 0000000..6fa5362
--- /dev/null
+++ b/save/systems/dbg-l0.json
@@ -0,0 +1,179 @@
+{
+ "interpreterName": "cuttlefish",
+ "interpreterVersion": "v0.1",
+ "hunks": [
+ {
+ "type": "manager",
+ "name": "nrol",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "tlview",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "0",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_2",
+ "inputs": [
+ {
+ "name": "data",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "3",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "4",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "pipes/vfptc",
+ "name": "pipes/vfptc_3",
+ "inputs": [
+ {
+ "name": "data",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "pipe status",
+ "type": "string",
+ "value": "open"
+ },
+ {
+ "name": "websocket port",
+ "type": "string",
+ "value": "2042"
+ },
+ {
+ "name": "usb product id",
+ "type": "string",
+ "value": "8022"
+ },
+ {
+ "name": "pipe reset",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "serialport status",
+ "type": "string",
+ "value": "open"
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "view_4",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "1"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/save/systems/dbg-l1-3added.json b/save/systems/dbg-l1-3added.json
new file mode 100644
index 0000000..aaa0ffa
--- /dev/null
+++ b/save/systems/dbg-l1-3added.json
@@ -0,0 +1,509 @@
+{
+ "interpreterName": "cuttlefish",
+ "interpreterVersion": "v0.1",
+ "hunks": [
+ {
+ "type": "manager",
+ "name": "nrol",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "tlview",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "0",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_2",
+ "inputs": [
+ {
+ "name": "data",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "3",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "4",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "true"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "1"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ],
+ "contains": {
+ "interpreterName": "ponyo",
+ "interpreterVersion": "v0.1",
+ "hunks": [
+ {
+ "type": "manager",
+ "name": "ponyo_one",
+ "inputs": [
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "1"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_1",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "0",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "true"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "2"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "comm/COBS_USB",
+ "name": "comm/COBS_USB_2",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "comm/COBSerial_A",
+ "name": "comm/COBSerial_A_3",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "6",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "comm/COBSerial_B",
+ "name": "comm/COBSerial_B_4",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "7",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "comm/COBSerial_C",
+ "name": "comm/COBSerial_C_5",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "8",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_6",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "3",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_7",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "4",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_8",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "5",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ }
+ ]
+ }
+ },
+ {
+ "type": "pipes/vfptc",
+ "name": "pipes/vfptc_3",
+ "inputs": [
+ {
+ "name": "data",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "pipe status",
+ "type": "string",
+ "value": "open"
+ },
+ {
+ "name": "websocket port",
+ "type": "string",
+ "value": "2042"
+ },
+ {
+ "name": "usb product id",
+ "type": "string",
+ "value": "8022"
+ },
+ {
+ "name": "pipe reset",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "serialport status",
+ "type": "string",
+ "value": "open"
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "view_4",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "1"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/save/systems/dbg-l1-abcReady.json b/save/systems/dbg-l1-abcReady.json
new file mode 100644
index 0000000..5986a57
--- /dev/null
+++ b/save/systems/dbg-l1-abcReady.json
@@ -0,0 +1,677 @@
+{
+ "interpreterName": "cuttlefish",
+ "interpreterVersion": "v0.1",
+ "hunks": [
+ {
+ "type": "manager",
+ "name": "nrol",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "tlview",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "0",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_2",
+ "inputs": [
+ {
+ "name": "data",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs",
+ "type": "byteArray"
+ },
+ {
+ "name": "auto_253_2",
+ "type": "byteArray"
+ },
+ {
+ "name": "auto_112_3",
+ "type": "byteArray"
+ },
+ {
+ "name": "auto_131_4",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "3",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "4",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "auto_138_3",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "5",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "auto_123_4",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "6",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "auto_87_5",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "7",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "true"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "1"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray), auto_253_2 (byteArray), auto_112_3 (byteArray), auto_131_4 (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray), auto_138_3 (byteArray), auto_123_4 (byteArray), auto_87_5 (byteArray)"
+ }
+ ],
+ "contains": {
+ "interpreterName": "ponyo",
+ "interpreterVersion": "v0.1",
+ "hunks": [
+ {
+ "type": "manager",
+ "name": "ponyo_one",
+ "inputs": [
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "1"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_1",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "auto_158_3_512",
+ "type": "byteArray"
+ },
+ {
+ "name": "auto_231_4_512",
+ "type": "byteArray"
+ },
+ {
+ "name": "auto_24_5_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "0",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "auto_125_2_512",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "6",
+ "inHunkInput": "1"
+ }
+ ]
+ },
+ {
+ "name": "auto_171_3_512",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "7",
+ "inHunkInput": "1"
+ }
+ ]
+ },
+ {
+ "name": "auto_120_4_512",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "8",
+ "inHunkInput": "1"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "true"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "2"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray), pa (byteArray), pb (byteArray), pc (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray), pa (byteArray), pb (byteArray), pc (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "comm/COBS_USB",
+ "name": "comm/COBS_USB_2",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "comm/COBSerial_A",
+ "name": "comm/COBSerial_A_3",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "6",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "comm/COBSerial_B",
+ "name": "comm/COBSerial_B_4",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "7",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "comm/COBSerial_C",
+ "name": "comm/COBSerial_C_5",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "8",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_6",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "3",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "2"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_7",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "4",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "3"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ },
+ {
+ "type": "link",
+ "name": "link_8",
+ "inputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray"
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data_1024",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "5",
+ "inHunkInput": "0"
+ }
+ ]
+ },
+ {
+ "name": "mgrMsgs_512",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "1",
+ "inHunkInput": "4"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "isActive",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "otherLink",
+ "type": "uint16",
+ "value": "0"
+ },
+ {
+ "name": "inputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ },
+ {
+ "name": "outputList",
+ "type": "string",
+ "value": "mgrMsgs (byteArray)"
+ }
+ ]
+ }
+ ]
+ }
+ },
+ {
+ "type": "pipes/vfptc",
+ "name": "pipes/vfptc_3",
+ "inputs": [
+ {
+ "name": "data",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "data",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "0"
+ }
+ ]
+ }
+ ],
+ "states": [
+ {
+ "name": "pipe status",
+ "type": "string",
+ "value": "open"
+ },
+ {
+ "name": "websocket port",
+ "type": "string",
+ "value": "2042"
+ },
+ {
+ "name": "usb product id",
+ "type": "string",
+ "value": "8022"
+ },
+ {
+ "name": "pipe reset",
+ "type": "boolean",
+ "value": "false"
+ },
+ {
+ "name": "serialport status",
+ "type": "string",
+ "value": "open"
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "view_4",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "1"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "view_5",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "2"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "view_6",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "3"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "view",
+ "name": "view_7",
+ "inputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray"
+ }
+ ],
+ "outputs": [
+ {
+ "name": "msgs",
+ "type": "byteArray",
+ "connections": [
+ {
+ "inHunkIndex": "2",
+ "inHunkInput": "4"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/typeset.js b/typeset.js
index a41959e..1edd15a 100644
--- a/typeset.js
+++ b/typeset.js
@@ -652,22 +652,22 @@ const MSGS = {
// course correction here: sometimes states that are numbers are saved as strings (json)
// we can unf- this here,
if (typeof thing === 'string' && isNumType(type)) {
- console.warn('patching num')
+ //console.warn('patching num')
if (isIntType(type)) {
thing = parseInt(thing)
} else {
thing = parseFloat(thing)
}
- console.log('new num val', thing)
+ //console.log('new num val', thing)
} else if (typeof thing === 'string' && type === 'boolean') {
// ha! use (?) for 'truthiness'
- console.warn('patching bool')
+ //console.warn('patching bool')
if (thing == 'true') {
thing = true
} else {
thing = false
}
- console.log('new bool val', thing)
+ //console.log('new bool val', thing)
}
let block = phy.write(thing)
if (debug)
diff --git a/view/vptch.js b/view/vptch.js
index 30225c9..0d85ef0 100644
--- a/view/vptch.js
+++ b/view/vptch.js
@@ -128,21 +128,25 @@ function PatchSet(View, MsgBox) {
} else {
// check state,
for (let st in existing.states) {
+ if (debug) console.log(`state change: st`, spec.states[st])
// check if each exists, tho
if (spec.states[st]) {
- if (existing.states[st].value === spec.states[st].value) continue
- } else {
- // oh boy
- //console.log(`${n} UPPER BOUND STATECHANGE CALL`)
- try {
- if (debug) console.log(`PATCH ${view.interpreterName}: req change for state: ${existing.states[st].name}`)
- await view.requestStateChange(existing.states[st], spec.states[st].value)
- } catch (err) {
- reject(`error in requesting state change during patch merge ${err}`)
+ if (existing.states[st].value === spec.states[st].value) {
+ if (debug) console.log('continue')
+ continue
+ } else {
+ // oh boy
+ if (debug)console.log(`${n} UPPER BOUND STATECHANGE CALL`)
+ try {
+ if (debug)if (true) console.log(`STCHNG: PATCH ${view.interpreterName}: req change for state: ${existing.states[st].name}`)
+ await view.requestStateChange(existing.states[st], spec.states[st].value)
+ } catch (err) {
+ reject(`error in requesting state change during patch merge ${err}`)
+ }
+ if (debug)console.log(`${n} LOWER BOUND STATECHANGE CALL`)
}
- //console.log(`${n} LOWER BOUND STATECHANGE CALL`)
- }
- }
+ } // state doesn't exist,
+ } // end for-existing-states
}
} else {
// not existing, so just a straightforward add
@@ -186,6 +190,13 @@ function PatchSet(View, MsgBox) {
// the output, the input
let opDef = view.defs[opHunkIndex].outputs[opIndex]
let ipDef = view.defs[inHunkIndex].inputs[inIndex]
+ // these should exist, if not ...
+ if (opDef === undefined) {
+ reject("output doesn't exist for this link request")
+ }
+ if (ipDef === undefined) {
+ reject("input doesn't exist for this link request")
+ }
// check if we can find this already existing,
let existing = opDef.connections.find((cand) => {
// candidate would be an inputdef,
--
GitLab