Touchy: Move macros to the common [MACROS] INI section rather than [TOUCHY]

Signed-off-by: andypugh <andy@bodgesoc.org>

Author: andypugh

configs/sim/touchy/gladevcp/gladevcp_touchy.ini

@@ -160,7 +160,6 @@ HOME_USE_INDEX =                 NO
 HOME_IGNORE_LIMITS =             NO
 HOME_SEQUENCE = 0
 
-# section for main IO controller parameters -----------------------------------
-[TOUCHY]
+[MACROS]
 MACRO=increment xinc yinc
 MACRO=probe-hole maxradius

configs/sim/touchy/gladevcp/touchy.ini

@@ -156,7 +156,6 @@ HOME_USE_INDEX =                 NO
 HOME_IGNORE_LIMITS =             NO
 HOME_SEQUENCE = 0
 
-# section for main IO controller parameters -----------------------------------
-[TOUCHY]
+[MACROS]
 MACRO=increment xinc yinc
 MACRO=probe-hole maxradius

configs/sim/touchy/ngcgui/pyngcgui_touchy.ini

@@ -146,7 +146,7 @@ HOME_USE_INDEX =                 NO
 HOME_IGNORE_LIMITS =             NO
 HOME_SEQUENCE = 0
 
-[TOUCHY]
+[MACROS]
 MACRO=increment xinc yinc
 MACRO=probe-hole maxradius
 

configs/sim/touchy/ngcgui/pyngcgui_touchy_moveoff.ini

@@ -148,7 +148,7 @@ HOME_USE_INDEX =                 NO
 HOME_IGNORE_LIMITS =             NO
 HOME_SEQUENCE = 0
 
-[TOUCHY]
+[MACROS]
 MACRO=increment xinc yinc
 MACRO=probe-hole maxradius
 

configs/sim/touchy/touchy.ini

@@ -1,5 +1,5 @@
 # EMC controller parameters for a simulated machine.
-[TOUCHY]
+[MACROS]
 MACRO=increment xinc yinc
 MACRO=probe-hole maxradius
 

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

@@ -200,66 +200,8 @@ correspondingly needs to change from `libcanterp.so` to `canterp.so`.
 
 
 
-== Updating Configuration Files (for 2.9.y)
-
-No changes should be necessary to configuration files when moving from 2.8.x to 2.9.y.
-
-=== Spindle limits in the INI
-
-It is now possible to add settings to the [SPINDLE] section of the INI file
-
-MAX_FORWARD_VELOCITY = 20000 The maximum spindle speed (in RPM)
-
-MIN_FORWARD_VELOCITY = 3000 The minimum spindle speed (in RPM)
-
-MAX_REVERSE_VELOCITY = 20000 This setting will default to
-MAX_FORWARD_VELOCITY if omitted.
-
-MIN_REVERSE_VELOCITY = 3000` This setting is equivalent to
-MIN_FORWARD_VELOCITY but for reverse spindle rotation.
-It will default to the MIN_FORWARD_VELOCITY if omitted.
-
-INCREMENT = 200 Sets the step size for spindle speed increment / decrement commands.
-This can have a different value for each spindle.
-This setting is effective with AXIS and Touchy but note that some
-control screens may handle things differently.
-
-HOME_SEARCH_VELOCITY = 100 - Accepted but currently does nothing
-
-HOME_SEQUENCE = 0 - Accepted but currently does nothing
-
-== New HAL components
-
-=== Non-Realtime
-mdro
-mqtt-publisher
-pi500_vfd
-pmx485-test
-qtplasmac-materials
-sim-torch
-svd-ps_vfd
-
-=== Realtime
-anglejog
-div2
-enum
-filter_kalman
-flipflop
-hal_parport
-homecomp
-limit_axis
-mesa_uart
-millturn
-scaled_s32_sums
-tof
-ton
-
-== New Drivers
-
-A framework for controlling ModBus devices using the serial ports on
-many Mesa cards has been introduced.
-http://linuxcnc.org/docs/2.9/html/drivers/mesa_modbus.html
-
-A new GPIO driver for any GPIO which is supported by the gpiod library is now included:
-http://linuxcnc.org/docs/2.9/html/drivers/hal_gpio.html
+== Updating Configuration Files (for 2.10.y)
 
+Touchy: the Touchy MACRO entries should now be placed in a [MACROS]
+section of the INI rather than in the [TOUCHY] section. This is part of
+a process of commonising the INI setting between GUIs. 

docs/src/gui/touchy.adoc

@@ -102,7 +102,7 @@ All other font sizes can be changed on the Preferences tab.
 === Macros
 
 Touchy can invoke O-word macros using the MDI interface.  To configure
-this, in the '[TOUCHY]' section of the INI file, add one or more 'MACRO'
+this, in the '[MACROS]' section of the INI file, add one or more 'MACRO'
 lines.  Each should be of the following format:
 
 [source,{ini}]

src/emc/usr_intf/touchy/touchy.py

@@ -190,7 +190,18 @@ def __init__(self, inifile):
                 self.mdi_control = mdi.mdi_control(Gtk, linuxcnc, mdi_labels, mdi_eventboxes)
 
                 if self.ini:
-                    macros = self.ini.findall("TOUCHY", "MACRO")
+                    # Instruct user to update config
+                    if self.ini.findall("TOUCHY", "MACRO"):
+                        dialog = Gtk.MessageDialog(
+                                 message_type=Gtk.MessageType.WARNING,
+                                 buttons=Gtk.ButtonsType.OK,
+                                 text="MACRO entries found in [TOUCHY] section of INI")
+                        dialog.format_secondary_text(
+                                 "in LinuxCNC 2.10.n and later these now need to be in the [MACROS] section")
+                        response = dialog.run()
+                        dialog.destroy()
+
+                    macros = self.ini.findall("MACROS", "MACRO")
                     if len(macros) > 0:
                         self.mdi_control.mdi.add_macros(macros)
                     else: