meerk40t 0.9.7030__py2.py3-none-any.whl → 0.9.7050__py2.py3-none-any.whl

meerk40t/kernel/settings.py

@@ -1,6 +1,6 @@
 import ast
-import os
 import configparser
+import os
 from pathlib import Path
 from typing import Any, Dict, Generator, Optional, Union
 
@@ -22,7 +22,9 @@ class Settings:
 
     def __init__(self, directory, filename, ignore_settings=False, create_backup=False):
         if directory:
-            self._config_file = Path(get_safe_path(directory, create=True)).joinpath(filename)
+            self._config_file = Path(get_safe_path(directory, create=True)).joinpath(
+                filename
+            )
         else:
             self._config_file = filename
         self._config_dict = {}
@@ -51,13 +53,20 @@ class Settings:
             PermissionError,
             configparser.NoSectionError,
             configparser.MissingSectionHeaderError,
+            configparser.ParsingError,
+            configparser.NoOptionError,
             FileNotFoundError,
         ):
             return
         except UnicodeDecodeError as e:
-            print ("The config file contained unsupported characters, please share the file with the dev team")
-        except (configparser.DuplicateOptionError, configparser.DuplicateSectionError) as e:
-            print (f"We had a duplication error in the config, try to recover from {e}")
+            print(
+                "The config file contained unsupported characters, please share the file with the dev team"
+            )
+        except (
+            configparser.DuplicateOptionError,
+            configparser.DuplicateSectionError,
+        ) as e:
+            print(f"We had a duplication error in the config, try to recover from {e}")
         for section in parser.sections():
             for option in parser.options(section):
                 try:
@@ -65,7 +74,12 @@ class Settings:
                 except KeyError:
                     config_section = {}
                     self._config_dict[section] = config_section
-                config_section[option] = parser.get(section, option)
+                try:
+                    config_section[option] = parser.get(section, option)
+                except Exception as e:
+                    print(
+                        f"We had an error in the config, section {section}.{option}, try to recover from {e}"
+                    )
 
     def write_configuration(self, targetfile=None):
         """
@@ -91,8 +105,13 @@ class Settings:
                     except configparser.NoSectionError:
                         parser.add_section(section_key)
                         parser.set(section_key, key, value)
-                    except (configparser.DuplicateOptionError, configparser.DuplicateSectionError) as e:
-                        print (f"We had a duplication error in the config, try to recover from {e}")
+                    except (
+                        configparser.DuplicateOptionError,
+                        configparser.DuplicateSectionError,
+                    ) as e:
+                        print(
+                            f"We had a duplication error in the config, try to recover from {e}"
+                        )
 
             if self.create_backup:
                 VERSIONS = 5
@@ -125,7 +144,7 @@ class Settings:
                     pass
             with open(targetfile, "w", encoding="utf-8") as fp:
                 parser.write(fp)
-        except (PermissionError, FileNotFoundError):
+        except (PermissionError, FileNotFoundError, OSError, RuntimeError):
             return
 
     def literal_dict(self):

meerk40t/lihuiyu/device.py

@@ -5,21 +5,21 @@ Registers the Device service for M2 Nano (and family), registering the relevant
 the given device type.
 """
 
-from hashlib import md5
 import platform
+from hashlib import md5
 
 import meerk40t.constants as mkconst
 from meerk40t.core.laserjob import LaserJob
 from meerk40t.core.spoolers import Spooler
+from meerk40t.core.units import UNITS_PER_MIL, 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 CommandSyntaxError, Service, signal_listener
 
-from meerk40t.core.units import UNITS_PER_MIL, Length
-from meerk40t.device.mixins import Status
 from .controller import LihuiyuController
 from .driver import LihuiyuDriver
 from .tcp_connection import TCPOutput
-from meerk40t.device.devicechoices import get_effect_choices
 
 
 class LihuiyuDevice(Service, Status):
@@ -149,9 +149,7 @@ class LihuiyuDevice(Service, Status):
                 "label": _("Board"),
                 "style": "combosmall",
                 "choices": ["M2", "M3", "B2", "M", "M1", "A", "B", "B1"],
-                "tip": _(
-                    "Select the board to use. This affects the speedcodes used."
-                ),
+                "tip": _("Select the board to use. This affects the speedcodes used."),
                 "section": "_10_" + _("Configuration"),
                 "subsection": _("Board Setup"),
             },
@@ -374,8 +372,13 @@ class LihuiyuDevice(Service, Status):
                 "type": bool,
                 "label": _("Use legacy raster method"),
                 "tip": (
-                    _("Active: Use legacy method (seems to work better at higher speeds, but has some artifacts)") + "\n" +
-                    _("Inactive: Use regular method (no artifacts but apparently more prone to stuttering at high speeds)")
+                    _(
+                        "Active: Use legacy method (seems to work better at higher speeds, but has some artifacts)"
+                    )
+                    + "\n"
+                    + _(
+                        "Inactive: Use regular method (no artifacts but apparently more prone to stuttering at high speeds)"
+                    )
                 ),
                 "section": "_00_" + _("General Options"),
                 "subsection": "_20_",
@@ -1022,10 +1025,12 @@ class LihuiyuDevice(Service, Status):
         return {
             "split_crossover": True,
             "unsupported_opt": (
-                mkconst.RASTER_GREEDY_H, mkconst.RASTER_GREEDY_V, mkconst.RASTER_SPIRAL,
+                mkconst.RASTER_GREEDY_H,
+                mkconst.RASTER_GREEDY_V,
+                mkconst.RASTER_SPIRAL,
             ),  # Greedy loses registration way too often to be reliable
-            "gantry" : True,
-            "legacy" : self.legacy_raster,
+            "gantry": True,
+            "legacy": self.legacy_raster,
         }
 
     @property
@@ -1185,3 +1190,10 @@ class LihuiyuDevice(Service, Status):
 
     def cool_helper(self, choice_dict):
         self.kernel.root.coolant.coolant_choice_helper(self)(choice_dict)
+
+    def location(self):
+        if self.mock:
+            return "mock"
+        if self.networked:
+            return f"tcp {self.address}:{self.port}"
+        return f"usb {'auto' if self.usb_index < 0 else self.usb_index}"

meerk40t/main.py

@@ -11,7 +11,7 @@ import os.path
 import sys
 
 APPLICATION_NAME = "MeerK40t"
-APPLICATION_VERSION = "0.9.7030"
+APPLICATION_VERSION = "0.9.7050"
 
 if not getattr(sys, "frozen", False):
     # If .git directory does not exist we are running from a package like pypi
@@ -229,19 +229,24 @@ def _exe(restarted, args):
     server_mode = False
     if command:
         for c in command:
