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

meerk40t/device/gui/defaultactions.py

@@ -5,18 +5,27 @@ from meerk40t.gui.icons import (
     icon_air_on,
     icon_bell,
     icon_close_window,
+    icon_coffee,
     icon_console,
     icon_external,
     icon_internal,
     icon_return,
     icon_round_stop,
+    icon_sleep,
     icon_timer,
     icon_trash,
     icons8_down,
     icons8_home_filled,
     icons8_up,
 )
-from meerk40t.gui.wxutils import StaticBoxSizer, TextCtrl, dip_size, wxButton, wxListCtrl, wxStaticBitmap
+from meerk40t.gui.wxutils import (
+    StaticBoxSizer,
+    TextCtrl,
+    dip_size,
+    wxButton,
+    wxListCtrl,
+    wxStaticBitmap,
+)
 
 _ = wx.GetTranslation
 
@@ -37,16 +46,31 @@ class DefaultActionPanel(wx.Panel):
 
         self.SetHelpText("defaultactions")
 
-        self.standards = (
-            ("Home", "util home", ""),
-            ("Goto Origin", "util goto", "0,0"),
-            ("Goto 0,0", "util goto", "0,0,True"),
-            ("Beep", "util console", "beep"),
-            ("Interrupt", "util console", 'interrupt "Spooling was interrupted"'),
-            ("Console", "util console", ""),
-            ("Coolant on", "util console", "coolant_on"),
-            ("Coolant off", "util console", "coolant_off"),
-        )
+        self.standards = [
+            ("Home", "util home", "", _("Move the laser head to the home position.")),
+            (
+                "Goto Origin",
+                "util goto",
+                "0,0",
+                _("Move the laser head to the origin position."),
+            ),
+            (
+                "Goto 0,0",
+                "util goto",
+                "0,0,True",
+                _("Move the laser head to the absolute position 0,0."),
+            ),
+            ("Beep", "util console", "beep", _("Make audible beep.")),
+            (
+                "Interrupt",
+                "util console",
+                'interrupt "Spooling was interrupted"',
+                _("Interrupt the current operation and display a message."),
+            ),
+            ("Console", "util console", "", _("Execute a command in the console.")),
+            ("Coolant on", "util console", "coolant_on", _("Turn on the coolant.")),
+            ("Coolant off", "util console", "coolant_off", _("Turn off the coolant.")),
+        ]
         self.default_images = [
             ["console home -f", icons8_home_filled],
             ["console move_abs", icon_return],
@@ -62,6 +86,25 @@ class DefaultActionPanel(wx.Panel):
             ["console coolant_on", icon_air_on],
             ["console coolant_off", icon_air_off],
         ]
+        if self.context.kernel.inhibitor.available:
+            self.standards += [
+                (
+                    "Hibernation off",
+                    "util console",
+                    "system_hibernate prevent",
+                    _("Prevent the system from entering hibernation mode."),
+                ),
+                (
+                    "Hibernation on",
+                    "util console",
+                    "system_hibernate allow",
+                    _("Allow the system to enter hibernation mode."),
+                ),
+            ]
+            self.default_images += [
+                ["console system_hibernate prevent", icon_coffee],
+                ["console system_hibernate allow", icon_sleep],
+            ]
         self.prepend_ops = []
         self.append_ops = []
 
@@ -71,7 +114,9 @@ class DefaultActionPanel(wx.Panel):
         sizer_middle = wx.BoxSizer(wx.VERTICAL)
 
         iconsize = dip_size(self, 30, 20)
-        bmpsize = min(iconsize[0], iconsize[1]) * self.context.root.bitmap_correction_scale
+        bmpsize = (
+            min(iconsize[0], iconsize[1]) * self.context.root.bitmap_correction_scale
+        )
         self.option_list = wxListCtrl(
             self,
             wx.ID_ANY,
@@ -84,12 +129,18 @@ class DefaultActionPanel(wx.Panel):
         self.button_add_append = wxButton(self, wx.ID_ANY, _("Add to Job End"))
 
         self.prepend_list = wxListCtrl(
-            self, wx.ID_ANY, style=wx.LC_LIST | wx.LC_SINGLE_SEL, context=self.context,
+            self,
+            wx.ID_ANY,
+            style=wx.LC_LIST | wx.LC_SINGLE_SEL,
+            context=self.context,
         )
         self.text_param_prepend = TextCtrl(self, wx.ID_ANY)
 
         self.append_list = wxListCtrl(
-            self, wx.ID_ANY, style=wx.LC_LIST | wx.LC_SINGLE_SEL, context=self.context,
+            self,
+            wx.ID_ANY,
+            style=wx.LC_LIST | wx.LC_SINGLE_SEL,
+            context=self.context,
         )
         self.text_param_append = TextCtrl(self, wx.ID_ANY)
         self.button_del_prepend = wxStaticBitmap(self, wx.ID_ANY, size=iconsize)
@@ -198,6 +249,7 @@ class DefaultActionPanel(wx.Panel):
 
         # Logic for addition of new entries
         self.option_list.Bind(wx.EVT_LIST_ITEM_SELECTED, self.option_single_click)
+        self.option_list.Bind(wx.EVT_MOTION, self.option_hover)
         self.button_add_prepend.Bind(wx.EVT_BUTTON, self.add_prepend_option)
         self.button_add_append.Bind(wx.EVT_BUTTON, self.add_append_option)
 
@@ -437,6 +489,7 @@ class DefaultActionPanel(wx.Panel):
         if idx < 0 or idx >= len(self.standards):
             active = False
             self.text_param_option.SetValue("")
+            self.option_list.SetToolTip("")
         else:
             active = True
             self.text_param_option.SetValue(self.standards[idx][2])
@@ -447,6 +500,17 @@ class DefaultActionPanel(wx.Panel):
         ):
             ctrl.Enable(active)
 
+    def option_hover(self, event):
+        position = event.GetPosition()
+        idx, flags = self.option_list.HitTest(position)
+        if idx < 0 or idx >= len(self.standards):
+            self.option_list.SetToolTip("")
+        else:
+            tooltip = self.standards[idx][3]
+            if tooltip is None:
+                tooltip = ""
+            self.option_list.SetToolTip(tooltip)
+
     ### Data storage / retrieval
 
     def save_data(self):

meerk40t/dxf/dxf_io.py

@@ -132,6 +132,7 @@ class DXFProcessor:
                 # else, is within the bed dimensions correctly, change nothing.
         if self.elements.classify_new:
             self.elements.classify(self.elements_list)
+        self.elements.signal("element_property_update", self.elements_list)
         return True
 
     def check_for_attributes(self, node, entity):
@@ -156,6 +157,47 @@ class DXFProcessor:
             except Exception:
                 color = Color("black")
             node.stroke = color
+        if hasattr(entity.dxf, "layer"):
+            # For some reason, the layer is not available in the dxf entity.
+            # This happens with LibreCad 2.2.0 and 2.2.1.
+            # So we try to get it from the layer table.
+            if entity.dxf.layer in dxf.layers:
+                s_layer = entity.dxf.layer
+            else:
+                s_layer = ""
+            assign_type = ""
+            if "ENGRAVE" in s_layer.upper() or "ENGRAVE" in entity.dxf.layer.upper():
+                assign_type = "op engrave"
+            elif "CUT" in s_layer.upper() or "CUT" in entity.dxf.layer.upper():
+                assign_type = "op cut" 
+            # print (f"Layer: {s_layer} ({entity.dxf.layer}), assign_type: {assign_type}")
+            node.label = s_layer
+            if assign_type:
+                if s_layer == "":
+                    s_layer = entity.dxf.layer
+                # We look for a proper op to assign the node to it
+                first_op = None
+                found = False
+                for op in self.elements.ops():
+                    if op.type != assign_type:
+                        continue
+                    if first_op is None:
+                        first_op = op
+                    if op.color == node.stroke or op.label == s_layer:
+                        # We found an engrave op with the same color
+                        op.add_reference(node)
+                        found = True
+                        break
+                if not found:
+                    if first_op is None:
+                        first_op = self.elements.op_branch.add(
+                            type=assign_type, 
+                            color=node.stroke, 
+                            label=s_layer
+                        )
+                    # We did not find a proper match, so we assign it to the first engrave/cut op
+                    first_op.add_reference(node)
+
 
     # def debug_entity(self, entity):
     #     print (f"Entity: {entity.dxftype()}")

meerk40t/grbl/controller.py

