From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sat, 17 Aug 2019 22:10:17 +0000 (+0200)
Subject: Added GUIMerger + GUISplitter to standardComponentIDMapping
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=232023edec378bc816ba2418dfebc45e4781dbb3;p=Mograsim.git

Added GUIMerger + GUISplitter to standardComponentIDMapping
---

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
index ec395c04..4a16e534 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
@@ -5,11 +5,11 @@ import java.util.Comparator;
 import java.util.List;
 
 import net.mograsim.logic.model.SimpleLogicUIStandalone;
-import net.mograsim.logic.model.am2900.components.GUIdff4_finewe;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
 import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
+import net.mograsim.logic.model.model.components.atomic.GUIMerger;
 import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
 import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent.Usage;
 import net.mograsim.logic.model.model.wires.GUIWire;
@@ -25,8 +25,7 @@ public class GUIComponentTestbench
 	@SuppressWarnings("unused") // for GUIWires being created
 	public static void createTestbench(ViewModelModifiable model)
 	{
-//		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "file:components/GUIdff4.json", "dff4");
-		GUIComponent comp = new GUIdff4_finewe(model, "dff4_finewe");
+		GUIComponent comp = new GUIMerger(model, 10, "");
 
 		// guess which pins are outputs and which are inputs
 		// TODO this code exists four times... but it seems too "hacky" to put it in a helper class
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json
index 2fce58db..08a0a1c1 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json
@@ -9,7 +9,11 @@ mograsim version: 0.1.3
   "GUIAm2901ALUOneBit": "file:components/am2901/GUIAm2901ALUOneBit.json",
   "GUIAm2901DestDecode": "file:components/am2901/GUIAm2901DestDecode.json",
   "GUIAm2901SourceDecode": "file:components/am2901/GUIAm2901SourceDecode.json",
+  "GUIAm2910InstrPLA": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA",
+  "GUIAm2910RegCntr": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
+  "GUIAm2910SP": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP",
   "GUIAndGate": "class:net.mograsim.logic.model.model.components.atomic.GUIAndGate",
+  "GUIMerger": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger",
   "GUINandGate": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
   "GUIOrGate": "class:net.mograsim.logic.model.model.components.atomic.GUIOrGate",
   "GUI_rsLatch": "file:components/GUI_rsLatch.json",
@@ -18,30 +22,28 @@ mograsim version: 0.1.3
   "GUIandor414": "file:components/GUIandor414.json",
   "GUIdemux2": "file:components/GUIdemux2.json",
   "GUIdff": "file:components/GUIdff.json",
+  "GUIdff12": "class:net.mograsim.logic.model.am2900.components.GUIdff12",
   "GUIdff4": "file:components/GUIdff4.json",
   "GUIdff4_invwe": "file:components/GUIdff4_invwe.json",
   "GUIdlatch": "file:components/GUIdlatch.json",
   "GUIdlatch4": "file:components/GUIdlatch4.json",
   "GUIfulladder": "file:components/GUIfulladder.json",
   "GUIhalfadder": "file:components/GUIhalfadder.json",
+  "GUIinc12": "class:net.mograsim.logic.model.am2900.components.GUIinc12",
   "GUImux1": "file:components/GUImux1.json",
   "GUImux1_4": "file:components/GUImux1_4.json",
+  "GUImux4_12": "class:net.mograsim.logic.model.am2900.components.GUImux4_12",
   "GUInand3": "file:components/GUInand3.json",
+  "GUInor12": "class:net.mograsim.logic.model.am2900.components.GUInor12",
   "GUInot4": "file:components/GUInot4.json",
   "GUIor4": "file:components/GUIor4.json",
   "GUIor_4": "file:components/GUIor_4.json",
   "GUIram2": "file:components/GUIram2.json",
   "GUIram4": "file:components/GUIram4.json",
+  "GUIram5_12": "class:net.mograsim.logic.model.am2900.components.GUIram5_12",
   "GUIsel2_4": "file:components/GUIsel2_4.json",
   "GUIsel3_4": "file:components/GUIsel3_4.json",
+  "GUISplitter": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter",
   "GUIxor": "file:components/GUIxor.json",
-  "GUIAm2910InstrPLA": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA",
-  "GUIAm2910RegCntr": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
-  "GUIAm2910SP": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP",
-  "GUIdff12": "class:net.mograsim.logic.model.am2900.components.GUIdff12",
-  "GUIinc12": "class:net.mograsim.logic.model.am2900.components.GUIinc12",
-  "GUImux4_12": "class:net.mograsim.logic.model.am2900.components.GUImux4_12",
-  "GUInor12": "class:net.mograsim.logic.model.am2900.components.GUInor12",
-  "GUIram5_12": "class:net.mograsim.logic.model.am2900.components.GUIram5_12",
   "WireCrossPoint": "class:net.mograsim.logic.model.model.wires.WireCrossPoint"
 }
\ No newline at end of file