Merge remote-tracking branch 'origin/2.8' into 2.9

* origin/2.8:
  Fix obsolete link to documentation in image-to-gcode(1).
  mb2hal: fix error when PIN_NAMES > 5
  return PROGRAM NONE if no program is open
  Adjusted scripts/platform-is-supported to not fail on Debian Testing and Unstable.
  githelper.sh: New master glob
  qtvcp -cam_align panel: add window size setting option
  gmoccapy: update release notes
  gmoccapy: fixed sensitizing of user tab button (#2111)
  Fix broken download link in Gmoccapy docs
  Getting Started: Update checksums (en, es, cn)
  Add firmware 7i96d_1pwm for 7i96 for PNCconf
  docs: Bump the version number in the install docs
  Fix the changelog syntax
  gmoccapy: fix error on creating file when RS274NGC_STARTUP_CODE is not set
  gmoccapy: updated changelog
  Release v2.8.4
  pncconf: add inm and outm support plus 7i96s card
  Add preliminary 7I96S support
  hm2_eth: add support for 7i96
  Fix minor outm mistrakes
  Add OutM simple output module support

Author: SebKuzminsky

VERSION

@@ -1,2 +1 @@
 2.9.0~pre1
-

debian/changelog

@@ -113,6 +113,19 @@ linuxcnc (2.9.0~pre0+git20220224.3ba0951743-1) unstable; urgency=medium
 
  -- Sebastian Kuzminsky <seb@highlab.com>  Fri, 25 Feb 2022 18:40:12 +0100
 
+linuxcnc (1:2.8.4) buster; urgency=medium
+
+  * Add driver support for Mesa 7i96S
+  * Add pncconf support fo Mesa 7i96S
+  * calculatorwidget: increased buttons to be more touch-friendly
+  * gmoccapy: Fix jogging with max velocity (SHIFT + jog key)
+  * Czech translation for Gmoccapy
+  * gmoccapy: fix attribute error in tooltip text
+  * gmoccapy: fix "spindle speed override wasn't applied in reverse direction"
+  * docs: add note to obsolete property 'FEATURES'
+
+ -- andypugh <andy@bodgesoc.org>  Sun, 18 Sep 2022 20:33:29 +0100
+
 linuxcnc (1:2.8.3) buster; urgency=low
 
   * CraftsmanCNC: A new GUI written from scratch Intended for CNC router

docs/man/man1/image-to-gcode.1

@@ -33,7 +33,7 @@ image-to-gcode \- converts bitmap images to G-code
 brightness of each pixel as a Z-height. 
 
 Detailed docs:
-http://linuxcnc.org/docs/2.4/html/gui_image-to-gcode.html
+http://linuxcnc.org/docs/stable/html/gui/image-to-gcode.html
 
 .SH "SEE ALSO"
 \fBLinuxCNC(1)\fR

docs/man/man9/hostmot2.9

@@ -1286,7 +1286,6 @@ IONum is a three-digit number.
 The mapping from IONum to connector and pin-on-that-connector is written to the syslog when the driver loads,
 and it is documented in Mesa's manual for the Anything I/O boards.
 
-<<<<<<< HEAD
 So, for example, the HAL pin that has the current inverted input value
 read from GPIO 012 of the second 7I43 board is: hm2_7i43.1.gpio.012.in\-not
 (this assumes that the firmware in that board is configured so that this
@@ -1296,14 +1295,6 @@ The HAL parameter that controls whether the last GPIO of the first 5I22
 is an input or an output is: hm2_5i22.0.gpio.095.is_output (this assumes
 that the firmware in that board is configured so that this HAL object
 is available)
-=======
-So, for example, the HAL pin that has the current inverted input value read from GPIO 012 of the second 7I43 board is:
-hm2_7i43.1.gpio.012.in\-not
-(this assumes that the firmware in that board is configured so that this HAL object is available).
-
-The HAL parameter that controls whether the last GPIO of the first 5I22 is an input or an output is:
-hm2_5i22.0.gpio.095.is_output (this assumes that the firmware in that board is configured so that this HAL object is available).
->>>>>>> 35cc92aa0f (docs: series of smallish changes while translating)
 
 The hm2 GPIO representation is modeled after the Digital Inputs and
 Digital Outputs described in the Canonical Device Interface (part of the HAL General Reference document).
@@ -1487,7 +1478,6 @@ Each instance has between 1 and 32 output pins.
 
 Pins:
 
-
 .TP
 (bit in) out-NN
 The sets the state of this OutM instance's NNth output.
@@ -1681,7 +1671,6 @@ This updates the PWM duty cycles, stepgen rates, and GPIO outputs on the FPGA.
 Any changes to configuration pins such as stepgen timing, GPIO inversions, etc., are also effected by this function.
 .TP
 \fBhm2_\fI<BoardType>\fB.\fI<BoardNum>\fB.read_gpio\fR
-<<<<<<< HEAD
 Read the GPIO input pins.  Note that the effect of this function is a
 subset of the effect of the .read() function described above.  Normally
 only .read() is used.  The only reason to call this function is if you
@@ -1695,20 +1684,6 @@ above.  Normally only .write() is used.  The only reason to call this
 function is if you want to do GPIO things in a faster-than-servo thread.
 (This function is not available on the 7I43 due to limitations of the
 EPP bus.)
-=======
-Read the GPIO input pins.
-Note that the effect of this function is a subset of the effect of the .read() function described above.
-Normally only .read() is used.
-The only reason to call this function is if you want to do GPIO things in a faster-than-servo thread.
-(This function is not available on the 7I43 due to limitations of the EPP bus.)
-.TP
-\fBhm2_\fI<BoardType>\fB.\fI<BoardNum>\fB.write_gpio\fR
-Write the GPIO control registers and output pins.
-Note that the effect of this function is a subset of the effect of the .write() function described above.
-Normally only .write() is used.
-The only reason to call this function is if you want to do GPIO things in a faster-than-servo thread.
-(This function is not available on the 7I43 due to limitations of the EPP bus.)
->>>>>>> 35cc92aa0f (docs: series of smallish changes while translating)
 .TP
 \fBhm2_\fI<BoardType>\fB.\fI<BoardNum>\fB.trigger\-encoders\fR
 This function will only appear if the firmware contains a BiSS, Fanuc or SSI encoder module and if the firmware does not contain a hm2dpll

docs/src/getting-started/getting-linuxcnc.adoc

@@ -40,12 +40,12 @@ Image.
 
 For x86 PCs Download the Live/Install CD by clicking here:
 
-https://linuxcnc.org/iso/linuxcnc-2.8.2-buster.iso
+https://linuxcnc.org/iso/linuxcnc-2.8.4-buster.iso
 
 For the Raspberry Pi a complete SD card image is available here:
 
 https://linuxcnc.org/iso/linuxcnc-2.8.1-pi4.zip (this will auto-update
-to 2.8.2)
+to 2.8.4)
 
 This can be installed using the normal Pi
 https://www.raspberrypi.org/documentation/installation/installing-images/README.md[install process]
