meerk40t 0.9.7051__py2.py3-none-any.whl → 0.9.7900__py2.py3-none-any.whl

meerk40t/lihuiyu/gui/lhycontrollergui.py

@@ -70,6 +70,12 @@ class LihuiyuControllerPanel(ScrolledPanel):
             self, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY
         )
         self.button_clear_stats = wxButton(self, wx.ID_ANY, _("Reset\nstatistics"))
+        self.logged_packets = []
+        self.text_status_log = TextCtrl(
+            self, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY
+        )
+        self.button_clear_status_log = wxButton(self, wx.ID_ANY, _("Clear Status-Log"))
+        # self.button_clear_status_log.function = lambda: self.context("clear\n")
 
         self.__set_properties()
         self.__do_layout()
@@ -84,10 +90,15 @@ class LihuiyuControllerPanel(ScrolledPanel):
         self.Bind(
             wx.EVT_CHECKBOX, self.on_check_show_usb_log, self.checkbox_show_usb_log
         )
+
         # Test the color combos...
         # self.Bind(wx.EVT_RIGHT_DOWN, self.debug_colors)
         # self._debug_counter = 0
+        def clear_log(event=None):
+            self.logged_packets.clear()
+            self.text_status_log.SetValue("")
 
+        self.button_clear_status_log.Bind(wx.EVT_BUTTON, clear_log)
         self.last_control_state = None
         self.retries = 0
         self._buffer = ""
@@ -190,11 +201,12 @@ class LihuiyuControllerPanel(ScrolledPanel):
     def __do_layout(self):
         sizer_main = wx.BoxSizer(wx.HORIZONTAL)
         sizer_main_vertical = wx.BoxSizer(wx.VERTICAL)
-        sizer_show_usb_log = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_show_usb_log = wx.BoxSizer(wx.VERTICAL)
         packet_count = StaticBoxSizer(self, wx.ID_ANY, _("Packet Info"), wx.VERTICAL)
-        byte_data_status = StaticBoxSizer(
-            self, wx.ID_ANY, _("Byte Data Status"), wx.HORIZONTAL
+        byte_data_sizer = StaticBoxSizer(
+            self, wx.ID_ANY, _("Byte Data Status"), wx.VERTICAL
         )
+        byte_data_status = wx.BoxSizer(wx.HORIZONTAL)
         byte5sizer = wx.BoxSizer(wx.VERTICAL)
         byte4sizer = wx.BoxSizer(wx.VERTICAL)
         byte3sizer = wx.BoxSizer(wx.VERTICAL)
@@ -240,38 +252,43 @@ class LihuiyuControllerPanel(ScrolledPanel):
         packet_count.Add(sizer_statistics, 1, wx.EXPAND, 0)
         packet_info.Add(self.text_packet_info, 11, wx.EXPAND, 0)
         packet_count.Add(packet_info, 0, wx.EXPAND, 0)
-        byte0sizer.Add(self.text_byte_0, 0, 0, 0)
+        byte0sizer.Add(self.text_byte_0, 0, wx.EXPAND, 0)
         label_1 = wxStaticText(self, wx.ID_ANY, _("Byte 0"))
-        byte0sizer.Add(label_1, 0, 0, 0)
+        byte0sizer.Add(label_1, 0, wx.EXPAND, 0)
         byte_data_status.Add(byte0sizer, 1, wx.EXPAND, 0)
-        byte1sizer.Add(self.text_byte_1, 0, 0, 0)
+        byte1sizer.Add(self.text_byte_1, 0, wx.EXPAND, 0)
         label_2 = wxStaticText(self, wx.ID_ANY, _("Byte 1"))
-        byte1sizer.Add(label_2, 0, 0, 0)
-        byte1sizer.Add(self.text_desc, 0, 0, 0)
+        byte1sizer.Add(label_2, 0, wx.EXPAND, 0)
+        byte1sizer.Add(self.text_desc, 0, wx.EXPAND, 0)
         byte_data_status.Add(byte1sizer, 1, wx.EXPAND, 0)
-        byte2sizer.Add(self.text_byte_2, 0, 0, 0)
+        byte2sizer.Add(self.text_byte_2, 0, wx.EXPAND, 0)
         label_3 = wxStaticText(self, wx.ID_ANY, _("Byte 2"))
-        byte2sizer.Add(label_3, 0, 0, 0)
+        byte2sizer.Add(label_3, 0, wx.EXPAND, 0)
         byte_data_status.Add(byte2sizer, 1, wx.EXPAND, 0)
-        byte3sizer.Add(self.text_byte_3, 0, 0, 0)
+        byte3sizer.Add(self.text_byte_3, 0, wx.EXPAND, 0)
         label_4 = wxStaticText(self, wx.ID_ANY, _("Byte 3"))
-        byte3sizer.Add(label_4, 0, 0, 0)
+        byte3sizer.Add(label_4, 0, wx.EXPAND, 0)
         byte_data_status.Add(byte3sizer, 1, wx.EXPAND, 0)
-        byte4sizer.Add(self.text_byte_4, 0, 0, 0)
+        byte4sizer.Add(self.text_byte_4, 0, wx.EXPAND, 0)
         label_5 = wxStaticText(self, wx.ID_ANY, _("Byte 4"))
-        byte4sizer.Add(label_5, 0, 0, 0)
+        byte4sizer.Add(label_5, 0, wx.EXPAND, 0)
         byte_data_status.Add(byte4sizer, 1, wx.EXPAND, 0)
-        byte5sizer.Add(self.text_byte_5, 0, 0, 0)
+        byte5sizer.Add(self.text_byte_5, 0, wx.EXPAND, 0)
         label_18 = wxStaticText(self, wx.ID_ANY, _("Byte 5"))
-        byte5sizer.Add(label_18, 0, 0, 0)
+        byte5sizer.Add(label_18, 0, wx.EXPAND, 0)
         byte_data_status.Add(byte5sizer, 1, wx.EXPAND, 0)
-        packet_count.Add(byte_data_status, 0, wx.EXPAND, 0)
-        sizer_main_vertical.Add(packet_count, 0, 0, 0)
-        label_6 = wxStaticText(self, wx.ID_ANY, "")
-        sizer_show_usb_log.Add(label_6, 10, wx.EXPAND, 0)
-        sizer_show_usb_log.Add(self.checkbox_show_usb_log, 0, 0, 0)
-        sizer_main_vertical.Add(sizer_show_usb_log, 1, wx.EXPAND, 0)
-        sizer_main.Add(sizer_main_vertical, 1, 0, 0)
+
+        byte_data_sizer.Add(byte_data_status, 0, wx.EXPAND, 0)
+        byte_data_sizer.Add(self.text_status_log, 1, wx.EXPAND, 0)
+        byte_data_sizer.Add(self.button_clear_status_log, 0, wx.EXPAND, 0)
+
+        sizer_main_vertical.Add(packet_count, 0, wx.EXPAND, 0)
+        sizer_main_vertical.Add(byte_data_sizer, 1, wx.EXPAND, 0)
+        # label_6 = wxStaticText(self, wx.ID_ANY, "")
+        # sizer_show_usb_log.Add(label_6, 10, wx.EXPAND, 0)
+        sizer_show_usb_log.Add(self.checkbox_show_usb_log, 0, wx.ALIGN_RIGHT, 0)
+        sizer_main_vertical.Add(sizer_show_usb_log, 0, wx.EXPAND, 0)
+        sizer_main.Add(sizer_main_vertical, 1, wx.EXPAND, 0)
         sizer_main.Add(self.text_usb_log, 1, wx.EXPAND, 0)
         self.SetSizer(sizer_main)
         sizer_main.Fit(self)
@@ -403,18 +420,42 @@ class LihuiyuControllerPanel(ScrolledPanel):
                         self.text_byte_4.SetValue(str(status_data[4]))
                         self.text_byte_5.SetValue(str(status_data[5]))
                         self.text_desc.SetValue(code_string)
+                self.add_to_status_log(f"{status_data} - {code_string}")
             self.packet_count_text.SetValue(str(self.context.packet_count))
             self.rejected_packet_count_text.SetValue(str(self.context.rejected_count))
         except RuntimeError:
             # This should be handled when the controller window is closed.
             pass
 
+    def add_to_status_log(self, string_data):
+        """Add a string to the status log."""
+        if len(self.logged_packets) == 0:
+            self.logged_packets.append((1, string_data))
+        else:
+            count, oldstring_data = self.logged_packets[-1]
+            if oldstring_data == string_data:
+                # If the last entry is the same, just increase the count.
+                self.logged_packets[-1] = (count + 1, oldstring_data)
+            else:
+                # Otherwise, add a new entry.
+                if len(self.logged_packets) > 750:
+                    self.logged_packets = self.logged_packets[-750:]
+                self.logged_packets.append((1, string_data))
+        text_data = []
+        for count, data in self.logged_packets:
+            if count > 1:
+                text_data.append(f"{data} (x{count})")
+            else:
+                text_data.append(data)
+        self.text_status_log.SetValue("\n".join(text_data))
+
     @signal_listener("pipe;packet_text")
     def update_packet_text(self, origin, string_data):
         if origin != self.context._path:
             return
         if string_data is not None and len(string_data) != 0:
             self.text_packet_info.SetValue(str(string_data))
+            self.add_to_status_log(f">> {string_data}")
 
     @signal_listener("pipe;usb_status")
     def on_connection_status_change(self, origin, status):
@@ -526,7 +567,11 @@ class LihuiyuControllerPanel(ScrolledPanel):
             except NotImplementedError:
                 dlg = wx.MessageDialog(
                     None,
-                    _("Connection Refused. See USB Log for detailed information.") + "\n" + _("You may run an incompatible version of libusb, have you tried the 32-bit version?"),
+                    _("Connection Refused. See USB Log for detailed information.")
+                    + "\n"
+                    + _(
+                        "You may run an incompatible version of libusb, have you tried the 32-bit version?"
+                    ),
                     _("Manual Connection"),
                     wx.OK | wx.ICON_WARNING,
                 )

meerk40t/lihuiyu/gui/lhydrivergui.py

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

meerk40t/lihuiyu/laserspeed.py

@@ -6,7 +6,6 @@ LaserSpeed
 This is the standard library for converting to and from speed code information for LHYMICRO-GL.
 """
 
-
 from math import floor
 
 
@@ -55,6 +54,7 @@ class LaserSpeed:
         fix_speeds=False,
         fix_lows=False,
         fix_limit=False,
+        power_value=None,
     ):
         self.speed = speed
         self.board = board
@@ -67,7 +67,7 @@ class LaserSpeed:
         self.fix_speeds = fix_speeds
         self.fix_lows = fix_lows
         self.fix_limit = fix_limit
-
+        self.power_value = power_value
         if isinstance(speed, str):
             # this is a speedcode value.
             (
@@ -114,6 +114,8 @@ class LaserSpeed:
             parts.append(f"fix_limit={str(self.fix_limit)}")
         if not self.raster_horizontal:
             parts.append(f"raster_horizontal={str(self.raster_horizontal)}")
+        if self.power_value:
+            parts.append(f"power_value={str(self.power_value)}")
         return f"LaserSpeed({', '.join(parts)})"
 
     @property
@@ -129,6 +131,7 @@ class LaserSpeed:
             fix_speeds=self.fix_speeds,
             fix_lows=self.fix_lows,
             raster_horizontal=self.raster_horizontal,
+            power_value=self.power_value,
         )
 
 
@@ -163,6 +166,7 @@ def get_code_from_speed(
     fix_speeds=False,
     fix_lows=False,
     raster_horizontal=True,
+    power_value=None,
 ):
     """
     Get a speedcode from a given speed. The raster step appends the 'G' value and uses speed ranges.
@@ -204,21 +208,24 @@ def get_code_from_speed(
         # produced a negative speed value, go ahead and set that to 0
         speed_value = 0
     encoded_speed = encode_16bit(speed_value)
-
+    if power_value is None or power_value >= 1000 or power_value < 0:
+        power_suffix = ""
+    else:
+        power_suffix = f"W{int(power_value):03d}"
     if raster_step != 0:
         # There is no C suffix notation for raster step.
         if isinstance(raster_step, tuple):
-            return f"V{encoded_speed}{acceleration:1d}G{abs(raster_step[0]):03d}G{abs(raster_step[1]):03d}"
+            return f"V{encoded_speed}{acceleration:1d}G{abs(raster_step[0]):03d}G{abs(raster_step[1]):03d}{power_suffix}"
         else:
-            return f"V{encoded_speed}{acceleration:1d}G{abs(raster_step):03d}"
+            return f"V{encoded_speed}{acceleration:1d}G{abs(raster_step):03d}{power_suffix}"
 
     if d_ratio == 0 or board in ("A", "B", "M"):
         # We do not need the diagonal code.
         if raster_step == 0:
             if suffix_c:
-                return f"CV{encoded_speed}1C"
+                return f"CV{encoded_speed}1C{power_suffix}"
             else:
-                return f"CV{encoded_speed}{acceleration:1d}"
+                return f"CV{encoded_speed}{acceleration:1d}{power_suffix}"
     else:
         step_value = min(int(floor(mm_per_second) + 1), 128)
         frequency_kHz = float(mm_per_second) / 25.4
@@ -235,11 +242,11 @@ def get_code_from_speed(
                 d_value = 0
         encoded_diagonal = encode_16bit(d_value)
         if suffix_c:
-            return f"CV{encoded_speed}1{step_value:03d}{encoded_diagonal}C"
-        else:
             return (
-                f"CV{encoded_speed}{acceleration:1d}{step_value:03d}{encoded_diagonal}"
+                f"CV{encoded_speed}1{step_value:03d}{encoded_diagonal}C{power_suffix}"
             )
+        else:
+            return f"CV{encoded_speed}{acceleration:1d}{step_value:03d}{encoded_diagonal}{power_suffix}"
 
 
 def parse_speed_code(speed_code):

meerk40t/lihuiyu/parser.py

@@ -30,6 +30,7 @@ class LihuiyuParser:
 
         self.x = 0.0
         self.y = 0.0
+        self.power = 1000.0
         self.number_value = ""
         self.distance_x = 0
         self.distance_y = 0
@@ -132,6 +133,7 @@ class LihuiyuParser:
         self.number_value += c
         if len(self.number_value) >= 3:
             self.append_distance(int(self.number_value))
+
             self.number_value = ""
 
     def speedcode_b1_consumer(self, c):
@@ -201,6 +203,17 @@ class LihuiyuParser:
             self.number_value = ""
             self.number_consumer = self.speedcode_mult_consumer
 
+    def power_consumer(self, c):
+        self.number_value += c
+        if len(self.number_value) >= 3:
+            if self.channel:
+                self.channel(f"Set Power level = {self.number_value}")
+            self.power = int(self.number_value)
+            if self.power == 0:
+                self.power = 1000
+            self.number_value = ""
+            self.number_consumer = self.distance_consumer
+
     def append_distance(self, amount):
         if self.x_on:
             self.distance_x += amount
@@ -402,3 +415,13 @@ class LihuiyuParser:
                 self.channel(
                     f"Diagonal {'Top' if self.top else 'Bottom'} {'Left' if self.left else 'Right'}"
                 )
+        elif c == "W":
+            """
+            W: Set Laser Power(W000 .. W999)
+            Example: IV……W500 (Set Laser Power is 50.0%)
+            Note: only M3 and fireware up 2024.01.18g support set laser power
+            Earlier M3 only is M2+
+            """
+            if self.channel:
+                self.channel("Set Laser Power")
+            self.number_consumer = self.power_consumer

meerk40t/main.py

@@ -11,7 +11,7 @@ import os.path
 import sys
 
 APPLICATION_NAME = "MeerK40t"
-APPLICATION_VERSION = "0.9.7051"
+APPLICATION_VERSION = "0.9.7900"
 
 if not getattr(sys, "frozen", False):
     # If .git directory does not exist we are running from a package like pypi

meerk40t/moshi/gui/moshidrivergui.py

@@ -7,6 +7,7 @@ from meerk40t.device.gui.effectspanel import EffectsPanel
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
 from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
+from meerk40t.kernel import signal_listener
 
 _ = wx.GetTranslation
 
@@ -85,3 +86,9 @@ class MoshiDriverGui(MWindow):
     @staticmethod
     def helptext():
         return _("Display the device configuration window")
+
+    @signal_listener("activate;device")
+    def on_device_changes(self, *args):
+        # Device activated, make sure we are still fine...
+        if self.context.device.name != 'MoshiDevice':
+            wx.CallAfter(self.Close)

meerk40t/newly/controller.py

@@ -739,9 +739,10 @@ class NewlyController:
         self(f"WU{int(round(w_position))}")
         self.close_job()
 
-    def pulse(self, pulse_time_ms):
+    def pulse(self, pulse_time_ms, power=None):
         self.realtime_job()
-        self.dwell(pulse_time_ms)
+        settings = None if power is None else {"power": power}
+        self.dwell(pulse_time_ms, settings=settings)
         self.close_job()
 
     def home(self):

meerk40t/newly/device.py

@@ -644,15 +644,28 @@ class NewlyDevice(Service, Status):
             action="store_true",
             help=_("override one second laser fire pulse duration"),
         )
+        @self.console_option("power", "p", type=str, help=_("Power level"))
         @self.console_argument("time", type=float, help=_("laser fire pulse duration"))
         @self.console_command(
             "pulse",
             help=_("pulse <time>: Pulse the laser in place."),
         )
-        def pulse(command, channel, _, time=None, idonotlovemyhouse=False, **kwgs):
+        def pulse(
+            command, channel, _, time=None, power=None, idonotlovemyhouse=False, **kwgs
+        ):
             if time is None:
                 channel(_("Must specify a pulse time in milliseconds."))
                 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 time > 1000.0:
                 channel(
                     _(
@@ -665,7 +678,7 @@ class NewlyDevice(Service, Status):
                 except IndexError:
                     return
             if self.spooler.is_idle:
-                self.spooler.command("pulse", time)
+                self.spooler.command("pulse", time, power)
                 channel(_("Pulse laser for {time} milliseconds").format(time=time))
             else:
                 channel(_("Pulse laser failed: Busy"))
@@ -813,6 +826,14 @@ class NewlyDevice(Service, Status):
         name = self.label.replace(" ", "-")
         return name.replace("/", "-")
 
+    @property
+    def supports_pwm(self):
+        """
+        Returns whether this device supports PWM.
+        :return: True if the device supports PWM, False otherwise.
+        """
+        return self.pwm_enabled
+
     def service_attach(self, *args, **kwargs):
         self.realize()
 

meerk40t/newly/driver.py

@@ -39,7 +39,12 @@ class NewlyDriver:
         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._aborting = False
         self._list_bits = None
@@ -525,8 +530,8 @@ class NewlyDriver:
         """
         pass
 
-    def pulse(self, pulse_time):
-        self.connection.pulse(pulse_time)
+    def pulse(self, pulse_time, power=None):
+        self.connection.pulse(pulse_time, power=power)
 
     def dwell(self, time_in_ms):
         """

meerk40t/newly/gui/newlyconfig.py

@@ -7,6 +7,7 @@ from meerk40t.device.gui.effectspanel import EffectsPanel
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
 from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
+from meerk40t.kernel import signal_listener
 
 _ = wx.GetTranslation
 
@@ -114,3 +115,9 @@ class NewlyConfiguration(MWindow):
     @staticmethod
     def submenu():
         return "Device-Settings", "Configuration"
+
+    @signal_listener("activate;device")
+    def on_device_changes(self, *args):
+        # Device activated, make sure we are still fine...
+        if self.context.device.name != 'newly':
+            wx.CallAfter(self.Close)

meerk40t/ruida/gui/ruidaconfig.py

@@ -8,6 +8,7 @@ from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
 from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import ScrolledPanel, StaticBoxSizer, TextCtrl, dip_size
+from meerk40t.kernel import signal_listener
 
 _ = wx.GetTranslation
 
@@ -237,3 +238,9 @@ class RuidaConfiguration(MWindow):
     @staticmethod
     def helptext():
         return _("Display the device configuration window")
+
+    @signal_listener("activate;device")
+    def on_device_changes(self, *args):
+        # Device activated, make sure we are still fine...
+        if self.context.device.name != 'RuidaDevice':
+            wx.CallAfter(self.Close)