meerk40t 0.9.7020__tar.gz → 0.9.7040__tar.gz

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerk40t
-Version: 0.9.7020
+Version: 0.9.7040
 Summary: MeerK40t LaserCutter Software
 Home-page: https://github.com/meerk40t/meerk40t
 Author: Tatarize

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/clone_loader.py

@@ -1,6 +1,7 @@
 """
 This code initializes the FPGA on cloned boards.
 """
+
 import hashlib
 import struct
 
@@ -422,7 +423,7 @@ def load_sys(sys_file, channel=None):
             channel(f"{len(devices)} devices need initializing.")
         for i, device in enumerate(devices):
             if channel:
-                channel(f"Clone board #{i+1} detected. Sending Initialize.")
+                channel(f"Clone board #{i + 1} detected. Sending Initialize.")
             _send_device_sys(device, sys_file, channel=channel)
     except usb.core.USBError as e:
         channel(str(e))
@@ -446,7 +447,7 @@ def load_chunks(chunks=None, channel=None):
             channel(f"{len(devices)} devices need initializing.")
         for i, device in enumerate(devices):
             if channel:
-                channel(f"Clone board #{i+1} detected. Sending Initialize.")
+                channel(f"Clone board #{i + 1} detected. Sending Initialize.")
             _write_chunks(device, chunks)
     except usb.core.USBError as e:
         channel(str(e))

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/controller.py

@@ -9,6 +9,7 @@ import struct
 import threading
 import time
 from copy import copy
+
 from usb.core import NoBackendError
 
 from meerk40t.balormk.mock_connection import MockConnection
@@ -391,10 +392,15 @@ class GalvoController:
                     self.usb_log("Could not connect to the LMC controller.")
                     self.usb_log("Automatic connections disabled.")
                     from platform import system
+
                     osname = system()
                     if osname == "Windows":
-                        self.usb_log("Did you install the libusb driver via Zadig (https://zadig.akeo.ie/)?")
-                        self.usb_log("Consult the wiki: https://github.com/meerk40t/meerk40t/wiki/Install%3A-Windows")
+                        self.usb_log(
+                            "Did you install the libusb driver via Zadig (https://zadig.akeo.ie/)?"
+                        )
+                        self.usb_log(
+                            "Consult the wiki: https://github.com/meerk40t/meerk40t/wiki/Install%3A-Windows"
+                        )
                     raise ConnectionRefusedError(
                         "Could not connect to the LMC controller."
                     )
@@ -404,22 +410,25 @@ class GalvoController:
         self._abort_open = False
 
     def send(self, data, read=True):
+        ERR = (-1, -1, -1, -1)  # Error return value
         if self.is_shutdown:
-            return -1, -1, -1, -1
+            return ERR
         try:
             self.connect_if_needed()
         except (ConnectionRefusedError, NoBackendError):
-            return -1, -1, -1, -1
+            return ERR
+        if not self.connection:
+            return ERR
         try:
             self.connection.write(self._machine_index, data)
         except ConnectionError:
-            return -1, -1, -1, -1
+            return ERR
         if read:
             try:
                 r = self.connection.read(self._machine_index)
                 return struct.unpack("<4H", r)
             except ConnectionError:
-                return -1, -1, -1, -1
+                return ERR
 
     def status(self):
         b0, b1, b2, b3 = self.get_version()
@@ -815,8 +824,14 @@ class GalvoController:
         for nibble in serial_number:
             content += f"{nibble:04x}"
         self.usb_log(f"Serial Number: {serial_number} ({content})")
-        if self.service.serial_enable and self.service.serial and not self.serial_confirmed:
-            self.usb_log(f"Requires serial number confirmation against {self.service.serial}.")
+        if (
+            self.service.serial_enable
+            and self.service.serial
+            and not self.serial_confirmed
+        ):
+            self.usb_log(
+                f"Requires serial number confirmation against {self.service.serial}."
+            )
             if content == self.service.serial:
                 self.serial_confirmed = True
 
