digsim-logic-simulator 0.9.0__py3-none-any.whl → 0.11.0__py3-none-any.whl

digsim/app/model/_model_settings.py

@@ -27,7 +27,7 @@ class ModelSettings:
 
     def from_dict(self, circuit_dict):
         """Get settings from circuit dict"""
-        for key, data in circuit_dict.get("settings", {}).items():
+        for key, data in circuit_dict.items():
             self._settings[key] = data
 
     def get(self, key):

digsim/app/model/_model_shortcuts.py

@@ -77,10 +77,9 @@ class ModelShortcuts:
             shortcuts_dict[key] = component.name()
         return shortcuts_dict
 
-    def from_dict(self, model_dict):
+    def from_dict(self, shortcuts_dict):
         """Generate shortcuts from dict"""
         self.clear()
-        shortcuts_dict = model_dict.get("shortcuts")
         if shortcuts_dict is not None:
             for key, component_name in shortcuts_dict.items():
                 component = self._app_model.objects.circuit.get_component(component_name)

digsim/utils/_yosys_netlist.py

@@ -88,11 +88,16 @@ class YosysModule:
 
     def is_same_interface(self, netlist):
         is_same = True
-        for netlist_port_name, netlist_port in netlist.ports.items():
-            module_port = self.ports.get(netlist_port_name)
-            if module_port is None or not module_port.is_same(netlist_port):
-                is_same = False
-                break
+        if len(netlist.ports) == len(self.ports):
+            for netlist_port_name, netlist_port in netlist.ports.items():
+                module_port = self.ports.get(netlist_port_name)
+                if module_port is None or not module_port.is_same(netlist_port):
+                    # Port does not exist or has a different bitwidth
+                    is_same = False
+                    break
+        else:
+            # The number of ports does not match
+            is_same = False
         return is_same
 
     def get_nets(self):

{digsim_logic_simulator-0.9.0.dist-info → digsim_logic_simulator-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digsim-logic-simulator
-Version: 0.9.0
+Version: 0.11.0
 Summary: Interactive Digital Logic Simulator
 Author-email: Fredrik Andersson <freand@gmail.com>
 Maintainer-email: Fredrik Andersson <freand@gmail.com>

{digsim_logic_simulator-0.9.0.dist-info → digsim_logic_simulator-0.11.0.dist-info}/RECORD

@@ -53,8 +53,8 @@ digsim/app/model/_model.py,sha256=JE9-iJMxzgcY0r-4s708gDtA-aadw_hFSuERjKNZlfE,64
 digsim/app/model/_model_components.py,sha256=Q2iztl7MlWv_7vaa7me-dp-gOx6-7Tg3LZmTUQNBPrw,6371
 digsim/app/model/_model_new_wire.py,sha256=5HnF5-gtKtB1Tp6ZIF7QuNo5zEHmsUpnBEmj6ZllLiA,1810
 digsim/app/model/_model_objects.py,sha256=lqOjNIygIHT6Dq_PPa-D0B5elC49dB0KshF0ATzJZ0s,5217
-digsim/app/model/_model_settings.py,sha256=FewI3hm1iwbjPwdN3IeixuINPtamDORrTh1ANGRNwX8,1035
-digsim/app/model/_model_shortcuts.py,sha256=TT4osN7-dMEgKXWHW9cJ0XILIIkUfRqBBfx6rvYT2JI,2488
+digsim/app/model/_model_settings.py,sha256=BOwlwGT4h2R9tx7R5E1L4W0vli4GWh4RM77QBoqeKdw,1015
+digsim/app/model/_model_shortcuts.py,sha256=xrUgs2Y18mSVun3sxzVscYTZ6n5DJTTZOnFhs4Jt_0M,2439
 digsim/app/settings/__init__.py,sha256=0tkoBSYeJFFiUI8c_FqvqqyM4-_SU9Xq7mXCwiew5Oo,308
 digsim/app/settings/_component_settings.py,sha256=88D9OuEcFIlaqZozomWHSYrl7opz4jZW2e8xGuUyTpg,16287
 digsim/app/settings/_gui_settings.py,sha256=sDi2POUsHvS7_4SO5qsTu_nN48HsTN4UfGPzdmECs9w,2764
@@ -97,9 +97,9 @@ digsim/synth/__init__.py,sha256=jhBHLOHf-vNa94Zg5q5dGcf0fgQTModfjUKtmUSffiw,180
 digsim/synth/__main__.py,sha256=wZWAzWsisoxA7hfqkKtu3H066uWyFajgPro2MEGlKbs,2173
 digsim/synth/_synthesis.py,sha256=ug9vSeTyZrvRCboNLL7dDIFVpGqH_ibr5fhOZJHpqUs,4271
 digsim/utils/__init__.py,sha256=MT9TNcpa7fNAqtBsmCcceKMrUSU_v9xeJ6Nox_TL7Lo,191
-digsim/utils/_yosys_netlist.py,sha256=TnEQc27NxPD96uGAF_wiijsZsX59vmDqzNP9rkMnLyc,3612
-digsim_logic_simulator-0.9.0.dist-info/licenses/LICENSE.md,sha256=FrvohZfyfpH4xrvKdXiQ5hD7dUB7w4DcsRA3p-pOmLw,1693
-digsim_logic_simulator-0.9.0.dist-info/METADATA,sha256=5NVelguEoPG3GlO78OlDNwfzX-NWC5Zqt1w8BD5yIVA,4557
-digsim_logic_simulator-0.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-digsim_logic_simulator-0.9.0.dist-info/top_level.txt,sha256=qpCMzQKADZHVqZIoQgFrv3qJ3u7PPU73gTCXQglqLa8,7
-digsim_logic_simulator-0.9.0.dist-info/RECORD,,
+digsim/utils/_yosys_netlist.py,sha256=Lcuo9seKcDu4O-NdBpJUpExvTT7Rx1STCBtF0xT8Nkc,3843
+digsim_logic_simulator-0.11.0.dist-info/licenses/LICENSE.md,sha256=FrvohZfyfpH4xrvKdXiQ5hD7dUB7w4DcsRA3p-pOmLw,1693
+digsim_logic_simulator-0.11.0.dist-info/METADATA,sha256=ccmh93aFlKMLF3YKGNRhnWKYgtIPkwykN_UJWP4taY8,4558
+digsim_logic_simulator-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+digsim_logic_simulator-0.11.0.dist-info/top_level.txt,sha256=qpCMzQKADZHVqZIoQgFrv3qJ3u7PPU73gTCXQglqLa8,7
+digsim_logic_simulator-0.11.0.dist-info/RECORD,,