-            server_mode = server_mode or any(substring in c for substring in ("lhyserver", "grblserver", "ruidacontrol", "grblcontrol", "webserver"))
-    nogui = (
-        (hasattr(kernel.args, "gui_suppress") and kernel.args.gui_suppress) or
-        (hasattr(kernel.args, "no_gui") and kernel.args.no_gui) 
+            server_mode = server_mode or any(
+                substring in c
+                for substring in (
+                    "lhyserver",
+                    "grblserver",
+                    "ruidacontrol",
+                    "grblcontrol",
+                    "webserver",
+                )
+            )
+    nogui = (hasattr(kernel.args, "gui_suppress") and kernel.args.gui_suppress) or (
+        hasattr(kernel.args, "no_gui") and kernel.args.no_gui
     )
     for idx, attrib in enumerate(("mktablength", "mktabpositions")):
         kernel.register(f"registered_mk_svg_parameters/tabs{idx}", attrib)
 
     require_partial_mode = False
-    if (
-        (not console or nogui) and
-        (auto or daemon or server_mode)
-    ):
+    if (not console or nogui) and (auto or daemon or server_mode):
         require_partial_mode = True
     # print (f"Auto: {auto}, Command: {command}, Console: {console}, daemon: {daemon}, nogui:{nogui}, Server: {server_mode} -> {require_partial_mode}")
     kernel(partial=require_partial_mode)

meerk40t/moshi/device.py

@@ -7,6 +7,7 @@ Registers relevant commands and options.
 """
 import meerk40t.constants as mkconst
 from meerk40t.core.view import View
+from meerk40t.device.devicechoices import get_effect_choices
 from meerk40t.kernel import CommandSyntaxError, Service, signal_listener
 
 from ..core.laserjob import LaserJob
@@ -15,7 +16,6 @@ from ..core.units import Length
 from ..device.mixins import Status
 from .controller import MoshiController
 from .driver import MoshiDriver
-from meerk40t.device.devicechoices import get_effect_choices
 
 
 class MoshiDevice(Service, Status):
@@ -210,8 +210,13 @@ class MoshiDevice(Service, Status):
                 "type": bool,
                 "label": _("Use legacy raster method"),
                 "tip": (
-                    _("Active: Use legacy method (seems to work better at higher speeds, but has some artifacts)") + "\n" +
-                    _("Inactive: Use regular method (no artifacts but apparently more prone to stuttering at high speeds)")
+                    _(
+                        "Active: Use legacy method (seems to work better at higher speeds, but has some artifacts)"
+                    )
+                    + "\n"
+                    + _(
+                        "Inactive: Use regular method (no artifacts but apparently more prone to stuttering at high speeds)"
+                    )
                 ),
                 "section": "_20_Behaviour",
             },
@@ -485,11 +490,20 @@ class MoshiDevice(Service, Status):
         return {
             "split_crossover": True,
             "unsupported_opt": (
-                mkconst.RASTER_GREEDY_H, mkconst.RASTER_GREEDY_V, mkconst.RASTER_SPIRAL,
+                mkconst.RASTER_GREEDY_H,
+                mkconst.RASTER_GREEDY_V,
+                mkconst.RASTER_SPIRAL,
             ),  # Greedy loses registration way too often to be reliable
-            "gantry" : True,
-            "legacy" : self.legacy_raster,
+            "gantry": True,
+            "legacy": self.legacy_raster,
         }
 
     def cool_helper(self, choice_dict):
         self.kernel.root.coolant.coolant_choice_helper(self)(choice_dict)
+
+    def location(self):
+        return (
+            "mock"
+            if self.mock
+            else f"usb {'auto' if self.usb_index < 0 else self.usb_index}"
+        )

meerk40t/network/console_server.py

@@ -12,6 +12,13 @@ def plugin(kernel, lifecycle=None):
             action="store_true",
             help=_("do not watch server channels"),
         )
+        @kernel.console_option(
+            "suppress",
+            "u",
+            type=bool,
+            action="store_true",
+            help=_("suppress input prompt '>>'"),
+        )
         @kernel.console_option(
             "quit",
             "q",
@@ -23,8 +30,18 @@ def plugin(kernel, lifecycle=None):
             "consoleserver", help=_("starts a console_server on port 23 (telnet)")
         )
         def server_console(
-            command, channel, _, port=23, silent=False, quit=False, **kwargs
+            command,
+            channel,
+            _,
+            port=23,
+            silent=False,
+            quit=False,
+            suppress=False,
+            **kwargs,
         ):
+            if suppress is None:
+                suppress = False
+            kernel.show_aio_prompt = not suppress
             root = kernel.root
             # Variable to store input
             root.__console_buffer = ""
@@ -42,9 +59,9 @@ def plugin(kernel, lifecycle=None):
             except (OSError, ValueError):
                 channel(_("Server failed on port: {port}").format(port=port))
                 return
-                
+
             def exec_command(data: str) -> None:
-                # We are in a different thread, so let's hand over stuff to the gui 
+                # We are in a different thread, so let's hand over stuff to the gui
                 if isinstance(data, bytes):
                     try:
                         data = data.decode()
@@ -60,7 +77,7 @@ def plugin(kernel, lifecycle=None):
                     # No: we can split the command
                     quotations = data.count('"', 0, idx)
                     if quotations % 2 == 0:
-                        data = data[:idx].rstrip() + "\n" + data[idx+1:].lstrip()
+                        data = data[:idx].rstrip() + "\n" + data[idx + 1 :].lstrip()
                     start = idx + 1
                 root.__console_buffer += data
                 while "\n" in root.__console_buffer:
@@ -76,7 +93,7 @@ def plugin(kernel, lifecycle=None):
             for result in root.find("gui/handover"):
                 # Do we have a thread handover routine?
                 if result is not None:
-                    handover, _path, suffix_path  = result
+                    handover, _path, suffix_path = result
                     break
             recv.watch(exec_command)
 
@@ -93,7 +110,6 @@ def plugin(kernel, lifecycle=None):
                 console.watch(send)
                 server.events_channel.watch(console)
 
-
         @kernel.console_option(
             "port", "p", type=int, default=2080, help=_("port to listen on.")
         )

meerk40t/newly/device.py

@@ -5,10 +5,10 @@ from meerk40t.core.laserjob import LaserJob
 from meerk40t.core.spoolers import Spooler
 from meerk40t.core.units import 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 CommandSyntaxError, Service, signal_listener
 from meerk40t.newly.driver import NewlyDriver
-from meerk40t.device.devicechoices import get_effect_choices
 
 
 class NewlyDevice(Service, Status):
@@ -757,12 +757,16 @@ class NewlyDevice(Service, Status):
             help=_("Sets the default file index to use"),
             all_arguments_required=True,
         )
-        def set_file_index(command, channel, _, file_index=None, data=None, remainder=None, **kwgs):
+        def set_file_index(
+            command, channel, _, file_index=None, data=None, remainder=None, **kwgs
+        ):
             old_value = self.file_index
             if file_index is None or file_index < 0 or file_index >= 10:
                 file_index = 0
             self.file_index = file_index
-            channel(f"File index was set to #{file_index} (previous value: {old_value})")
+            channel(
+                f"File index was set to #{file_index} (previous value: {old_value})"
+            )
             # Let propertypanels know that this value was updated
             self.signal("file_index", file_index, self)
 
@@ -856,6 +860,9 @@ class NewlyDevice(Service, Status):
         )
         self.signal("view;realized")
 
+    def location(self):
+        return "mock" if self.mock else "usb"
+
     @property
     def current(self):
         """

meerk40t/newly/gui/gui.py

@@ -78,6 +78,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=0),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 0\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 1,
@@ -85,6 +86,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=1),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 1\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 2,
@@ -92,6 +94,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=2),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 2\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 3,
@@ -99,6 +102,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=3),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 3\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 4,
@@ -106,6 +110,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=4),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 4\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 5,
@@ -113,6 +118,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=5),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 5\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 6,
@@ -120,6 +126,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=6),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 6\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 7,
@@ -127,6 +134,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=7),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 7\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 8,
@@ -134,6 +142,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=8),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 8\n"),
+                        "multi_autoexec": True,
                     },
                     {
                         "identifier": 9,
@@ -141,6 +150,7 @@ def plugin(service, lifecycle):
                         "tip": _("File {index}").format(index=9),
                         "help": "devicenewly",
                         "action": lambda v: service("select_file 9\n"),
+                        "multi_autoexec": True,
                     },
                 ],
             },

