Merge branch '2.9' into debian_nocheck_docs

Author: andypugh

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
         set -x
         sudo apt-get install -y eatmydata
         eatmydata ./scripts/travis-install-build-deps.sh
-        eatmydata curl -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
+        eatmydata curl -L -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
         sudo eatmydata apt install ./po4a_0.67-2_all.deb
         cd src
         eatmydata ./autogen.sh
@@ -56,7 +56,7 @@ jobs:
         sudo apt-get install -y eatmydata
         eatmydata ./scripts/travis-install-build-deps.sh
         sudo eatmydata apt-get install -y clang
-        eatmydata curl -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
+        eatmydata curl -L -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
         sudo eatmydata apt install ./po4a_0.67-2_all.deb
         cd src
         eatmydata ./autogen.sh
@@ -81,7 +81,7 @@ jobs:
       run: |
         ./scripts/travis-install-build-deps.sh
         sudo apt-get install -y eatmydata
-        curl -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
+        curl -L -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
         sudo apt install ./po4a_0.67-2_all.deb
         cd src
         eatmydata ./autogen.sh

VERSION

@@ -1 +1 @@
-2.9.1
+2.9.2

configs/sim/axis/ngcgui/pyngcgui_axis.ui

@@ -9,8 +9,6 @@
       <object class="PyNgcGui" id="pyngcgui1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
         <property name="use_keyboard">False</property>
         <property name="debug">False</property>
         <property name="verbose">False</property>

configs/sim/gmoccapy/gmoccapy.ini

@@ -5,27 +5,31 @@
 # General section -------------------------------------------------------------
 [EMC]
 VERSION = 1.1
-MACHINE =               gmoccapy
-DEBUG = 0x7FFFFFFF
+MACHINE = gmoccapy
+DEBUG = 0
 
 # Sections for display options ------------------------------------------------
 [DISPLAY]
-DISPLAY = gmoccapy
-#DISPLAY = gmoccapy -logo /home/gmoccapy/Bilder/coolant_on.gif
+DISPLAY = gmoccapy -i
+# Log level:
+# DEBUG       -d
+# INFO        -i
+# VERBOSE     -v
+# ERROR       -q
 
 # Cycle time, in milliseconds, that display will sleep between polls
-CYCLE_TIME =            100
+CYCLE_TIME = 100
 
 # Values that will be allowed for override, 1.0 = 100%
-MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
+MAX_FEED_OVERRIDE    = 1.5
+MAX_SPINDLE_OVERRIDE = 1.2
 MIN_SPINDLE_OVERRIDE = 0.5
 
 # Max and default jog speeds in units per second
-MAX_LINEAR_VELOCITY =   166
+MAX_LINEAR_VELOCITY     = 166
 DEFAULT_LINEAR_VELOCITY = 100
-MAX_ANGULAR_VELOCITY = 234
-DEFAULT_SPINDLE_SPEED = 450
+MAX_ANGULAR_VELOCITY    = 234
+DEFAULT_SPINDLE_SPEED   = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/

configs/sim/gmoccapy/gmoccapy_800x600.ini

