Improved symbol support

jeffpar · Oct 13, 2019 · e722784 · e722784
1 parent cfdbe3c
commit e722784
Show file tree

Hide file tree

Showing 33 changed files with 1,881 additions and 1,619 deletions.
diff --git a/devices/pc8080/machine/vt100/new/README.md b/devices/pc8080/machine/vt100/new/README.md
@@ -39,9 +39,11 @@ styles:
   .pcjs-label:
     float: left;
     text-align: right;
-  .pcjs-device:
+  .pcjs-led:
     float: left;
-    display: inline-block;
+    margin-top: 2px;
+    width: 16px;
+    height: 16px;
   .pcjs-button:
     display: block;
 ---
@@ -53,14 +55,14 @@ VT100 (New)
 
 <div id="vt100">
   <div class="pcjs-controls">
-    <div class="pcjs-control"><div class="pcjs-label">ON LINE</div><div class="pcjs-device" id="ledOnlineVT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">LOCAL</div><div class="pcjs-device" id="ledLocalVT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">LOCKED</div><div class="pcjs-device" id="ledLockedVT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">L1</div><div class="pcjs-device" id="ledL1VT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">L2</div><div class="pcjs-device" id="ledL2VT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">L3</div><div class="pcjs-device" id="ledL3VT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">L4</div><div class="pcjs-device" id="ledL4VT100"></div></div>
-    <div class="pcjs-control"><div class="pcjs-label">CAPS</div><div class="pcjs-device" id="ledCapsVT100"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">ON LINE</div><div class="pcjs-led" id="ledOnline"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">LOCAL</div><div class="pcjs-led" id="ledLocal"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">LOCKED</div><div class="pcjs-led" id="ledLocked"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">L1</div><div class="pcjs-led" id="led1"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">L2</div><div class="pcjs-led" id="led2"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">L3</div><div class="pcjs-led" id="led3"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">L4</div><div class="pcjs-led" id="led4"></div></div>
+    <div class="pcjs-control"><div class="pcjs-label">CAPS</div><div class="pcjs-led" id="ledCaps"></div></div>
     <div class="pcjs-control"><button class="pcjs-button" id="zoomVT100">Full-Screen</button></div>
   </div>
   <div id="videoVT100" class="pcjs-video"></div>

diff --git a/devices/pc8080/machine/vt100/new/vt100.json b/devices/pc8080/machine/vt100/new/vt100.json
@@ -49,6 +49,46 @@
     "addrWidth": 8,
     "dataWidth": 8
   },
+  "ledOnline": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "ledLocal": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "ledLocked": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "led1": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "led2": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "led3": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "led4": {
+    "class": "LED",
+    "type": "round",
+    "color": "red"
+  },
+  "ledCaps": {
+    "class": "LED",
+    "type": "square",
+    "color": "green"
+  },
   "ports": {
     "class": "Ports",
     "bus": "busIO",
@@ -67,7 +107,7 @@
     "size": 8192,
     "bus": "busMemory",
     "_JSONDoc": [
-      "The following ROM dump was generated with 'filedump --file=/devices/pc8080/rom/vt100/VT100.bin --format=bytes --decimal --symbols=simple'"
+      "The following ROM dump was generated with 'filedump --file=/devices/pc8080/rom/vt100/VT100.bin --format=bytes --decimal --symbols=array'"
     ],
     "values": [
       243,49,78,32,195,59,0,0,205,253,0,251,201,0,0,0,
@@ -584,6 +624,9 @@
       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     ],
     "symbols":[
+      "00B3","@","reset",
+      "00D2","@","beep",
+      "00FD","@","kbdint",
       "0040",";","0x0f to NVR latch",
       "0042",";","invert A (0xf0)",
       "0043",";","0xf0 to brightness",
@@ -593,10 +636,10 @@
       "004A",";","store the current ROM # in B",
       "004B",";","show current ROM on LEDs",
       "004D",";","Checksum over 8 256B blocks",
-      "004F",";","Rotate A left",
-      "0050",";","A <- A ^ memory",
-      "0051",";","next memory address",
-      "0052",";","... repeat until end of block",
+      "004F",";","   Rotate A left",
+      "0050",";","   A <- A ^ memory",
+      "0051",";","   next memory address",
+      "0052",";","   ... repeat until end of block",
       "0055",";","next block",
       "0056",";","decrement block count",
       "0057",";","... repeat until end of chip",
@@ -808,7 +851,8 @@
       "1950",";","A = 0x0a",
       "1952",";","A = 0x0a + B",
       "1964",";","Flags Buffer & C",
-      "1969",";","Return if B is negative"]
+      "1969",";","Return if B is negative"
+    ]
   },
   "input": {
     "class": "Input"
@@ -817,7 +861,8 @@
     "class": "Chips"
   },
   "kbd": {
-    "class": "Keyboard"
+    "class": "Keyboard",
+    "leds": ["ledLocal", "ledLocked", "led1", "led2", "led3", "led4"]
   },
   "cpu": {
     "class": "CPU",