@@ -80,7 +80,7 @@ sudo apt-get install zsync
 * Then run this command to download the iso to your computer
 +
 ----
-zsync https://linuxcnc.org/iso/linuxcnc-2.8.2-buster.iso
+zsync https://linuxcnc.org/iso/linuxcnc-2.8.4-buster.iso
 ----
 +
 or
@@ -103,13 +103,13 @@ https://www.assembla.com/spaces/zsync-windows/documents
 . After downloading, verify the checksum of the image to ensure integrity.
 +
 ----
-md5sum linuxcnc-2.8.2-buster.iso
+md5sum linuxcnc-2.8.4-buster.iso
 ----
 +
 or
 +
 ----
-sha256sum linuxcnc-2.8.2-buster.iso
+sha256sum linuxcnc-2.8.4-buster.iso
 ----
 
 . Then compare to these checksums
@@ -145,7 +145,7 @@ used to boot a computer. The image is too large to fit on a CD.
   then use this command:
 +
 -----
-dd if=linuxcnc-2.8.2-buster.iso of=/dev/sde
+dd if=linuxcnc-2.8.4-buster.iso of=/dev/sde
 -----
 
 .Writing the image to a USB storage device in Mac OSX
@@ -345,7 +345,8 @@ sudo apt-get dist-upgrade
 sudo apt-get install linux-image-rt-amd64
 ----
 