@@ -0,0 +1,207 @@
+# EMC controller parameters for a simulated machine.
+# General note: Comments can either be preceded with a # or ; - either is
+# acceptable, although # is in keeping with most linux config files.
+
+# General section -------------------------------------------------------------
+[EMC]
+VERSION = 1.1
+MACHINE = gmoccapy_800x600
+DEBUG = 0
+
+# Sections for display options ------------------------------------------------
+[DISPLAY]
+DISPLAY = gmoccapy -i
+# Log level:
+# DEBUG       -d
+# INFO        -i
+# VERBOSE     -v
+# ERROR       -q
+
+# Cycle time, in milliseconds, that display will sleep between polls
+CYCLE_TIME = 100
+
+# Values that will be allowed for override, 1.0 = 100%
+MAX_FEED_OVERRIDE    = 1.5
+MAX_SPINDLE_OVERRIDE = 1.2
+MIN_SPINDLE_OVERRIDE = 0.5
+
+# Max and default jog speeds in units per second
+MAX_LINEAR_VELOCITY     = 166
+DEFAULT_LINEAR_VELOCITY = 100
+MAX_ANGULAR_VELOCITY    = 234
+DEFAULT_SPINDLE_SPEED   = 450
+
+# Prefix to be used
+PROGRAM_PREFIX = ../../nc_files/
+
+USER_COMMAND_FILE=gmoccapy_800x600.py
+
+# Introductory graphic
+INTRO_GRAPHIC = linuxcnc.gif
+INTRO_TIME = 5
+
+# list of selectable jog increments
+INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm, 1.2345 inch
+
+# for details see nc_files/subroutines/maco_instructions.txt
+[FILTER]
+PROGRAM_EXTENSION = .png,.gif,.jpg Grayscale Depth Image
+PROGRAM_EXTENSION = .py Python Script
+png = image-to-gcode
+gif = image-to-gcode
+jpg = image-to-gcode
+py = python3
+
+# Task controller section -----------------------------------------------------
+[RS274NGC]
+RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
+PARAMETER_FILE = sim.var
+SUBROUTINE_PATH = macros
+
+# Motion control section ------------------------------------------------------
+[EMCMOT]
+EMCMOT =              motmod
+COMM_TIMEOUT =          1.0
+BASE_PERIOD  =          100000
+SERVO_PERIOD =          1000000
+
+# Hardware Abstraction Layer section --------------------------------------------------
+[TASK]
+TASK =                  milltask
+CYCLE_TIME =            0.001
+
+# Part program interpreter section --------------------------------------------
+[HAL]
+HALFILE = core_sim.hal
+HALFILE = spindle_sim.hal
+HALFILE = simulated_home.hal
+
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
+
+HALUI = halui
+
+# Trajectory planner section --------------------------------------------------
+[HALUI]
+#No Content
+
+[TRAJ]
+COORDINATES =      X Y Z 
+LINEAR_UNITS =     mm
+ANGULAR_UNITS =    degree
+DEFAULT_LINEAR_VELOCITY = 35
+MAX_LINEAR_VELOCITY = 234
+POSITION_FILE =    position.txt
+# NO_FORCE_HOMING = 1
+
+[EMCIO]
+EMCIO = 		io
+CYCLE_TIME =    0.100
+
+# tool table file
+TOOL_TABLE = tool.tbl
+TOOL_CHANGE_POSITION = 100 100 -10
+TOOL_CHANGE_QUILL_UP = 1
+
+[KINS]
+KINEMATICS = trivkins coordinates=xyz
+JOINTS = 3
+
+[AXIS_X]
+MIN_LIMIT = -400.0
+MAX_LIMIT = 400.0
+MAX_VELOCITY = 166
+MAX_ACCELERATION = 1500.0
+
+[JOINT_0]
+TYPE =                          LINEAR
+MAX_VELOCITY =                  166
+MAX_ACCELERATION =              1500.0
+BACKLASH = 0.000
+INPUT_SCALE =                   4000
+OUTPUT_SCALE = 1.000
+MIN_LIMIT =                     -400.0
+MAX_LIMIT =                     400.0
+FERROR = 0.050
+MIN_FERROR = 0.010
+HOME_OFFSET =                    0.0
+HOME =                           10
+HOME_SEARCH_VEL =                200.0
+HOME_LATCH_VEL =                 20.0
+HOME_USE_INDEX =                 NO
+HOME_IGNORE_LIMITS =             NO
+HOME_SEQUENCE = 1
+HOME_IS_SHARED = 1
+
+# Second axis
+[AXIS_Y]
+MIN_LIMIT = -400.0
+MAX_LIMIT = 400.0
+MAX_VELOCITY = 166
+MAX_ACCELERATION = 1500.0
+
+[JOINT_1]
+TYPE =                          LINEAR
+MAX_VELOCITY =                  166
+MAX_ACCELERATION =              1500.0
+BACKLASH = 0.000
+INPUT_SCALE =                   4000
+OUTPUT_SCALE = 1.000
+MIN_LIMIT =                     -400.0
+MAX_LIMIT =                     400.0
+FERROR = 0.050
+MIN_FERROR = 0.010
+HOME_OFFSET =                    0.0
+HOME =                           10
+HOME_SEARCH_VEL =                200.0
+HOME_LATCH_VEL =                 20.0
+HOME_USE_INDEX =                 NO
+HOME_IGNORE_LIMITS =             NO
+HOME_SEQUENCE = 1
+
+# Third axis
+[AXIS_Z]
+MIN_LIMIT = -400.0
+MAX_LIMIT = 0.001
+MAX_VELOCITY = 166
+MAX_ACCELERATION = 1500.0
+
+[JOINT_2]
+TYPE =                          LINEAR
+MAX_VELOCITY =                  166
+MAX_ACCELERATION =              1500.0
+BACKLASH = 0.000
+INPUT_SCALE =                   4000
+OUTPUT_SCALE = 1.000
+MIN_LIMIT =                     -400.0
+MAX_LIMIT =                     0.001
+FERROR = 0.050
+MIN_FERROR = 0.010
+HOME_OFFSET =                    1.0
+HOME =                           -10
+HOME_SEARCH_VEL =                200.0
+HOME_LATCH_VEL =                 20.0
+HOME_USE_INDEX =                 NO
+HOME_IGNORE_LIMITS =             NO
+HOME_SEQUENCE = 0
+HOME_IS_SHARED = 1
+
+# section for main IO controller parameters -----------------------------------
+[MACROS]
+MACRO = go_to_position x-pos y-pos z-pos
+MACRO = i_am_lost
+MACRO = increment x-incr y-incr
+MACRO = macro_4
+MACRO = macro_5
+MACRO = macro_6
+MACRO = macro_7
+MACRO = macro_8
+MACRO = macro_9
+MACRO = macro_10
+MACRO = macro_11
+MACRO = macro_12
+MACRO = macro_13
+MACRO = macro_14
+MACRO = macro_15
+
+

configs/sim/gmoccapy/gmoccapy_800x600.py

@@ -0,0 +1,91 @@
+from gi.repository import Pango
+
+# reduce size of v-buttons
+self.widgets["vbtb_main"].set_size_request(78, -1)
+self.widgets["lbl_time"].hide()
+self.widgets["vbtb_main"].set_layout(Gtk.ButtonBoxStyle.EXPAND)
+vbuttons = self.widgets["vbtb_main"].get_children()
+for v in vbuttons:
+    v.set_size_request(60, 56)
+
+# change layout of h-button boxes to allow smaller spacing & resize buttons
+hbuttonboxes = [ "hbtb_main", "hbtb_MDI", "hbtb_auto", "hbtb_ref",
+    "hbtb_touch_off", "hbtb_setup", "hbtb_edit", "hbtb_tool",
+    "hbtb_load_file", "hbtb_ref_joints" ]
+for b in hbuttonboxes:
+    self.widgets[b].set_layout(Gtk.ButtonBoxStyle.EXPAND)
+    children = self.widgets[b].get_children()
+    for c in children:
+        c.set_size_request(60, 56)
+        if type(c) is Gtk.Button:
+            btn_child = c.get_children()[0]
+            if type(btn_child) is Gtk.Label:
+                # btn_child.set_ellipsize(Pango.EllipsizeMode.END)
+                btn_child.set_line_wrap(True)
+                btn_child.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
+
+# optimize space in jog box
+self.widgets["vbtb_jog_incr"].hide()
+self.widgets["vbx_jog"].set_size_request(-1, -1)
+
+# second row for gremlin buttons
+self.widgets["box_gremlin_buttons"].remove(self.widgets["tbtn_view_dimension"])
+self.widgets["box_gremlin_buttons"].remove(self.widgets["tbtn_view_tool_path"])
+self.widgets["box_gremlin_buttons"].remove(self.widgets["btn_delete_view"])
+self.widgets["btn_zoom_out"].set_margin_end(0)
+hbox_gremlin_buttons_2 = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+hbox_gremlin_buttons_2.show()
+hbox_gremlin_buttons_2.pack_end(self.widgets["btn_delete_view"], False, False, 0)
+hbox_gremlin_buttons_2.pack_end(self.widgets["tbtn_view_tool_path"], False, False, 0)
+hbox_gremlin_buttons_2.pack_end(self.widgets["tbtn_view_dimension"], False, False, 0)
+self.widgets["vbox15"].pack_end(hbox_gremlin_buttons_2, False, False, 3)
+
+# reorder settings page
+self.widgets["vbox_window"].remove(self.widgets["frm_ntb_preview"]) # "On Touch off"
+self.widgets["vbox_window"].remove(self.widgets["frm_keyboard"])
+self.widgets["vbox_dro_settings"].remove(self.widgets["frm_preview"])
+self.widgets["vbox_file"].remove(self.widgets["frm_message_position"])
+self.widgets["vbox_file"].remove(self.widgets["frm_themes"])
+self.widgets["vbox21"].remove(self.widgets["frm_unlock"])
+self.widgets["vbox_window"].pack_start(self.widgets["frm_preview"], False, False, 3)
+self.widgets["vbox_dro_settings"].pack_start(self.widgets["frm_ntb_preview"], False, False, 3)
+vbox_c1 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+vbox_c2 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+hbox_setup_appearance_2 = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+hbox_setup_appearance_2.pack_start(vbox_c1, False, False, 3)
+hbox_setup_appearance_2.pack_start(vbox_c2, False, False, 3)
+hbox_setup_appearance_2.show()
+vbox_c1.pack_start(self.widgets["frm_keyboard"], False, False, 3)
+vbox_c1.pack_start(self.widgets["frm_message_position"], False, False, 3)
+vbox_c2.pack_start(self.widgets["frm_themes"], False, False, 3)
+vbox_c2.pack_start(self.widgets["frm_unlock"], False, False, 3)
+vbox_c1.show()
+vbox_c2.show()
+label = Gtk.Label(label=_("Appearance") + " 2")
+self.widgets["ntb_setup"].insert_page(hbox_setup_appearance_2, label, 1)
+
+# reorder info box (feed rate, rapid override, spindle and cooling)
+self.widgets["box_info"].remove(self.widgets["grid_search"])
+self.widgets["box_info"].remove(self.widgets["ntb_info"])
+self.widgets["ntb_info"].remove(self.widgets["hbox_main_info"])
+self.widgets["hbox_main_info"].remove(self.widgets["box_tool_and_code_info"])
+
+box_info = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+box_info.show()
+box_info.pack_start(self.widgets["box_tool_and_code_info"], False, False, 0)
+box_info.pack_end(self.widgets["hbox_main_info"], False, False, 0)
+self.widgets["ntb_user_tabs"].append_page(box_info, Gtk.Label("Info"))
+
+# enable user tab button to access info box
+self.widgets.tbtn_user_tabs.set_sensitive(True)
+self.user_tabs_enabled = True
+
+# change default values (not necessary with correct pref file)
+self.xpos = 20
+self.ypos = 20
+self.width = 770
+self.height = 580
+self.widgets.adj_x_pos.set_value(self.xpos)
+self.widgets.adj_y_pos.set_value(self.ypos)
+self.widgets.adj_width.set_value(self.width)
+self.widgets.adj_height.set_value(self.height)

configs/sim/gmoccapy/gmoccapy_800x600.txt

@@ -0,0 +1,9 @@
+GMOCCAPY configuration for a XYZ mill for screens with a resolution of 800x600.
+
+This is done with a user command file specified by
+
+USER_COMMAND_FILE=gmoccapy_800x600.py
+
+This file allows further modification.
+For more information see: https://linuxcnc.org/docs/html/gui/gmoccapy.html#_user_command_file
+

configs/sim/gmoccapy/gmoccapy_postgui.hal

@@ -1,5 +1,5 @@
 ###################################################################
-#        moccapy_postgui.hal file from Norbert Schechner          #
+#        gmoccapy_postgui.hal file from Norbert Schechner          #
 ###################################################################
 
 loadrt abs names=abs_spindle_feedback