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

meerk40t/grbl/device.py

@@ -467,6 +467,18 @@ class GRBLDevice(Service, Status):
                 "conditional": (self, "use_red_dot"),
                 "section": "_10_Red Dot",
             },
+            {
+                "attr": "use_red_dot_for_outline",
+                "object": self,
+                "default": True,
+                "type": bool,
+                "label": _("Active during Outline"),
+                "tip": _(
+                    "If active then the red dot will automatically be used if you outline the burn area"
+                ),
+                "conditional": (self, "use_red_dot"),
+                "section": "_10_Red Dot",
+            },
             {
                 "attr": "max_vector_speed",
                 "object": self,
@@ -879,7 +891,14 @@ class GRBLDevice(Service, Status):
             self("bind w +yforward")
 
         @self.console_option(
-            "strength", "s", type=int, help="Set the dot laser strength."
+            "strength", "s", type=int, help=_("Set the dot laser strength (0..1000).")
+        )
+        @self.console_option(
+            "force",
+            "f",
+            type=bool,
+            action="store_true",
+            help=_("Force the red dot command even if a job is running."),
         )
         @self.console_argument("off", type=str)
         @self.console_command(
@@ -887,40 +906,46 @@ class GRBLDevice(Service, Status):
             help=_("Turns redlight on/off"),
         )
         def red_dot_on(
-            command, channel, _, off=None, strength=None, remainder=None, **kwgs
+            command,
+            channel,
+            _,
+            off=None,
+            strength=None,
+            force=None,
+            remainder=None,
+            **kwgs,
         ):
+            if force is None:
+                force = False
             if not self.use_red_dot:
-                channel("Red Dot feature is not enabled, see config")
+                channel(_("Red Dot feature is not enabled, see config"))
                 # self.redlight_preferred = False
                 return
-            if not self.spooler.is_idle:
-                channel("Won't interfere with a running job, abort...")
+            if not force and not self.spooler.is_idle:
+                channel(_("Won't interfere with a running job, abort..."))
                 return
             if strength is not None:
                 if 0 <= strength <= 1000:
                     self.red_dot_level = strength
                     channel(
-                        f"Laser strength for red dot is now: {self.red_dot_level/10.0}%"
+                        _("Laser strength for red dot is now: {power}").format(
+                            power=f"{self.red_dot_level / 10.0:.1f}%"
+                        )
+                    )
+                else:
+                    channel(
+                        _(
+                            "Laser strength for red dot must be between 0 and 1000, not {power}"
+                        ).format(power=strength)
                     )
+                    return
             if off == "off":
-                self.driver.laser_off()
-                # self.driver.grbl("G0")
-                self.driver.move_mode = 0
-                # self.redlight_preferred = False
-                channel("Turning off redlight.")
+                self.red_dot(False)
+                channel(_("Red light is now off."))
                 self.signal("grbl_red_dot", False)
             else:
-                # self.redlight_preferred = True
-                # self.driver.set("power", int(self.red_dot_level / 100 * 1000))
-                self.driver._clean()
-                rapid_speed = self.setting(float, "rapid_speed", 600.0)
-                self.driver.laser_on(power=int(self.red_dot_level), speed=rapid_speed)
-                # By default, any move is a G0 move which will not activate the laser,
-                # so we need to switch to G1 mode:
-                self.driver.move_mode = 1
-                # An arbitrary move to turn the laser really on!
-                # self.driver.grbl("G1")
-                channel("Turning on redlight.")
+                self.red_dot(True)
+                channel(_("Red light is now on."))
                 self.signal("grbl_red_dot", True)
 
         @self.console_option(
@@ -929,12 +954,15 @@ class GRBLDevice(Service, Status):
             action="store_true",
             help=_("override one second laser fire pulse duration"),
         )
+        @self.console_option("power", "p", type=str, help=_("laser fire power"))
         @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
@@ -949,12 +977,25 @@ class GRBLDevice(Service, Status):
                         return
                 except IndexError:
                     return
-
+            if power is not None:
+                try:
+                    if power.endswith("%"):
+                        power = power[:-1]
+                        power = float(power) * 10
+                    else:
+                        power = float(power)
+                except ValueError:
+                    channel(_("Power must be valid value."))
+                    return
+                if not (0 <= power <= 1000):
+                    channel(_("Power must be between 0 and 1000."))
+                    return
+            power = 1000 if power is None else int(power)
             if self.spooler.is_idle:
-                self.driver.laser_on(power=1000, speed=1000)
+                self.driver.laser_on(power=power, speed=1000)
                 sleep(time / 1000)
                 self.driver.laser_off()
-                label = _("Pulse laser for {time}ms").format(time=time)
+                label = _("Pulse laser for {time}ms").format(time=time) + f" [{power}]"
                 channel(label)
             else:
                 channel(_("Pulse laser failed: Busy"))
@@ -1044,6 +1085,13 @@ class GRBLDevice(Service, Status):
         name = self.label.replace(" ", "-")
         return name.replace("/", "-")
 
+    @property
+    def supports_pwm(self):
+        """
+        Returns whether this device supports PWM.
+        """
+        return True
+
     def _register_console_serial(self):
         _ = self.kernel.translation
 
@@ -1169,3 +1217,31 @@ class GRBLDevice(Service, Status):
         return {
             "gantry": True,
         }
+
+    def red_dot(self, turn_on):
+        if turn_on:
+            # self.redlight_preferred = True
+            # self.driver.set("power", int(self.red_dot_level / 100 * 1000))
+            self.driver._clean()
+            rapid_speed = self.setting(float, "rapid_speed", 600.0)
+            self.driver.laser_on(power=int(self.red_dot_level), speed=rapid_speed)
+            # By default, any move is a G0 move which will not activate the laser,
+            # so we need to switch to G1 mode:
+            self.driver.move_mode = 1
+            # An arbitrary move to turn the laser really on!
+            # self.driver.grbl("G1")
+        else:
+            self.driver.laser_off()
+            # self.driver.grbl("G0")
+            self.driver.move_mode = 0
+            # self.redlight_preferred = False
+
+    def pre_outline(self):
+        if not (self.use_red_dot and self.use_red_dot_for_outline):
+            return
+        yield ("console", "red on -f")
+
+    def post_outline(self):
+        if not (self.use_red_dot and self.use_red_dot_for_outline):
+            return
+        yield ("console", "red off -f")

meerk40t/grbl/driver.py

@@ -217,7 +217,7 @@ class GRBLDriver(Parameters):
                 (old_current[0], old_current[1], new_current[0], new_current[1]),
             )
 
