From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Wed, 17 Jul 2019 12:05:16 +0000 (+0200)
Subject: Changed GUIram2/4's cell order for high level state ID "q"
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=5b66e19c7dcae146d504e9fe3899486d46c86639;p=Mograsim.git

Changed GUIram2/4's cell order for high level state ID "q"
---

diff --git a/net.mograsim.logic.model.am2900/components/GUIram2.json b/net.mograsim.logic.model.am2900/components/GUIram2.json
index 325e2a62..31a01fba 100644
--- a/net.mograsim.logic.model.am2900/components/GUIram2.json
+++ b/net.mograsim.logic.model.am2900/components/GUIram2.json
@@ -2993,10 +2993,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             4,
diff --git a/net.mograsim.logic.model.am2900/components/GUIram4.json b/net.mograsim.logic.model.am2900/components/GUIram4.json
index d2774ae9..05bfe9da 100644
--- a/net.mograsim.logic.model.am2900/components/GUIram4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIram4.json
@@ -3485,10 +3485,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             16,
diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram2.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram2.java
index afd42ae9..2f45cb7d 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram2.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram2.java
@@ -289,7 +289,7 @@ public class GUIram2 extends SimpleRectangularSubmodelComponent
 		highLevelStateHandler.addSubcomponentHighLevelState("c10", DelegatingSubcomponentHighLevelStateHandler::new).set(cell10, null);
 		highLevelStateHandler.addSubcomponentHighLevelState("c11", DelegatingSubcomponentHighLevelStateHandler::new).set(cell11, null);
 		highLevelStateHandler.addAtomicHighLevelState("q", BitVectorSplittingAtomicHighLevelStateHandler::new)
-				.set(Arrays.asList("c00.q", "c01.q", "c10.q", "c11.q"), Arrays.asList(4, 4, 4, 4));
+				.set(Arrays.asList("c11.q", "c10.q", "c01.q", "c00.q"), Arrays.asList(4, 4, 4, 4));
 		setHighLevelStateHandler(highLevelStateHandler);
 	}
 
diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram4.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram4.java
index a792f5bc..da1314b2 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram4.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/model/components/mi/nandbased/GUIram4.java
@@ -315,7 +315,7 @@ public class GUIram4 extends SimpleRectangularSubmodelComponent
 		highLevelStateHandler.addSubcomponentHighLevelState("c1111", DelegatingSubcomponentHighLevelStateHandler::new).set(cell11, "c11");
 
 		highLevelStateHandler.addAtomicHighLevelState("q", BitVectorSplittingAtomicHighLevelStateHandler::new)
-				.set(Arrays.asList("c00.q", "c01.q", "c10.q", "c11.q"), Arrays.asList(16, 16, 16, 16));
+				.set(Arrays.asList("c11.q", "c10.q", "c01.q", "c00.q"), Arrays.asList(16, 16, 16, 16));
 		setHighLevelStateHandler(highLevelStateHandler);
 	}
 
diff --git a/net.mograsim.logic.model.editor/components/GUIram2.json b/net.mograsim.logic.model.editor/components/GUIram2.json
index 325e2a62..31a01fba 100644
--- a/net.mograsim.logic.model.editor/components/GUIram2.json
+++ b/net.mograsim.logic.model.editor/components/GUIram2.json
@@ -2993,10 +2993,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             4,
diff --git a/net.mograsim.logic.model.editor/components/GUIram4.json b/net.mograsim.logic.model.editor/components/GUIram4.json
index d2774ae9..05bfe9da 100644
--- a/net.mograsim.logic.model.editor/components/GUIram4.json
+++ b/net.mograsim.logic.model.editor/components/GUIram4.json
@@ -3485,10 +3485,10 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler",
         "params": {
           "vectorPartTargets": [
-            "c00.q",
-            "c01.q",
+            "c11.q",
             "c10.q",
-            "c11.q"
+            "c01.q",
+            "c00.q"
           ],
           "vectorPartLengthes": [
             16,