From a657885d760d2ae78a1eb0bd561008785df8287a Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 28 Aug 2019 10:10:41 +0200 Subject: [PATCH] Removed old JSONs --- .../FullAdder.json | 188 ---------- .../HalfAdder.json | 323 ------------------ net.mograsim.logic.model.am2900/Test.json | 36 -- 3 files changed, 547 deletions(-) delete mode 100644 net.mograsim.logic.model.am2900/FullAdder.json delete mode 100644 net.mograsim.logic.model.am2900/HalfAdder.json delete mode 100644 net.mograsim.logic.model.am2900/Test.json diff --git a/net.mograsim.logic.model.am2900/FullAdder.json b/net.mograsim.logic.model.am2900/FullAdder.json deleted file mode 100644 index a027c43c..00000000 --- a/net.mograsim.logic.model.am2900/FullAdder.json +++ /dev/null @@ -1,188 +0,0 @@ -mograsim version: 0.1.1 -{ - "type": "SimpleRectangularSubmodelComponent", - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "C", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Z", - "logicWidth": 1 - } - ], - "composition": { - "innerScale": 0.4, - "subComps": [ - { - "pos": { - "x": 5.0, - "y": 40.0 - }, - "type": "class:net.mograsim.logic.model.model.components.mi.nandbased.GUIhalfadder", - "params": {} - }, - { - "pos": { - "x": 45.0, - "y": 7.5 - }, - "type": "class:net.mograsim.logic.model.model.components.mi.nandbased.GUIhalfadder", - "params": {} - }, - { - "pos": { - "x": 57.5, - "y": 40.0 - }, - "type": "class:net.mograsim.logic.model.model.components.GUINandGate", - "params": { - "logicWidth": 1 - } - } - ], - "innerWires": [ - { - "pin1": { - "compId": 0, - "pinName": "A" - }, - "pin2": { - "compId": 2, - "pinName": "A" - }, - "path": [] - }, - { - "pin1": { - "compId": 0, - "pinName": "B" - }, - "pin2": { - "compId": 1, - "pinName": "A" - } - }, - { - "pin1": { - "compId": 0, - "pinName": "C" - }, - "pin2": { - "compId": 1, - "pinName": "B" - } - }, - { - "pin1": { - "compId": 1, - "pinName": "Y" - }, - "pin2": { - "compId": 2, - "pinName": "B" - } - }, - { - "pin1": { - "compId": 1, - "pinName": "_Z" - }, - "pin2": { - "compId": 3, - "pinName": "B" - }, - "path": [] - }, - { - "pin1": { - "compId": 2, - "pinName": "Y" - }, - "pin2": { - "compId": 0, - "pinName": "Y" - }, - "path": [] - }, - { - "pin1": { - "compId": 2, - "pinName": "_Z" - }, - "pin2": { - "compId": 3, - "pinName": "A" - }, - "path": [ - { - "x": 82.5, - "y": 22.5 - }, - { - "x": 82.5, - "y": 35.0 - }, - { - "x": 52.5, - "y": 35.0 - }, - { - "x": 52.5, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compId": 3, - "pinName": "Y" - }, - "pin2": { - "compId": 0, - "pinName": "Z" - } - } - ] - }, - "specialized": { - "input_count": 3, - "label": "GUIfulladder", - "logic_width": 1, - "output_count": 2 - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/HalfAdder.json b/net.mograsim.logic.model.am2900/HalfAdder.json deleted file mode 100644 index 9eb7057f..00000000 --- a/net.mograsim.logic.model.am2900/HalfAdder.json +++ /dev/null @@ -1,323 +0,0 @@ -mograsim version: 0.1.1 -{ - "type": "SimpleRectangularSubmodelComponent", - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "_Z", - "logicWidth": 1 - } - ], - "composition": { - "innerScale": 0.4, - "subComps": [ - { - "pos": { - "x": 10.0, - "y": 15.0 - }, - "type": "class:net.mograsim.logic.model.model.components.GUINandGate", - "params": { - "logicWidth": 1 - } - }, - { - "pos": { - "x": 40.0, - "y": 2.5 - }, - "type": "class:net.mograsim.logic.model.model.components.GUINandGate", - "params": { - "logicWidth": 1 - } - }, - { - "pos": { - "x": 40.0, - "y": 27.5 - }, - "type": "class:net.mograsim.logic.model.model.components.GUINandGate", - "params": { - "logicWidth": 1 - } - }, - { - "pos": { - "x": 65.0, - "y": 2.5 - }, - "type": "class:net.mograsim.logic.model.model.components.GUINandGate", - "params": { - "logicWidth": 1 - } - }, - { - "pos": { - "x": 4.0, - "y": 11.5 - }, - "type": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", - "params": { - "logicWidth": 1 - } - }, - { - "pos": { - "x": 4.0, - "y": 36.5 - }, - "type": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", - "params": { - "logicWidth": 1 - } - }, - { - "pos": { - "x": 34.0, - "y": 24.0 - }, - "type": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", - "params": { - "logicWidth": 1 - } - } - ], - "innerWires": [ - { - "pin1": { - "compId": 0, - "pinName": "A" - }, - "pin2": { - "compId": 5, - "pinName": "" - }, - "path": [] - }, - { - "pin1": { - "compId": 5, - "pinName": "" - }, - "pin2": { - "compId": 2, - "pinName": "A" - }, - "path": [ - { - "x": 5.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compId": 5, - "pinName": "" - }, - "pin2": { - "compId": 1, - "pinName": "A" - }, - "path": [ - { - "x": 5.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compId": 0, - "pinName": "B" - }, - "pin2": { - "compId": 6, - "pinName": "" - }, - "path": [] - }, - { - "pin1": { - "compId": 6, - "pinName": "" - }, - "pin2": { - "compId": 3, - "pinName": "B" - }, - "path": [ - { - "x": 5.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compId": 6, - "pinName": "" - }, - "pin2": { - "compId": 1, - "pinName": "B" - }, - "path": [ - { - "x": 5.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compId": 1, - "pinName": "Y" - }, - "pin2": { - "compId": 7, - "pinName": "" - }, - "path": [] - }, - { - "pin1": { - "compId": 7, - "pinName": "" - }, - "pin2": { - "compId": 0, - "pinName": "_Z" - }, - "path": [ - { - "x": 80.0, - "y": 25.0 - }, - { - "x": 80.0, - "y": 37.5 - } - ] - }, - { - "pin1": { - "compId": 7, - "pinName": "" - }, - "pin2": { - "compId": 2, - "pinName": "B" - }, - "path": [ - { - "x": 35.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compId": 7, - "pinName": "" - }, - "pin2": { - "compId": 3, - "pinName": "A" - }, - "path": [ - { - "x": 35.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compId": 2, - "pinName": "Y" - }, - "pin2": { - "compId": 4, - "pinName": "A" - }, - "path": [ - { - "x": 62.5, - "y": 12.5 - }, - { - "x": 62.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compId": 3, - "pinName": "Y" - }, - "pin2": { - "compId": 4, - "pinName": "B" - }, - "path": [ - { - "x": 62.5, - "y": 37.5 - }, - { - "x": 62.5, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compId": 4, - "pinName": "Y" - }, - "pin2": { - "compId": 0, - "pinName": "Y" - }, - "path": [] - } - ] - }, - "specialized": { - "input_count": 2, - "label": "GUIhalfadder", - "logic_width": 1, - "output_count": 2 - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/Test.json b/net.mograsim.logic.model.am2900/Test.json deleted file mode 100644 index 56085df7..00000000 --- a/net.mograsim.logic.model.am2900/Test.json +++ /dev/null @@ -1,36 +0,0 @@ -mograsim version: 0.1.1 -{ - "type": "SimpleRectangularSubmodelComponent", - "width": 35.0, - "height": 10.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "Input pin #0", - "logicWidth": 1 - } - ], - "composition": { - "innerScale": 0.4, - "subComps": [ - { - "pos": { - "x": 0.0, - "y": 0.0 - }, - "type": "file:HalfAdder.json", - "params": {} - } - ], - "innerWires": [] - }, - "specialized": { - "input_count": 1, - "label": "Test", - "logic_width": 1, - "output_count": 0 - } -} \ No newline at end of file -- 2.17.1