digsim-logic-simulator 0.10.0__tar.gz → 0.12.0__tar.gz

{digsim_logic_simulator-0.10.0/src/digsim_logic_simulator.egg-info → digsim_logic_simulator-0.12.0}/PKG-INFO

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

{digsim_logic_simulator-0.10.0 → digsim_logic_simulator-0.12.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "digsim-logic-simulator"
 description = "Interactive Digital Logic Simulator"
-version = "0.10.0"
+version = "0.12.0"
 authors = [{name = "Fredrik Andersson", email = "freand@gmail.com"}]
 maintainers =  [{name = "Fredrik Andersson", email = "freand@gmail.com"}]
 readme = "README.md"

{digsim_logic_simulator-0.10.0 → digsim_logic_simulator-0.12.0}/src/digsim/app/gui_objects/_buzzer_object.py

@@ -66,12 +66,7 @@ class BuzzerObject(ImageObjectWithActiveRect):
         self.audio_sink = None
         self._app_model.sig_audio_start.connect(self._audio_start)
         self._app_model.sig_audio_notify.connect(self._audio_notify)
-        self.device = None
-        devices = QMediaDevices.audioOutputs()
-        if len(devices) == 0:
-            return
-        self.device = devices[0]
-
+        self.device = QMediaDevices.defaultAudioOutput()
         self.audio_format = QAudioFormat()
         self.audio_format.setSampleRate(self.DATA_SAMPLE_RATE_HZ)
         self.audio_format.setChannelCount(1)

{digsim_logic_simulator-0.10.0 → digsim_logic_simulator-0.12.0}/src/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_logic_simulator-0.10.0 → digsim_logic_simulator-0.12.0}/src/digsim/synth/_synthesis.py

@@ -4,7 +4,9 @@
 """Helper module for yosys synthesis"""
 
 import json
+import pathlib
 import shutil
+import site
 import sys
 
 import pexpect
@@ -43,10 +45,30 @@ class Synthesis:
             out_lines.append(line)
         return out_lines
 
+    @staticmethod
+    def _find_win_yowasp_yosys_binary():
+        try:
+            # Use getusersitepackages if this is present, as it ensures that the
+            # value is initialised properly.
+            user_site = site.getusersitepackages()
+        except AttributeError:
+            user_site = site.USER_SITE
+        scripts_path = pathlib.Path(user_site).parent / "Scripts"
+        yowasp_yosys_path = scripts_path / "yowasp-yosys.exe"
+        if yowasp_yosys_path.is_file():
+            return str(yowasp_yosys_path)
+        return None
+
     @classmethod
     def _pexpect_spawn_yosys(cls):
+        # Find linux binary
         yosys_exe = shutil.which("yosys") or shutil.which("yowasp-yosys")
 
+        # No binary found
+        if yosys_exe is None:
+            # Try to find windows binary
+            yosys_exe = cls._find_win_yowasp_yosys_binary()
+
         if yosys_exe is None:
             raise SynthesisException("Yosys executable not found")
 

{digsim_logic_simulator-0.10.0 → digsim_logic_simulator-0.12.0/src/digsim_logic_simulator.egg-info}/PKG-INFO

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