Merge f91fb44367 into 83a48aabe3

scripts/addons/cam/operators/preset_ops.py

@@ -161,13 +161,13 @@ class AddPresetCamMachine(AddPresetBase, Operator):
         "d.spindle_min",
         "d.spindle_max",
         "d.spindle_default",
-        "d.axis4",
-        "d.axis5",
+        "d.axis_4",
+        "d.axis_5",
         "d.collet_size",
         "d.output_tool_change",
         "d.output_block_numbers",
         "d.output_tool_definitions",
-        "d.output_g43_on_tool_change",
+        "d.output_G43_on_tool_change",
     ]
 
     preset_subdir = "cam_machines"

scripts/addons/cam/presets/cam_machines/emc_test_2.py

@@ -13,6 +13,6 @@ d.feedrate_default = 1.5
 d.spindle_min = 5000.0
 d.spindle_max = 25000.0
 d.spindle_default = 20000.0
-d.axis4 = False
-d.axis5 = False
+d.axis_4 = False
+d.axis_5 = False
 d.collet_size = 0.0

scripts/addons/cam/presets/cam_machines/kk1000s.py

@@ -13,6 +13,6 @@ d.feedrate_default = 1.5
 d.spindle_min = 5000.0
 d.spindle_max = 25000.0
 d.spindle_default = 20000.0
-d.axis4 = False
-d.axis5 = False
+d.axis_4 = False
+d.axis_5 = False
 d.collet_size = 0.0