@@ -29,73 +29,277 @@ def hardware_settings(code):
     @return: parameter, units
     """
     if code == 0:
-        return 10, "step pulse time", "microseconds", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#0--step-pulse-microseconds"
+        return (
+            10,
+            "step pulse time",
+            "microseconds",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#0--step-pulse-microseconds",
+        )
     if code == 1:
-        return 25, "step idle delay", "milliseconds", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#1---step-idle-delay-milliseconds"
+        return (
+            25,
+            "step idle delay",
+            "milliseconds",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#1---step-idle-delay-milliseconds",
+        )
     if code == 2:
-        return 0, "step pulse invert", "bitmask", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#2--step-port-invert-mask"
+        return (
+            0,
+            "step pulse invert",
+            "bitmask",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#2--step-port-invert-mask",
+        )
     if code == 3:
-        return 0, "step direction invert", "bitmask", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#3--direction-port-invert-mask"
+        return (
+            0,
+            "step direction invert",
+            "bitmask",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#3--direction-port-invert-mask",
+        )
     if code == 4:
-        return 0, "invert step enable pin", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#4---step-enable-invert-boolean"
+        return (
+            0,
+            "invert step enable pin",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#4---step-enable-invert-boolean",
+        )
     if code == 5:
-        return 0, "invert limit pins", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#5----limit-pins-invert-boolean"
+        return (
+            0,
+            "invert limit pins",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#5----limit-pins-invert-boolean",
+        )
     if code == 6:
-        return 0, "invert probe pin", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#6----probe-pin-invert-boolean"
+        return (
+            0,
+            "invert probe pin",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#6----probe-pin-invert-boolean",
+        )
     if code == 10:
-        return 255, "status report options", "bitmask", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#10---status-report-mask"
+        return (
+            255,
+            "status report options",
+            "bitmask",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#10---status-report-mask",
+        )
     if code == 11:
-        return 0.010, "Junction deviation", "mm", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#11---junction-deviation-mm"
+        return (
+            0.010,
+            "Junction deviation",
+            "mm",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#11---junction-deviation-mm",
+        )
     if code == 12:
-        return 0.002, "arc tolerance", "mm", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#12--arc-tolerance-mm"
+        return (
+            0.002,
+            "arc tolerance",
+            "mm",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#12--arc-tolerance-mm",
+        )
     if code == 13:
-        return 0, "Report in inches", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#13---report-inches-boolean"
+        return (
+            0,
+            "Report in inches",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#13---report-inches-boolean",
+        )
     if code == 20:
-        return 0, "Soft limits enabled", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#20---soft-limits-boolean"
+        return (
+            0,
+            "Soft limits enabled",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#20---soft-limits-boolean",
+        )
     if code == 21:
-        return 0, "hard limits enabled", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#21---hard-limits-boolean"
+        return (
+            0,
+            "hard limits enabled",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#21---hard-limits-boolean",
+        )
     if code == 22:
-        return 0, "Homing cycle enable", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#22---homing-cycle-boolean"
+        return (
+            0,
+            "Homing cycle enable",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#22---homing-cycle-boolean",
+        )
     if code == 23:
-        return 0, "Homing direction invert", "bitmask", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#23---homing-dir-invert-mask"
+        return (
+            0,
+            "Homing direction invert",
+            "bitmask",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#23---homing-dir-invert-mask",
+        )
     if code == 24:
-        return 25.000, "Homing locate feed rate", "mm/min", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#24---homing-feed-mmmin"
+        return (
+            25.000,
+            "Homing locate feed rate",
+            "mm/min",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#24---homing-feed-mmmin",
+        )
     if code == 25:
-        return 500.000, "Homing search seek rate", "mm/min", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#25---homing-seek-mmmin"
+        return (
+            500.000,
+            "Homing search seek rate",
+            "mm/min",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#25---homing-seek-mmmin",
+        )
     if code == 26:
-        return 250, "Homing switch debounce delay", "ms", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#26---homing-debounce-milliseconds"
+        return (
+            250,
+            "Homing switch debounce delay",
+            "ms",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#26---homing-debounce-milliseconds",
+        )
     if code == 27:
-        return 1.000, "Homing switch pull-off distance", "mm", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#27---homing-pull-off-mm"
+        return (
+            1.000,
+            "Homing switch pull-off distance",
+            "mm",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#27---homing-pull-off-mm",
+        )
     if code == 30:
-        return 1000, "Maximum spindle speed", "RPM", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#30---max-spindle-speed-rpm"
+        return (
+            1000,
+            "Maximum spindle speed",
+            "RPM",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#30---max-spindle-speed-rpm",
+        )
     if code == 31:
-        return 0, "Minimum spindle speed", "RPM", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#31---min-spindle-speed-rpm"
+        return (
+            0,
+            "Minimum spindle speed",
+            "RPM",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#31---min-spindle-speed-rpm",
+        )
     if code == 32:
-        return 1, "Laser mode enable", "boolean", int, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#32---laser-mode-boolean"
+        return (
+            1,
+            "Laser mode enable",
+            "boolean",
+            int,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#32---laser-mode-boolean",
+        )
     if code == 100:
-        return 250.000, "X-axis steps per millimeter", "steps", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#100-101-and-102--xyz-stepsmm"
+        return (
+            250.000,
+            "X-axis steps per millimeter",
+            "steps",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#100-101-and-102--xyz-stepsmm",
+        )
     if code == 101:
-        return 250.000, "Y-axis steps per millimeter", "steps", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#100-101-and-102--xyz-stepsmm"
+        return (
+            250.000,
+            "Y-axis steps per millimeter",
+            "steps",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#100-101-and-102--xyz-stepsmm",
+        )
     if code == 102:
-        return 250.000, "Z-axis steps per millimeter", "steps", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#100-101-and-102--xyz-stepsmm"
+        return (
+            250.000,
+            "Z-axis steps per millimeter",
+            "steps",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#100-101-and-102--xyz-stepsmm",
+        )
     if code == 110:
-        return 500.000, "X-axis max rate", "mm/min", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#110-111-and-112--xyz-max-rate-mmmin"
+        return (
+            500.000,
+            "X-axis max rate",
+            "mm/min",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#110-111-and-112--xyz-max-rate-mmmin",
+        )
     if code == 111:
-        return 500.000, "Y-axis max rate", "mm/min", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#110-111-and-112--xyz-max-rate-mmmin"
+        return (
+            500.000,
+            "Y-axis max rate",
+            "mm/min",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#110-111-and-112--xyz-max-rate-mmmin",
+        )
     if code == 112:
-        return 500.000, "Z-axis max rate", "mm/min", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#110-111-and-112--xyz-max-rate-mmmin"
+        return (
+            500.000,
+            "Z-axis max rate",
+            "mm/min",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#110-111-and-112--xyz-max-rate-mmmin",
+        )
     if code == 120:
-        return 10.000, "X-axis acceleration", "mm/s^2", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#120-121-122--xyz-acceleration-mmsec2"
+        return (
+            10.000,
+            "X-axis acceleration",
+            "mm/s^2",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#120-121-122--xyz-acceleration-mmsec2",
+        )
     if code == 121:
-        return 10.000, "Y-axis acceleration", "mm/s^2", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#120-121-122--xyz-acceleration-mmsec2"
+        return (
+            10.000,
+            "Y-axis acceleration",
+            "mm/s^2",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#120-121-122--xyz-acceleration-mmsec2",
+        )
     if code == 122:
-        return 10.000, "Z-axis acceleration", "mm/s^2", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#120-121-122--xyz-acceleration-mmsec2"
+        return (
+            10.000,
+            "Z-axis acceleration",
+            "mm/s^2",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#120-121-122--xyz-acceleration-mmsec2",
+        )
     if code == 130:
-        return 200.000, "X-axis max travel", "mm", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#130-131-132--xyz-max-travel-mm"
+        return (
+            200.000,
+            "X-axis max travel",
+            "mm",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#130-131-132--xyz-max-travel-mm",
+        )
     if code == 131:
-        return 200.000, "Y-axis max travel", "mm", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#130-131-132--xyz-max-travel-mm"
+        return (
+            200.000,
+            "Y-axis max travel",
+            "mm",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#130-131-132--xyz-max-travel-mm",
+        )
     if code == 132:
-        return 200.000, "Z-axis max travel", "mm", float, "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#130-131-132--xyz-max-travel-mm"
+        return (
+            200.000,
+            "Z-axis max travel",
+            "mm",
+            float,
+            "https://github.com/gnea/grbl/blob/master/doc/markdown/settings.md#130-131-132--xyz-max-travel-mm",
+        )
 
 
 def grbl_error_code(code):
@@ -318,10 +522,13 @@ class GrblController:
             self.connection = TCPOutput(self.service, self)
         elif self.service.permit_ws and self.service.interface == "ws":
             from meerk40t.grbl.ws_connection import WSOutput
+
             try:
                 self.connection = WSOutput(self.service, self)
             except ModuleNotFoundError:
-                response = self.service.kernel.prompt(str, "Could not open websocket-connection (websocket installed?)")
+                response = self.service.kernel.prompt(
+                    str, "Could not open websocket-connection (websocket installed?)"
+                )
         else:
             # Mock
             from .mock_connection import MockConnection
@@ -908,6 +1115,9 @@ class GrblController:
             message = response[5:-1]
             opts = list(message.split(","))
             codes = opts[0]
+            if len(opts) < 3:
+                # If there are not enough options, we assume the defaults.
+                opts.extend(["0", "0"])
             block_buffer_size = opts[1]
             rx_buffer_size = opts[2]
             self.log(f"codes: {codes}", type="event")