meerk40t/ruida/device.py

@@ -5,6 +5,7 @@ Ruida device interfacing. We do not send or interpret ruida code, but we can emu
 ruida files (*.rd) and turn them likewise into cutcode.
 """
 from meerk40t.core.view import View
+from meerk40t.device.devicechoices import get_effect_choices
 from meerk40t.kernel import CommandSyntaxError, Service, signal_listener
 
 from ..core.laserjob import LaserJob
@@ -16,7 +17,6 @@ from .mock_connection import MockConnection
 from .serial_connection import SerialConnection
 from .tcp_connection import TCPConnection
 from .udp_connection import UDPConnection
-from meerk40t.device.devicechoices import get_effect_choices
 
 
 class RuidaDevice(Service):
@@ -264,6 +264,7 @@ class RuidaDevice(Service):
                 choice_dict["display"] = ["pyserial-not-installed"]
 
         from platform import system
+
         is_linux = system() == "Linux"
 
         choices = [
@@ -278,7 +279,7 @@ class RuidaDevice(Service):
                 "section": "_10_Serial Interface",
                 "subsection": "_00_",
                 "dynamic": update,
-                "exclusive": not is_linux, 
+                "exclusive": not is_linux,
             },
             {
                 "attr": "baud_rate",
@@ -581,6 +582,25 @@ class RuidaDevice(Service):
         name = self.label.replace(" ", "-")
         return name.replace("/", "-")
 
+    @property
+    def tcp_address(self):
+        return self.address
+
+    @property
+    def tcp_port(self):
+        return 5005
+
+    def location(self):
+        if self.interface == "mock":
+            return "mock"
+        elif self.interface == "udp":
+            return "udp, port 40200"
+        elif self.interface == "tcp":
+            return f"tcp {self.tcp_address}:{self.tcp_port}"
+        elif self.interface == "usb":
+            return f"usb: {self.serial_port}"
+        return f"undefined {self.interface}"
+
     @property
     def has_endstops(self):
         return True

meerk40t/ruida/loader.py

@@ -15,9 +15,11 @@ def data_viewer(data, data_type):
 
     if not data:
         return ""
+    magic = determine_magic_via_histogram(data)
     return BlobNode.hex_view(
-        data=decode_bytes(data, determine_magic_via_histogram(data)),
+        data=decode_bytes(data, magic),
         data_type=data_type,
+        info = f', Magic={magic} (0x{magic:02x})'
     )
 
 
@@ -26,10 +28,13 @@ def command_viewer(data, data_type):
 
     job = RDJob()
     job.write_blob(data)
-    commands = list()
+    commands = []
     job.channel = commands.append
-    while not job.execute(None):
-        pass
+    try:
+        while not job.execute(None):
+            pass
+    except Exception as e:
+        commands.append(f"!! Error !!: {e}")
     return "\n".join(commands)
 
 

meerk40t/ruida/rdjob.py

@@ -256,6 +256,8 @@ def encode_relcoord(coord):
 
 
 def encode_color(color):
+    # Scewed on RDC 22.01
+    # Maybe 16bit color is used?
     return encode32(int(color))
 
 
@@ -488,6 +490,7 @@ class RDJob:
         self._stopped = True
         self.enabled = True
         self._estimate = 0
+        self.offset = 0
 
         self.scale = UNITS_PER_uM
 
@@ -598,7 +601,8 @@ class RDJob:
             command = self.buffer.pop(0)
         try:
             array = list(command)
-            self.process(array)
+            self.process(array, offset=self.offset)
+            self.offset += len(command)
         except IndexError as e:
             raise RuidaCommandError(
                 f"Could not process Ruida buffer, {self.buffer[:25]} with magic: {self.magic:02}"
@@ -701,7 +705,7 @@ class RDJob:
     def set_color(self, color):
         self.color = color
 
-    def process(self, array):
+    def process(self, array, offset=None):
         """
         Parses an individual unswizzled ruida command, updating the emulator state.
 
