meerk40t 0.9.7050__tar.gz → 0.9.7900__tar.gz

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/PKG-INFO

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

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/balormk/controller.py

@@ -288,7 +288,7 @@ class GalvoController:
         self._list_executing = False
         self._number_of_list_packets = 0
         self.paused = False
-        self._signal_updates = self.service.setting(bool, "signal_updates", True)
+        self.service.setting(bool, "signal_updates", True)
 
     def define_pins(self):
         self._light_bit = self.service.setting(int, "light_pin", 8)
@@ -1090,7 +1090,7 @@ class GalvoController:
         x = int(x)
         y = int(y)
         self._list_write(listJumpTo, x, y, angle, distance)
-        if self._signal_updates:
+        if self.service.signal_updates:
             view = self.service.view
             l_x, l_y = view.iposition(self._last_x, self._last_y)
             n_x, n_y = view.iposition(x, y)
@@ -1125,7 +1125,7 @@ class GalvoController:
         y = int(y)
         self._list_write(listMarkTo, x, y, angle, distance)
 
-        if self._signal_updates:
+        if self.service.signal_updates:
             view = self.service.view
             l_x, l_y = view.iposition(self._last_x, self._last_y)
             n_x, n_y = view.iposition(x, y)

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/balormk/device.py

@@ -893,6 +893,13 @@ class BalorDevice(Service, Status):
         name = self.label.replace(" ", "-")
         return name.replace("/", "-")
 
+    @property
+    def supports_pwm(self):
+        """
+        Returns whether this device supports PWM.
+        """
+        return True
+
     def service_attach(self, *args, **kwargs):
         self.realize()
 

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/balormk/driver.py

@@ -57,6 +57,7 @@ class BalorDriver:
         self.plot_planner.settings_then_jog = True
         self._aborting = False
         self._list_bits = None
+        self.service.setting(bool, "signal_updates", True)
 
     def __repr__(self):
         return f"BalorDriver({self.name})"
@@ -552,11 +553,12 @@ class BalorDriver:
         if self.native_y < 0:
             self.native_y = 0
         self.connection.set_xy(self.native_x, self.native_y)
-        new_current = self.service.current
-        self.service.signal(
-            "driver;position",
-            (old_current[0], old_current[1], new_current[0], new_current[1]),
-        )
+        if self.service.signal_updates:
+            new_current = self.service.current
+            self.service.signal(
+                "driver;position",
+                (old_current[0], old_current[1], new_current[0], new_current[1]),
+            )
 
     def move_rel(self, dx, dy):
         """
@@ -581,11 +583,12 @@ class BalorDriver:
         if self.native_y < 0:
             self.native_y = 0
         self.connection.set_xy(self.native_x, self.native_y)
-        new_current = self.service.current
-        self.service.signal(
-            "driver;position",
-            (old_current[0], old_current[1], new_current[0], new_current[1]),
-        )
+        if self.service.signal_updates:
+            new_current = self.service.current
+            self.service.signal(
+                "driver;position",
+                (old_current[0], old_current[1], new_current[0], new_current[1]),
+            )
 
     def home(self):
         """
@@ -718,7 +721,7 @@ class BalorDriver:
         self.connection.abort()
         self.service.signal("pause")
 
-    def dwell(self, time_in_ms):
+    def dwell(self, time_in_ms, settings=None):
         """
         Requests that the laser fire in place for the given time period. This could be done in a series of commands,
         move to a location, turn laser on, wait, turn laser off. However, some drivers have specific laser-in-place
@@ -727,14 +730,20 @@ class BalorDriver:
         @param time_in_ms:
         @return:
         """
-        self.pulse(time_in_ms)
+        if settings is not None and "power" in settings:
+            power = settings.get("power")
+        else:
+            power = None
+        self.pulse(time_in_ms, power=power)
 
-    def pulse(self, pulse_time):
+    def pulse(self, pulse_time, power=None):
         self.service.laser_status = "active"
         con = self.connection
         con.program_mode()
         con.frequency(self.service.default_frequency)
-        con.power(self.service.default_power)
+        if power is None:
+            power = self.service.default_power
+        con.power(power)
         if self.service.pulse_width_enabled:
             con.list_fiber_ylpm_pulse_width(self.service.default_pulse_width)
         dwell_time = pulse_time * 100  # Dwell time in ms units in 10 us

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/balormk/galvo_commands.py

@@ -299,12 +299,15 @@ def plugin(service, lifecycle):
         action="store_true",
         help=_("override one second laser fire pulse duration"),
     )
+    @service.console_option("power", "p", type=str, help=_("Power level"))
     @service.console_argument("time", type=float, help=_("laser fire pulse duration"))
     @service.console_command(
         "pulse",
         help=_("pulse <time>: Pulse the laser in place."),
     )
-    def pulse(command, channel, _, time=None, idonotlovemyhouse=False, **kwargs):
+    def pulse(
+        command, channel, _, time=None, power=None, idonotlovemyhouse=False, **kwargs
+    ):
         if time is None:
             channel(_("Must specify a pulse time in milliseconds."))
             return
@@ -319,9 +322,21 @@ def plugin(service, lifecycle):
                     return
             except IndexError:
                 return