-. Re-boot, and select the Linux 4.19.0-9-rt-amd64 kernel. This might be
+. Re-boot, and select the Linux 4.19.0-9-rt-amd64 kernel (the exact
+  kernel version might be different, look for the "-rt" suffix. This might be
   hidden in the "Advanced options for Debian Buster" sub-menu in Grub.
   When you log in, verify that `PREEMPT RT`is reported by the following
   command.

scripts/platform-is-supported

@@ -72,8 +72,13 @@ if os == 'linux':
     except ValueError as e:
         major = release
         minor = "0"
-    release_major = int(major)
-    release_minor = int(minor)
+    try:
+        release_major = int(major)
+        release_minor = int(minor)
+    except ValueError as e:
+	# Debian Unstable and Testing do not have a release number, the value is 'n/a'
+        release_major = 666
+        release_minor = 0
 
     uname = subprocess.check_output(['uname', '-r']).strip().decode()
     kernel_flavor = detect_kernel_flavor(uname)

share/qtvcp/panels/cam_align/cam_align_handler.py

@@ -54,7 +54,6 @@ def initialized__(self):
                     except Exception as e:
                         print('Error with cam_align size setting:',self.w.USEROPTIONS_[num])
 
-
                 elif 'rotincr=' in self.w.USEROPTIONS_[num]:
                     try:
                         strg = self.w.USEROPTIONS_[num].strip('rotincr=')

src/emc/usr_intf/gmoccapy/getiniinfo.py

@@ -446,7 +446,7 @@ def get_axis_2_min_limit(self):
     def get_RS274_start_code(self):
         temp = self.inifile.find("RS274NGC", "RS274NGC_STARTUP_CODE")
         if not temp:
-            return False
+            temp = ""
         return  temp
 
     def get_user_messages(self):

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -488,9 +488,6 @@ def __init__(self, argv):
         self.widgets.gcode_view.set_sensitive(False)
         self.widgets.ntb_user_tabs.remove_page(0)
 
-        if not self.get_ini_info.get_embedded_tabs()[2]:
-            self.widgets.tbtn_user_tabs.set_sensitive(False)
-
         # call the function to change the button status
         # so every thing is ready to start
         widgetlist = ["rbt_manual", "rbt_mdi", "rbt_auto", "btn_homing", "btn_touch", "btn_tool",
@@ -1810,6 +1807,8 @@ def _init_dynamic_tabs(self):
 
         tab_names, tab_locations, tab_cmd = self.get_ini_info.get_embedded_tabs()
         if not tab_names:
+            self.widgets.tbtn_user_tabs.set_sensitive( False )
+            self.user_tabs_enabled = False
             print (_("**** GMOCCAPY INFO ****"))
             print (_("**** Invalid embedded tab configuration ****"))
             print (_("**** No tabs will be added! ****"))
@@ -1864,8 +1863,10 @@ def set_up_user_tab_widgets(self, tab_locations):
             # if no ntb_user_tabs in location is given
             if "ntb_user_tabs" in tab_locations:
                 self.widgets.tbtn_user_tabs.set_sensitive( True )
+                self.user_tabs_enabled = True
             else:
                 self.widgets.tbtn_user_tabs.set_sensitive( False )
+                self.user_tabs_enabled = False
 
             if "ntb_preview" in tab_locations:
                 self.widgets.ntb_preview.set_property( "show-tabs", True )
@@ -4269,7 +4270,7 @@ def on_tbtn_edit_offsets_toggled(self, widget, data=None):
 
         widgetlist = ["ntb_jog", "rbt_mdi","rbt_auto","tbtn_setup"]
 
-        if self.widgets.tbtn_user_tabs.get_sensitive():
+        if self.user_tabs_enabled:
             widgetlist.append("tbtn_user_tabs")
         self._sensitize_widgets( widgetlist, not state )
 
@@ -5239,8 +5240,6 @@ def on_ntb_button_switch_page(self, *args):
     def on_btn_new_clicked(self, widget, data=None):
         tempfilename = os.path.join(_TEMPDIR, "temp.ngc")
         content = self.get_ini_info.get_RS274_start_code()
-        if content == None:
-            content = " "
         content += "\n\n\n\nM2"
         gcodefile = open(tempfilename, "w")
         gcodefile.write(content)

src/emc/usr_intf/gmoccapy/release_notes.txt

@@ -1,3 +1,7 @@
+- fixed sensitizing of user tab button on toggling "edit offsets" (#2111)
+- fix error on creating new G-code file when RS274NGC_STARTUP_CODE is not set
+  (#2057)
+
 ver 3.4.0
 
   New features: