Changed incrementer layout to have the MSB on top
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Mon, 13 Apr 2020 10:43:41 +0000 (12:43 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Mon, 13 Apr 2020 10:43:41 +0000 (12:43 +0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json

index ceb1351..b1c3127 100644 (file)
         "path": [
           {
             "x": 330.0,
-            "y": 120.0
+            "y": 145.0
           },
           {
             "x": 330.0,
index 6e08f81..59b48ac 100644 (file)
         "name": "inc12#0",
         "pos": {
           "x": 255.0,
-          "y": 165.0
+          "y": 170.0
         }
       },
       {
         "path": [
           {
             "x": 250.0,
-            "y": 170.0
+            "y": 190.0
           },
           {
             "x": 250.0,
-            "y": 160.0
+            "y": 200.0
           },
           {
             "x": 290.0,
-            "y": 160.0
+            "y": 200.0
           },
           {
             "x": 290.0,
index 63eb1ca..2888e90 100644 (file)
@@ -5,7 +5,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 15.0
       },
       "name": "A",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 25.0
       },
       "name": "B",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 5.0
       },
       "name": "Z",
       "logicWidth": 1,
@@ -47,7 +47,7 @@
         "name": "NandGate#0",
         "pos": {
           "x": 25.0,
-          "y": 32.5
+          "y": 7.5
         },
         "params": 1
       },
@@ -56,7 +56,7 @@
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 19.0,
-          "y": 36.5
+          "y": 21.5
         },
         "params": 1
       },
@@ -65,7 +65,7 @@
         "name": "halfadder_invz#0",
         "pos": {
           "x": 10.0,
-          "y": 5.0
+          "y": 35.0
         }
       }
     ],
         "path": [
           {
             "x": 50.0,
-            "y": 20.0
+            "y": 50.0
           },
           {
             "x": 50.0,
-            "y": 27.5
+            "y": 30.0
           },
           {
             "x": 20.0,
-            "y": 27.5
+            "y": 30.0
           }
         ]
       },
           "pinName": "A"
         },
         "name": "unnamedWire#1",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 12.5
+          }
+        ]
       },
       {
         "pin1": {
           "pinName": "B"
         },
         "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 47.5
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
           "pinName": "A"
         },
         "name": "unnamedWire#3",
-        "path": []
+        "path": [
+          {
+            "x": 5.0,
+            "y": 30.0
+          },
+          {
+            "x": 5.0,
+            "y": 40.0
+          }
+        ]
       },
       {
         "pin1": {
           "pinName": "B"
         },
         "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 30.0
-          },
-          {
-            "x": 5.0,
-            "y": 20.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
         "path": [
           {
             "x": 50.0,
-            "y": 42.5
+            "y": 17.5
           },
           {
             "x": 50.0,
-            "y": 55.0
+            "y": 5.0
           },
           {
-            "x": 15.0,
-            "y": 55.0
+            "x": 5.0,
+            "y": 5.0
           },
           {
-            "x": 15.0,
-            "y": 50.0
+            "x": 5.0,
+            "y": 10.0
           }
         ]
       },
           "pinName": "Y"
         },
         "name": "unnamedWire#6",
-        "path": []
+        "path": [
+          {
+            "x": 55.0,
+            "y": 40.0
+          },
+          {
+            "x": 55.0,
+            "y": 10.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"
index bcb0ff4..079dff7 100755 (executable)
@@ -5,7 +5,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 10.0
       },
       "name": "A",
       "logicWidth": 12,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 20.0
       },
       "name": "CI",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 20.0,
-        "y": 15.0
+        "y": 10.0
       },
       "name": "Y",
       "logicWidth": 12,
         "name": "Splitter#0",
         "pos": {
           "x": 7.5,
-          "y": 10.0
+          "y": 5.0
         },
         "params": {
           "logicWidth": 12,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "Splitter#1",
         "pos": {
           "x": 82.5,
-          "y": 10.0
+          "y": 5.0
         },
         "params": {
           "logicWidth": 12,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#2",
         "pos": {
           "x": 22.5,
-          "y": 10.0
+          "y": 85.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#3",
         "pos": {
           "x": 22.5,
-          "y": 50.0
+          "y": 45.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#4",
         "pos": {
           "x": 22.5,
-          "y": 90.0
+          "y": 5.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#5",
         "pos": {
           "x": 67.5,
-          "y": 10.0
+          "y": 85.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "Splitter#6",
         "pos": {
           "x": 67.5,
-          "y": 50.0
+          "y": 45.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "Splitter#7",
         "pos": {
           "x": 67.5,
-          "y": 90.0
+          "y": 5.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "inc4#0",
         "pos": {
           "x": 42.5,
-          "y": 10.0
+          "y": 85.0
         }
       },
       {
         "name": "inc4#1",
         "pos": {
           "x": 42.5,
-          "y": 50.0
+          "y": 45.0
         }
       },
       {
         "name": "inc4#2",
         "pos": {
           "x": 42.5,
-          "y": 90.0
+          "y": 5.0
         }
       }
     ],
         "path": [
           {
             "x": 5.0,
-            "y": 25.0
+            "y": 100.0
           },
           {
             "x": 5.0,
-            "y": 5.0
+            "y": 120.0
           },
           {
             "x": 37.5,
-            "y": 5.0
+            "y": 120.0
           },
           {
             "x": 37.5,
-            "y": 15.0
+            "y": 110.0
           }
         ]
       },
         "path": [
           {
             "x": 5.0,
-            "y": 75.0
+            "y": 50.0
           },
           {
             "x": 5.0,
-            "y": 65.0
+            "y": 60.0
           }
         ]
       },
         "path": [
           {
             "x": 37.5,
-            "y": 35.0
+            "y": 90.0
           },
           {
             "x": 37.5,
-            "y": 55.0
+            "y": 70.0
           }
         ]
       },
         "path": [
           {
             "x": 37.5,
-            "y": 75.0
+            "y": 50.0
           },
           {
             "x": 37.5,
-            "y": 95.0
+            "y": 30.0
           }
         ]
       },
         "path": [
           {
             "x": 95.0,
-            "y": 65.0
+            "y": 60.0
           },
           {
             "x": 95.0,
-            "y": 75.0
+            "y": 50.0
           }
         ]
       },
index 07609bb..eee630a 100755 (executable)
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 30.0
       },
       "name": "CI",
       "logicWidth": 1,
@@ -42,7 +42,7 @@
         },
         "params": {
           "logicWidth": 16,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
@@ -54,7 +54,7 @@
         },
         "params": {
           "logicWidth": 16,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#2",
         "pos": {
           "x": 22.5,
-          "y": 10.0
+          "y": 130.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#3",
         "pos": {
           "x": 22.5,
-          "y": 50.0
+          "y": 90.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#4",
         "pos": {
           "x": 22.5,
-          "y": 90.0
+          "y": 50.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#5",
         "pos": {
           "x": 22.5,
-          "y": 130.0
+          "y": 10.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
         "name": "Splitter#6",
         "pos": {
           "x": 67.5,
-          "y": 10.0
+          "y": 130.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "Splitter#7",
         "pos": {
           "x": 67.5,
-          "y": 50.0
+          "y": 90.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "Splitter#8",
         "pos": {
           "x": 67.5,
-          "y": 90.0
+          "y": 50.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "Splitter#9",
         "pos": {
           "x": 67.5,
-          "y": 130.0
+          "y": 10.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
         "name": "inc4#0",
         "pos": {
           "x": 42.5,
-          "y": 10.0
+          "y": 130.0
         }
       },
       {
         "name": "inc4#1",
         "pos": {
           "x": 42.5,
-          "y": 50.0
+          "y": 90.0
         }
       },
       {
         "name": "inc4#2",
         "pos": {
           "x": 42.5,
-          "y": 90.0
+          "y": 50.0
         }
       },
       {
         "name": "inc4#3",
         "pos": {
           "x": 42.5,
-          "y": 130.0
+          "y": 10.0
         }
       }
     ],
         "path": [
           {
             "x": 5.0,
-            "y": 25.0
+            "y": 150.0
           },
           {
             "x": 5.0,
-            "y": 5.0
+            "y": 165.0
           },
           {
             "x": 37.5,
-            "y": 5.0
+            "y": 165.0
           },
           {
             "x": 37.5,
-            "y": 15.0
+            "y": 155.0
           }
         ]
       },
         "path": [
           {
             "x": 37.5,
-            "y": 35.0
+            "y": 135.0
           },
           {
             "x": 37.5,
-            "y": 55.0
+            "y": 115.0
           }
         ]
       },
         "path": [
           {
             "x": 37.5,
-            "y": 75.0
+            "y": 95.0
           },
           {
             "x": 37.5,
-            "y": 95.0
+            "y": 75.0
           }
         ]
       },
         "path": [
           {
             "x": 37.5,
-            "y": 115.0
+            "y": 55.0
           },
           {
             "x": 37.5,
-            "y": 135.0
+            "y": 35.0
           }
         ]
       },
index 9e1126b..a6c8106 100755 (executable)
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 25.0
       },
       "name": "CI",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 5.0
       },
       "name": "Z",
       "logicWidth": 1,
@@ -51,7 +51,7 @@
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT_ALT"
+          "orientation": "RIGHT"
         }
       },
       {
@@ -63,7 +63,7 @@
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT_ALT"
+          "orientation": "LEFT"
         }
       },
       {
@@ -71,7 +71,7 @@
         "name": "halfadder#0",
         "pos": {
           "x": 40.0,
-          "y": 5.0
+          "y": 110.0
         }
       },
       {
@@ -79,7 +79,7 @@
         "name": "halfadder#1",
         "pos": {
           "x": 40.0,
-          "y": 40.0
+          "y": 75.0
         }
       },
       {
@@ -87,7 +87,7 @@
         "name": "halfadder#2",
         "pos": {
           "x": 40.0,
-          "y": 75.0
+          "y": 40.0
         }
       },
       {
@@ -95,7 +95,7 @@
         "name": "halfadder#3",
         "pos": {
           "x": 40.0,
-          "y": 110.0
+          "y": 5.0
         }
       }
     ],
         },
         "pin2": {
           "compName": "halfadder#1",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#0",
         "path": [
           {
             "x": 35.0,
-            "y": 30.0
+            "y": 115.0
           },
           {
             "x": 35.0,
-            "y": 45.0
+            "y": 100.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#2",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#1",
         "path": [
           {
             "x": 35.0,
-            "y": 65.0
+            "y": 80.0
           },
           {
             "x": 35.0,
-            "y": 80.0
+            "y": 65.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#3",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#2",
         "path": [
           {
             "x": 35.0,
-            "y": 100.0
+            "y": 45.0
           },
           {
             "x": 35.0,
-            "y": 115.0
+            "y": 30.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#0",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#3",
         "path": [
           {
             "x": 20.0,
-            "y": 60.0
+            "y": 90.0
           },
           {
             "x": 20.0,
-            "y": 20.0
+            "y": 125.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#1",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#4",
         "path": [
           {
             "x": 25.0,
-            "y": 70.0
+            "y": 80.0
           },
           {
             "x": 25.0,
-            "y": 55.0
+            "y": 90.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#2",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#5",
         "path": [
           {
             "x": 25.0,
-            "y": 80.0
+            "y": 70.0
           },
           {
             "x": 25.0,
-            "y": 90.0
+            "y": 55.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#3",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#6",
         "path": [
           {
             "x": 20.0,
-            "y": 90.0
+            "y": 60.0
           },
           {
             "x": 20.0,
-            "y": 125.0
+            "y": 20.0
           }
         ]
       },
         "path": [
           {
             "x": 80.0,
-            "y": 60.0
+            "y": 90.0
           },
           {
             "x": 80.0,
-            "y": 10.0
+            "y": 115.0
           }
         ]
       },
           "pinName": "O1"
         },
         "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 75.0,
-            "y": 45.0
-          },
-          {
-            "x": 75.0,
-            "y": 70.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
           "pinName": "O2"
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 75.0,
+            "y": 45.0
+          },
+          {
+            "x": 75.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 75.0,
-            "y": 90.0
+            "x": 80.0,
+            "y": 60.0
           },
           {
-            "x": 75.0,
-            "y": 115.0
+            "x": 80.0,
+            "y": 10.0
           }
         ]
       },
         },
         "pin2": {
           "compName": "halfadder#0",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#12",
         "path": [
           {
             "x": 10.0,
-            "y": 25.0
+            "y": 125.0
           },
           {
             "x": 10.0,
-            "y": 10.0
+            "y": 135.0
           }
         ]
       },
         "path": [
           {
             "x": 10.0,
-            "y": 135.0
+            "y": 10.0
           },
           {
             "x": 10.0,
-            "y": 125.0
+            "y": 25.0
           }
         ]
       }