@@ -943,7 +958,9 @@ class GalvoController:
         @return:
         """
         # return int(speed / 2)
-        galvos_per_mm, _ = self.service.view.position("1mm", "1mm", vector=True, margins=False)
+        galvos_per_mm, _ = self.service.view.position(
+            "1mm", "1mm", vector=True, margins=False
+        )
         return abs(int(speed * galvos_per_mm / 1000.0))
 
     def _convert_frequency(self, frequency_khz, base=20000.0):
@@ -1066,7 +1083,7 @@ class GalvoController:
         y = int(y)
         self._list_write(listJumpTo, x, y, angle, distance)
         if self._signal_updates:
-            view  = self.service.view
+            view = self.service.view
             l_x, l_y = view.iposition(self._last_x, self._last_y)
             n_x, n_y = view.iposition(x, y)
             self.service.signal(
@@ -1101,7 +1118,7 @@ class GalvoController:
         self._list_write(listMarkTo, x, y, angle, distance)
 
         if self._signal_updates:
-            view  = self.service.view
+            view = self.service.view
             l_x, l_y = view.iposition(self._last_x, self._last_y)
             n_x, n_y = view.iposition(x, y)
             self.service.signal(

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/cylindermod.py

@@ -1,6 +1,7 @@
 import math
 from functools import lru_cache
 
+
 class CylinderModifier:
     def __init__(self, wrapped_instance, service):
         self._wrapped_instance = wrapped_instance

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/device.py

@@ -8,9 +8,9 @@ from meerk40t.balormk.driver import BalorDriver
 from meerk40t.core.spoolers import Spooler
 from meerk40t.core.units import Angle, Length
 from meerk40t.core.view import View
+from meerk40t.device.devicechoices import get_effect_choices
 from meerk40t.device.mixins import Status
 from meerk40t.kernel import Service, signal_listener
-from meerk40t.device.devicechoices import get_effect_choices
 
 
 class BalorDevice(Service, Status):
@@ -258,14 +258,13 @@ class BalorDevice(Service, Status):
                 "section": "_00_General",
                 "subsection": "_10_Device Selection",
             },
-            {   "attr": "serial_enable",
+            {
+                "attr": "serial_enable",
                 "object": self,
                 "default": False,
                 "type": bool,
                 "label": _("Check serial no"),
-                "tip": _(
-                    "Does the machine need to have a specific serial number?"
-                ),
+                "tip": _("Does the machine need to have a specific serial number?"),
                 "section": "_00_General",
                 "subsection": "_10_Device Selection",
             },
@@ -274,13 +273,11 @@ class BalorDevice(Service, Status):
                 "object": self,
                 "default": "",
                 "type": str,
-                "tip": _(
-                    "Does the machine need to have a specific serial number?"
-                ),
+                "tip": _("Does the machine need to have a specific serial number?"),
                 "label": "",
                 "section": "_00_General",
                 "subsection": "_10_Device Selection",
-                "conditional": (self, "serial_enable")
+                "conditional": (self, "serial_enable"),
             },
             {
                 "attr": "footpedal_pin",
@@ -964,3 +961,10 @@ class BalorDevice(Service, Status):
 
     def cool_helper(self, choice_dict):
         self.kernel.root.coolant.coolant_choice_helper(self)(choice_dict)
+
+    def location(self):
+        """
+        Returns the current connection type for the device.
+        If the device is in mock mode, returns 'mock', otherwise returns 'usb'.
+        """
+        return "mock" if self.mock else "usb"

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/driver.py

@@ -4,7 +4,9 @@ Galvo Driver
 The Driver has a set of different commands which are standardly sent and utilizes those which can be performed by this
 driver.
 """
+
 import time
+
 from usb.core import NoBackendError
 
 from meerk40t.balormk.controller import GalvoController
@@ -18,8 +20,8 @@ from meerk40t.core.cutcode.outputcut import OutputCut
 from meerk40t.core.cutcode.plotcut import PlotCut
 from meerk40t.core.cutcode.quadcut import QuadCut
 from meerk40t.core.cutcode.waitcut import WaitCut
-from meerk40t.device.basedevice import PLOT_FINISH, PLOT_JOG, PLOT_RAPID, PLOT_SETTING
 from meerk40t.core.plotplanner import PlotPlanner
+from meerk40t.device.basedevice import PLOT_FINISH, PLOT_JOG, PLOT_RAPID, PLOT_SETTING
 from meerk40t.tools.geomstr import Geomstr
 
 
@@ -44,7 +46,12 @@ class BalorDriver:
         self._queue_current = 0
         self._queue_total = 0
         self.plot_planner = PlotPlanner(
-            dict(), single=True, ppi=False, shift=False, group=True, require_uniform_movement = False,
+            dict(),
+            single=True,
+            ppi=False,
+            shift=False,
+            group=True,
+            require_uniform_movement=False,
         )
         self.value_penbox = None
         self.plot_planner.settings_then_jog = True

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/galvo_commands.py

@@ -4,6 +4,7 @@ import struct
 import time
 
 from usb.core import NoBackendError
+
 from meerk40t.balormk.driver import BalorDriver
 from meerk40t.balormk.livelightjob import LiveLightJob
 from meerk40t.core.laserjob import LaserJob
@@ -375,6 +376,7 @@ def plugin(service, lifecycle):
                             )
                             if v[0] == 0x8002:
                                 break
+
                 try:
                     driver.connection.connect_if_needed()
                 except (ConnectionRefusedError, NoBackendError):
@@ -563,7 +565,7 @@ def plugin(service, lifecycle):
                     except (ValueError, struct.error):
                         pass
                 if not isinstance(v, int):
-                    channel(f'Compile error. Line #{cmd_i+1} value "{b}"')
+                    channel(f'Compile error. Line #{cmd_i + 1} value "{b}"')
                     return
                 values[byte_i] = v
                 byte_i += 1

{meerk40t-0.9.7020 → meerk40t-0.9.7040}/meerk40t/balormk/gui/gui.py

@@ -79,6 +79,7 @@ def plugin(service, lifecycle):
                         "icon": icon_balor_full,
                         "help": "devicebalor",
                         "action": lambda e: service("full-light\n"),
+                        "multi_autoexec": False,
                     },
                     # {
                     #     "identifier": "live-regmark",
@@ -93,6 +94,7 @@ def plugin(service, lifecycle):
                         "icon": icon_balor_bounds,
                         "help": "devicebalor",
                         "action": lambda e: service("select-light\n"),
+                        "multi_autoexec": False,
                     },
                     {
                         "identifier": "live-hull",
@@ -100,6 +102,7 @@ def plugin(service, lifecycle):
                         "icon": icon_balor_hull,
                         "help": "devicebalor",
                         "action": lambda e: service("hull-light\n"),
+                        "multi_autoexec": False,
                     },
                     {
                         "identifier": "hull",
@@ -107,6 +110,7 @@ def plugin(service, lifecycle):
                         "icon": icon_balor_hull,
                         "help": "devicebalor",
                         "action": lambda e: service("element* geometry hull light\n"),
+                        "multi_autoexec": False,
                     },
                     {
                         "identifier": "box",
@@ -114,6 +118,7 @@ def plugin(service, lifecycle):
                         "icon": icon_balor_bounds,
                         "help": "devicebalor",
                         "action": lambda e: service("box light\n"),
+                        "multi_autoexec": False,
                     },
                     # {
                     #     "identifier": "ants",
@@ -126,6 +131,7 @@ def plugin(service, lifecycle):
                         "icon": icon_balor_full,
                         "help": "devicebalor",
                         "action": lambda e: service("element* geometry light\n"),
+                        "multi_autoexec": False,
                     },
                 ],
                 "toggle": {