@@ -976,7 +980,7 @@ class RDJob:
                 b = (c >> 16) & 0xFF
                 c = Color(red=r, blue=b, green=g)
                 self.set_color(c.hex)
-                desc = f"{part}, Color {self.color}"
+                desc = f"Color Part {part}, {self.color}"
             elif array[1] == 0x10:
                 value = array[2]
                 desc = f"EnExIO Start {value}"
@@ -1012,12 +1016,44 @@ class RDJob:
         elif array[0] == 0xD8:
             if array[1] == 0x00:
                 desc = "Start Process"
-            if array[1] == 0x10:
+            elif array[1] == 0x10:
                 desc = "Ref Point Mode 2, Machine Zero/Absolute Position"
-            if array[1] == 0x11:
+            elif array[1] == 0x11:
                 desc = "Ref Point Mode 1, Anchor Point"
-            if array[1] == 0x12:
+            elif array[1] == 0x12:
                 desc = "Ref Point Mode 0, Current Position"
+        elif array[0] == 0xD9:
+            if array[1] == 0x00:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move X ({value}μm)"
+            elif array[1] == 0x01:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move Y ({value}μm)"
+            elif array[1] == 0x02:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move Z ({value}μm)"
+            elif array[1] == 0x03:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move U ({value}μm)"
+            elif array[1] == 0x0F:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move Feed ({value}μm)"
+            elif array[1] == 0x10:
+                opts = array[2]
+                x = abscoord(array[3:8])
+                y = abscoord(array[8:13])
+                desc = f"Rapid move XY ({x}μm, {y}μm)"
+            elif array[1] == 0x30:
+                opts = array[2]
+                x = abscoord(array[3:7])
+                y = abscoord(array[8:13])
+                u = abscoord(array[13:18])
+                desc = f"Rapid move XYU ({x}μm, {y}μm, {u}μm)"
         elif array[0] == 0xDA:
             mem = parse_mem(array[2:4])
             if array[1] == 0x01:
@@ -1240,7 +1276,8 @@ class RDJob:
         else:
             desc = "Unknown Command!"
         if self.channel:
-            self.channel(f"-**-> {str(bytes(array).hex())}\t({desc})")
+            prefix = f"{offset:06x}" if offset is not None else ''
+            self.channel(f"{prefix}-**-> {str(bytes(array).hex())}\t({desc})")
 
     def unswizzle(self, data):
         return bytes([self.lut_unswizzle[b] for b in data])
@@ -1325,6 +1362,9 @@ class RDJob:
             color = current_settings.get("line_color", 0)
             frequency = current_settings.get("frequency")
 
+            if color == 0:
+                color = current_settings.get("color", color)
+
             self.speed_laser_1_part(part, speed)
             if frequency:
                 self.frequency_part(0, part, frequency)
@@ -1670,7 +1710,7 @@ class RDJob:
         self(LAYER_COLOR, encode_color(color), output=output)
 
     def layer_color_part(self, part, color, output=None):
-        self(LAYER_COLOR, encode_part(part), encode_color(color), output=output)
+        self(LAYER_COLOR_PART, encode_part(part), encode_color(color), output=output)
 
     def en_ex_io(self, value, output=None):
         """