+        if power:
+            try:
+                if power.endswith("%"):
+                    power = float(power[:-1]) * 10
+                else:
+                    power = float(power)
+            except ValueError:
+                channel(_("Invalid power value: {power}").format(power=power))
+                return
         if service.spooler.is_idle:
-            service.spooler.command("pulse", time)
-            channel(_("Pulse laser for {time} milliseconds").format(time=time))
+            service.spooler.command("pulse", time, power)
+            channel(
+                _("Pulse laser for {time} milliseconds").format(time=time)
+                + f"[{power}]"
+            )
         else:
             channel(_("Pulse laser failed: Busy"))
         return

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/balormk/gui/balorconfig.py

@@ -235,3 +235,9 @@ class BalorConfiguration(MWindow):
     @staticmethod
     def helptext():
         return _("Display and edit device configuration")
+
+    @signal_listener("activate;device")
+    def on_device_changes(self, *args):
+        # Device activated, make sure we are still fine...
+        if self.context.device.name != 'balor':
+            wx.CallAfter(self.Close)

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/balormk/livelightjob.py

@@ -41,11 +41,12 @@ class LiveLightJob:
         self._travel_speed = travel_speed
         self._jump_delay = jump_delay
 
+        self._signal_mode = True
         # Kernel Job definition
         self.redlight_lock = threading.RLock()
         self.redlight_job = Job(
             self.jobevent,
-            interval=0.1,
+            # interval=0.1,
             job_name=f"redlight_{self.mode}_{time.perf_counter():3f}",
             run_main=False,
         )
@@ -177,20 +178,24 @@ class LiveLightJob:
                 con._goto_speed = self.service.redlight_speed
             con.light_mode()
 
+        # print (f"Redlight job {self.label} running...")
         if self.stopped or self._connection is None:
             return
         con = self._connection
-        if self.changed:
-            # print ("Something changed")
-            with self.redlight_lock:
-                if self.update_method is not None:
-                    self.update_method()
-                # print (f"We are having now {len(self.points)} points")
-                self.changed = False
-            init_red(con)
-
-        # Now draw the stuff
-        self.trace_redlight(con)
+        while not self.stopped:
+            if self.changed:
+                # print ("Something changed")
+                with self.redlight_lock:
+                    if self.update_method is not None:
+                        self.update_method()
+                        # print (f"We are having now {len(self.points)} points")
+                        # for i, e in enumerate(self.points):
+                        #     print (f"Point {i}: {e}")
+                    self.changed = False
+                init_red(con)
+
+            # Now draw the stuff
+            self.trace_redlight(con)
 
     def trace_redlight(self, con):
         """Trace the redlight path.
@@ -206,6 +211,9 @@ class LiveLightJob:
         delay_dark = self.service.delay_jump_long
         delay_between = self.service.delay_jump_short
         move = True
+        # We need to jump back to the first point
+        first = True
+        first_x, first_y = None, None
         for i, e in enumerate(self.points):
             if self.stopped or self.changed:
                 # Abort due to stoppage or change, no sense to continue
@@ -227,11 +235,16 @@ class LiveLightJob:
                 # Fix them.
                 x &= 0xFFFF
                 y &= 0xFFFF
+            if first:
+                first_x, first_y = x, y
+                first = False
             if move:
                 con.dark(x, y, long=delay_dark, short=delay_dark)
                 move = False
                 continue
             con.light(x, y, long=delay_between, short=delay_between)
+        if first_x is not None and first_y is not None:
+            con.dark(first_x, first_y, long=delay_dark, short=delay_dark)
         con.light_off()
         con.write_port()
 
@@ -243,7 +256,13 @@ class LiveLightJob:
         """
         if not self.listen:
             return
-        for method in ("emphasized", "modified_by_tool", "updating", "view;realized"):
+        for method in (
+            "emphasized",
+            "modified_by_tool",
+            "updating",
+            "view;realized",
+            "update_group_labels",
+        ):
             if start:
                 self.service.listen(method, self.on_emphasis_changed)
             else:
@@ -265,6 +284,8 @@ class LiveLightJob:
         self._connection = driver.connection
         self._connection.rapid_mode()
         self._connection.light_mode()
+        self._signal_mode = driver.service.signal_updates
+        driver.service.signal_updates = False
         self.update()
         self.service.kernel.schedule(self.redlight_job)
 
@@ -283,6 +304,7 @@ class LiveLightJob:
         self.redlight_job.cancel()
         self.service.kernel.unschedule(self.redlight_job)
         self.setup_listen(False)
+        driver.service.signal_updates = self._signal_mode
         if self._connection is not None:
             self._connection.abort()
             if self.service.redlight_preferred:
@@ -458,7 +480,7 @@ class LiveLightJob:
         geometry.transform(rotate)
         self.points = list(
             geometry.as_equal_interpolated_points(
-                distance=self.quantization, expand_lines=True
+                distance=self.quantization,  # expand_lines=True
             )
         )
         # print (f"Interpolation delivered: {len(self.points)} segments")

{meerk40t-0.9.7050 → meerk40t-0.9.7900}/meerk40t/camera/camera.py

@@ -38,6 +38,7 @@ class Camera(Service):
         self.camera_thread = None
         self.max_tries_connect = 10
         self.max_tries_frame = 10
+        self.setting(str, "desc", "")
         self.setting(int, "width", 640)
         self.setting(int, "height", 480)
         self.setting(bool, "correction_fisheye", False)