-    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
@@ -226,7 +226,13 @@ class GRBLDriver(Parameters):
         @param time_in_ms:
         @return:
         """
-        self.laser_on()  # This can't be sent early since these are timed operations.
+        if settings is not None and "power" in settings:
+            power = settings["power"]
+        else:
+            power = self.power
+        self.laser_on(
+            power=power
+        )  # This can't be sent early since these are timed operations.
         self.wait(time_in_ms)
         self.laser_off()
 

meerk40t/grbl/gui/grblconfiguration.py

@@ -371,3 +371,9 @@ class GRBLConfiguration(MWindow):
         else:
             # Different command
             pass
+
+    @signal_listener("activate;device")
+    def on_device_changes(self, *args):
+        # Device activated, make sure we are still fine...
+        if self.context.device.name != 'GRBLDevice':
+            wx.CallAfter(self.Close)

meerk40t/grbl/gui/grblcontroller.py

@@ -260,7 +260,7 @@ class GRBLControllerPanel(wx.Panel):
 
     def edit_macro(self, idx):
         def handler(event):
-            macro = self.macros[idx]
+            macro = str(self.macros[idx])
             dlg = wx.TextEntryDialog(
                 self, _("Content for macro {index}").format(index = idx + 1),
                 value=macro,

meerk40t/gui/about.py

@@ -1595,6 +1595,13 @@ class InformationPanel(ScrolledPanel):
         info += f"Version: {uname.version}" + "\n"
         info += f"Machine: {uname.machine}" + "\n"
         info += f"Processor: {uname.processor}" + "\n"
+        try:
+            import psutil
+            mem = psutil.virtual_memory()
+            available_mb = f"{mem.available / (1024 * 1024):.2f} MB"
+            info += f"Available memory: {available_mb}\n"
+        except ImportError:
+            pass
         info += f"Theme: {self.context.themes.theme}, Darkmode: {self.context.themes.dark}\n"
         try:
             info += f"Ip-Address: {socket.gethostbyname(socket.gethostname())}"

meerk40t/gui/choicepropertypanel.py

@@ -139,7 +139,7 @@ class ChoicePropertyPanel(ScrolledPanel):
         # we need to create an independent copy of the lookup, otherwise
         # any amendments to choices like injector will affect the original
         standardhelp = ""
-        
+
         def on_combo_text(param, ctrl, obj, dtype, addsig):
             def select(event=None):
                 v = dtype(ctrl.GetValue())
@@ -314,9 +314,7 @@ class ChoicePropertyPanel(ScrolledPanel):
                 dlg = wx.ColourDialog(self, color_data)
                 if dlg.ShowModal() == wx.ID_OK:
                     color_data = dlg.GetColourData()
-                    data = Color(
-                        swizzlecolor(color_data.GetColour().GetRGB()), 1.0
-                    )
+                    data = Color(swizzlecolor(color_data.GetColour().GetRGB()), 1.0)
                     set_color(ctrl, data)
                     try:
                         data_v = data.hexa
@@ -331,7 +329,7 @@ class ChoicePropertyPanel(ScrolledPanel):
                         pass
 
             return click
-        
+
         def on_angle_text(param, ctrl, obj, dtype, addsig):
             def text():
                 try:
@@ -407,9 +405,7 @@ class ChoicePropertyPanel(ScrolledPanel):
                         # except IndexError:
                         #    pass
 
-                    menuitem = menu.Append(
-                        wx.ID_ANY, _("Delete this entry"), ""
-                    )
+                    menuitem = menu.Append(wx.ID_ANY, _("Delete this entry"), "")
                     self.Bind(
                         wx.EVT_MENU,
                         on_delete,
@@ -431,9 +427,7 @@ class ChoicePropertyPanel(ScrolledPanel):
                         #    pass
                         fill_ctrl(ctrl, local_obj, param, columns)
 
-                    menuitem = menu.Append(
-                        wx.ID_ANY, _("Duplicate this entry"), ""
-                    )
+                    menuitem = menu.Append(wx.ID_ANY, _("Duplicate this entry"), "")
                     self.Bind(
                         wx.EVT_MENU,
                         on_duplicate,
@@ -498,7 +492,6 @@ class ChoicePropertyPanel(ScrolledPanel):
 
             return text
 
-
         for choice in choices:
             if isinstance(choice, dict):
                 if "help" not in choice:
@@ -785,7 +778,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                 wants_listener = False
                 control = wxButton(self, label=label)
 
-
                 control.Bind(
                     wx.EVT_BUTTON,
                     on_button(attr, obj, additional_signal),
@@ -799,7 +791,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                 control.SetValue(data)
                 control.SetMinSize(dip_size(self, -1, 23))
 
-
                 control.Bind(
                     wx.EVT_CHECKBOX,
                     on_checkbox_check(attr, control, obj, additional_signal),
@@ -824,7 +815,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                 control_sizer.Add(control, 1, wx.EXPAND, 0)
                 current_sizer.Add(control_sizer, expansion_flag * weight, wx.EXPAND, 0)
 
-
                 control.SetActionRoutine(
                     on_generic_multi(attr, control, obj, data_type, additional_signal)
                 )
@@ -843,7 +833,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                     #     filename = _("No File")
                     control.SetValue(filename)
 
-
                 control.SetActionRoutine(
                     on_file_text(attr, control, obj, data_type, additional_signal)
                 )
@@ -880,6 +869,10 @@ class ChoicePropertyPanel(ScrolledPanel):
                     value = int(data)
                 else:
                     value = int(data)
+                if callable(minvalue):
+                    minvalue = minvalue()
+                if callable(maxvalue):
+                    maxvalue = maxvalue()
                 control = wx.Slider(
                     self,
                     wx.ID_ANY,
@@ -889,7 +882,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                     style=wx.SL_HORIZONTAL | wx.SL_VALUE_LABEL,
                 )
 
-
                 if ctrl_width > 0:
                     control.SetMaxSize(dip_size(self, ctrl_width, -1))
                 control_sizer.Add(control, 1, wx.EXPAND, 0)
@@ -928,7 +920,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                         if least is not None:
                             control.SetValue(least)
 
-
                 if ctrl_width > 0:
                     control.SetMaxSize(dip_size(self, ctrl_width, -1))
                 control_sizer.Add(control, 1, wx.ALIGN_CENTER_VERTICAL, 0)
@@ -957,7 +948,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                     else:
                         control.SetSelection(int(data))
 
-
                 if ctrl_width > 0:
                     control.SetMaxSize(dip_size(self, ctrl_width, -1))
                 control_sizer.Add(control, 1, wx.ALIGN_CENTER_VERTICAL, 0)
@@ -979,7 +969,7 @@ class ChoicePropertyPanel(ScrolledPanel):
                         data = c.get("default")
                     display_list.insert(0, str(data))
                     choice_list.insert(0, str(data))
-                cb_style = wx.CB_DROPDOWN | wx.CB_READONLY 
+                cb_style = wx.CB_DROPDOWN | wx.CB_READONLY
                 control = wxComboBox(
                     self,
                     wx.ID_ANY,
@@ -995,7 +985,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                 # print ("Choices: %s" % choice_list)
                 # print ("To set: %s" % str(data))
 
-
                 if label != "":
                     # Try to center it vertically to the controls extent
                     wd, ht = control.GetSize()
@@ -1013,14 +1002,16 @@ class ChoicePropertyPanel(ScrolledPanel):
             elif data_type in (str, int, float) and data_style == "combosmall":
                 control_sizer = wx.BoxSizer(wx.HORIZONTAL)
                 exclusive = c.get("exclusive", True)
-                cb_style = wx.CB_DROPDOWN | wx.CB_READONLY if exclusive else wx.CB_DROPDOWN 
+                cb_style = (
+                    wx.CB_DROPDOWN | wx.CB_READONLY if exclusive else wx.CB_DROPDOWN
+                )
 
                 choice_list = list(map(str, c.get("choices", [c.get("default")])))
                 control = wxComboBox(
                     self,
                     wx.ID_ANY,
                     choices=choice_list,
-                    style = cb_style,
+                    style=cb_style,
                 )
                 # Constrain the width
                 testsize = control.GetBestSize()
@@ -1043,7 +1034,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                         if least is not None:
                             control.SetValue(least)
 
-
                 if label != "":
                     # Try to center it vertically to the controls extent
                     wd, ht = control.GetSize()
@@ -1083,7 +1073,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                 else:
                     control_sizer = wx.BoxSizer(wx.HORIZONTAL)
 
-
                 bit_sizer = wx.BoxSizer(wx.VERTICAL)
                 label_text = wxStaticText(
                     self, wx.ID_ANY, "", style=wx.ALIGN_CENTRE_HORIZONTAL
@@ -1117,7 +1106,10 @@ class ChoicePropertyPanel(ScrolledPanel):
                     control.SetValue(bool((data >> b) & 1))
                     if mask:
                         control.Enable(bool((mask_bits >> b) & 1))
-                    control.Bind(wx.EVT_CHECKBOX, on_checkbox_bitcheck(attr, control, obj, b, additional_signal), )
+                    control.Bind(
+                        wx.EVT_CHECKBOX,
+                        on_checkbox_bitcheck(attr, control, obj, b, additional_signal),
+                    )
 
                     # mask bit
                     if mask:
@@ -1177,7 +1169,8 @@ class ChoicePropertyPanel(ScrolledPanel):
                     self,
                     wx.ID_ANY,
                     style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES | wx.LC_SINGLE_SEL,
-                    context=self.context, list_name=f"list_chart_{attr}",
+                    context=self.context,
+                    list_name=f"list_chart_{attr}",
                 )
                 l_columns = c.get("columns", [])
 
@@ -1224,13 +1217,11 @@ class ChoicePropertyPanel(ScrolledPanel):
 
                 fill_ctrl(chart, obj, attr, l_columns)
 
-
                 chart.Bind(
                     wx.EVT_LIST_BEGIN_LABEL_EDIT,
                     on_chart_start(l_columns, attr, chart, obj),
                 )
 
-
                 chart.Bind(
                     wx.EVT_LIST_END_LABEL_EDIT,
                     on_chart_stop(l_columns, attr, chart, obj),
@@ -1326,7 +1317,6 @@ class ChoicePropertyPanel(ScrolledPanel):
                     control.SetMaxSize(dip_size(self, ctrl_width, -1))
                 control_sizer.Add(control, 1, wx.EXPAND, 0)
 
-
                 control.SetActionRoutine(
                     on_generic_text(attr, control, obj, data_type, additional_signal)
                 )

meerk40t/gui/devicepanel.py

@@ -243,9 +243,7 @@ class DevicePanel(wx.Panel):
         sizer_1.Add(sizer_3, 1, wx.EXPAND, 0)
         # All devices
         self.devices = []
-        # Active item in list
-        self.current_item = 0
-
+    
         self.button_create_device = wxButton(self, wx.ID_ANY, _("Create New Device"))
         sizer_3.Add(self.button_create_device, 0, 0, 0)
 
@@ -305,12 +303,16 @@ class DevicePanel(wx.Panel):
         self.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_end_edit, self.devices_list)
         # end wxGlade
 
+    @property
+    def current_item(self):
+        if self.devices_list.GetSelectedItemCount() > 0:
+            return self.devices_list.GetFirstSelected()
+        return -1
+    
     def pane_show(self, *args):
         self.refresh_device_tree()
         if len(self.devices) > 0:
             self.devices_list.Select(0, 1)
-        else:
-            self.current_item = -1
         self.enable_controls()
 
     def pane_hide(self, *args):
@@ -453,17 +455,14 @@ class DevicePanel(wx.Panel):
         return label
 
     def on_item_selected(self, event):
-        if event is None:
-            self.current_item = self.devices_list.GetFirstSelected()
-        else:
-            self.current_item = event.Index
+        if event:
             event.Skip()
         self.enable_controls()
 
     def on_item_deselected(self, event):
-        self.current_item = -1
+        if event:
+            event.Skip()
         self.enable_controls()
-        event.Skip()
 
     def enable_controls(self):
         if self.current_item < 0:
@@ -522,8 +521,9 @@ class DevicePanel(wx.Panel):
 
     def on_tree_popup_rename(self, service):
         def renameit(event=None):
+            lbl = str(service.label or "")
             with wx.TextEntryDialog(
-                None, _("What do you call this device?"), _("Device Label"), ""
+                None, _("What do you call this device?"), _("Device Label"), lbl
             ) as dlg:
                 dlg.SetValue(service.label)
                 if dlg.ShowModal() == wx.ID_OK:
@@ -608,21 +608,32 @@ class DevicePanel(wx.Panel):
         self.duplicate_device(service)
 
     def on_button_activate_device(self, event):  # wxGlade: DevicePanel.<event_handler>
+        def reselect(idx):
+            def handler():
+                if idx >= 0:
+                    self.devices_list.Select(idx, 1)
+                    self.devices_list.Focus(idx)
+
+            return handler
+        
+        idx = self.current_item
+        if idx < 0:
+            return
         service = self.get_selected_device()
         if service is not None:
             service.kernel.activate_service_path("device", service.path)
             self.recolor_device_items()
+            wx.CallLater(750, reselect(idx))    
 
     def on_button_config_device(self, event):  # wxGlade: DevicePanel.<event_handler>
-        service = self.get_selected_device()
-        if service is not None:
-            service("window toggle Configuration\n")
+        self.context("window toggle Configuration\n")
 
     def on_button_rename_device(self, event):  # wxGlade: DevicePanel.<event_handler>
         service = self.get_selected_device()
         if service is not None:
+            label = str(service.label or "")
             with wx.TextEntryDialog(
-                None, _("What do you call this device?"), _("Device Label"), ""
+                None, _("What do you call this device?"), _("Device Label"), label
             ) as dlg:
                 dlg.SetValue(service.label)
                 if dlg.ShowModal() == wx.ID_OK: