gmoccapy: change SPINDLE => SPINDLE_0 in *.ini files

hansu · hansu · commit a09e1344b63e · 2026-01-27T21:45:52.000+01:00
diff --git a/configs/sim/gmoccapy/6_axis.ini b/configs/sim/gmoccapy/6_axis.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_6_axis
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,11 @@ GEOMETRY = XYZABC
 
 # 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/7_axis.ini b/configs/sim/gmoccapy/7_axis.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_7_axis
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,11 @@ GEOMETRY = XYZABCUVW
 
 # 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/7_axis_tool.ini b/configs/sim/gmoccapy/7_axis_tool.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_7_axis_tool
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,11 @@ GEOMETRY = XYZABCUVW
 
 # 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_8_axis
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,11 @@ GEOMETRY = XYZABCUVW
 
 # 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/9_axis.ini b/configs/sim/gmoccapy/9_axis.ini
@@ -15,10 +15,11 @@ GEOMETRY = XYZABCUVW
 
 # 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/gmoccapy.ini b/configs/sim/gmoccapy/gmoccapy.ini
@@ -38,7 +38,7 @@ MAX_FEED_OVERRIDE    = 1.5
 MIN_SPINDLE_0_OVERRIDE = 0.5
 MAX_SPINDLE_0_OVERRIDE = 1.2
 
-# Spindel start speed
+# Spindle start speed
 DEFAULT_SPINDLE_0_SPEED = 450
 # Scaling of spindle speed bar
 MIN_SPINDLE_0_SPEED     = 0
diff --git a/configs/sim/gmoccapy/gmoccapy_4_axis.ini b/configs/sim/gmoccapy/gmoccapy_4_axis.ini
@@ -13,8 +13,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_800x600.ini b/configs/sim/gmoccapy/gmoccapy_800x600.ini
@@ -22,14 +22,16 @@ 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_SPINDLE_0_OVERRIDE = 1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # 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/
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
@@ -35,8 +35,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
@@ -26,8 +26,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
@@ -9,7 +9,7 @@
 [EMC]
 
 VERSION = 1.1
-MACHINE =               gmoccapy XYZAB
+MACHINE =               gmoccapy XYZCW
 DEBUG = 0
 #DEBUG =               0x7FFFFFFF
 
@@ -22,8 +22,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
@@ -22,14 +22,16 @@ 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # 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/
diff --git a/configs/sim/gmoccapy/gmoccapy_left_panel.ini b/configs/sim/gmoccapy/gmoccapy_left_panel.ini
@@ -22,8 +22,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_messages.ini b/configs/sim/gmoccapy/gmoccapy_messages.ini
@@ -18,8 +18,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_pedant.ini b/configs/sim/gmoccapy/gmoccapy_pedant.ini
@@ -22,8 +22,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = /home/emcmesa/linuxcnc/nc_files
diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
@@ -50,14 +50,16 @@ 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # 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/
diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui_gcmc.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui_gcmc.ini
@@ -62,14 +62,16 @@ 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_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # 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
 
 # Introductory graphic
 INTRO_GRAPHIC = linuxcnc.gif
diff --git a/configs/sim/gmoccapy/gmoccapy_qt_messages.ini b/configs/sim/gmoccapy/gmoccapy_qt_messages.ini
@@ -22,14 +22,16 @@ 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_SPINDLE_0_OVERRIDE = 1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # 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/
diff --git a/configs/sim/gmoccapy/gmoccapy_right_panel.ini b/configs/sim/gmoccapy/gmoccapy_right_panel.ini
@@ -18,8 +18,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
@@ -25,8 +25,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
@@ -30,10 +30,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
 
-DEFAULT_SPINDLE_SPEED = 450
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
@@ -42,8 +42,11 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Start value for spindle speed
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/src/emc/usr_intf/pncconf/build_INI.py b/src/emc/usr_intf/pncconf/build_INI.py
