[cdm8e] Change name of main circuit in Logisim

cdm-processors · Feb 10, 2024 · 4347e16 · 4347e16
1 parent 15d4f24
commit 4347e16
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/logisim/cdm8e/CdM-8e.circ b/logisim/cdm8e/CdM-8e.circ
@@ -85,7 +85,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/).
       <a name="valign" val="base"/>
     </tool>
   </lib>
-  <main name="CdM_8_mark5"/>
+  <main name="CdM_8e"/>
   <options>
     <a name="gateUndefined" val="ignore"/>
     <a name="simlimit" val="1000"/>
@@ -118,8 +118,8 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/).
     <tool lib="1" name="AND Gate"/>
     <tool lib="1" name="OR Gate"/>
   </toolbar>
-  <circuit name="CdM_8_mark5">
-    <a name="circuit" val="CdM_8_mark5"/>
+  <circuit name="CdM_8e">
+    <a name="circuit" val="CdM_8e"/>
     <a name="clabel" val=""/>
     <a name="clabelup" val="east"/>
     <a name="clabelfont" val="SansSerif plain 12"/>
@@ -5004,7 +5004,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/).
       <a name="trigger" val="falling"/>
     </comp>
     <comp loc="(1160,300)" name="arbiter"/>
-    <comp loc="(200,340)" name="CdM_8_mark5"/>
+    <comp loc="(200,340)" name="CdM_8e"/>
     <comp lib="1" loc="(260,370)" name="Controlled Buffer">
       <a name="width" val="8"/>
       <a name="control" val="left"/>
@@ -5681,7 +5681,7 @@ a8 d6 9d cf d9 d1 f1 f2
       <a name="label" val="IOdat"/>
       <a name="labelfont" val="SansSerif plain 9"/>
     </comp>
-    <comp loc="(200,340)" name="CdM_8_mark5"/>
+    <comp loc="(200,340)" name="CdM_8e"/>
     <comp lib="0" loc="(1220,270)" name="Splitter">
       <a name="appear" val="center"/>
     </comp>
@@ -6049,6 +6049,6 @@ d9 d3 10 d0 f2 3a a e1
       <a name="radix" val="16"/>
     </comp>
     <comp lib="4" loc="(770,110)" name="RAM"/>
-    <comp loc="(480,260)" name="CdM_8_mark5"/>
+    <comp loc="(480,260)" name="CdM_8e"/>
   </circuit>
 </project>
diff --git a/...logisim-debugger/src/main/java/org/cdm/logisim/debugger/adapters/Cdm8eCircuitAdapter.java b/...logisim-debugger/src/main/java/org/cdm/logisim/debugger/adapters/Cdm8eCircuitAdapter.java
@@ -47,7 +47,7 @@ public Component locateComponent(Circuit circuit) {
         return circuit
                 .getNonWires()
                 .stream()
-                .filter(x -> x.getFactory() instanceof SubcircuitFactory && x.getFactory().getName().equals("CdM_8_mark5"))
+                .filter(x -> x.getFactory() instanceof SubcircuitFactory && x.getFactory().getName().equals("CdM_8e"))
                 .findAny()
                 .orElse(null);
     }

diff --git a/tests/resources/cdm8e/circuits/test_circuit.circ b/tests/resources/cdm8e/circuits/test_circuit.circ
@@ -302,7 +302,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/).
     <comp lib="2" loc="(450,370)" name="Decoder">
       <a name="disabled" val="0"/>
     </comp>
-    <comp lib="7" loc="(380,410)" name="CdM_8_mark5"/>
+    <comp lib="7" loc="(380,410)" name="CdM_8e"/>
     <comp lib="1" loc="(400,450)" name="Controlled Buffer">
       <a name="facing" val="west"/>
       <a name="width" val="8"/>