Fewer top level categories

Grbl_Esp32/src/MachineYAML/3axis_rs485.yaml

@@ -30,7 +30,8 @@ homing:
     - x
     - xy
 probe: gpio.14
-reset: gpio.27:low
+control:
-feed-hold: gpio.26:low
+  reset: gpio.27:low
-cycle-start: gpio.25:low
+  feed-hold: gpio.26:low
+  cycle-start: gpio.25:low
 

Grbl_Esp32/src/MachineYAML/3axis_v3.yaml

@@ -23,10 +23,12 @@ spindle:
   pwm:
     output: gpio.17
     enable: gpio.22
-mist: gpio.21
+coolant:
-flood: gpio.16
+  mist: gpio.21
+  flood: gpio.16
 probe: gpio.32
-door: gpio.35:low
+control:
-reset: gpio.34:low
+  door: gpio.35:low
-feed-hold: gpio.36:low
+  reset: gpio.34:low
-cycle-start: gpio.39:low
+  feed-hold: gpio.36:low
+  cycle-start: gpio.39:low

Grbl_Esp32/src/MachineYAML/3axis_v4.yaml

@@ -1,6 +1,6 @@
 ---
 name: esp32_v4
-board:bdring-3axis-v4
+board: bdring-3axis-v4
 defaults:
   steppers:
     disable: gpio.13
@@ -23,6 +23,7 @@ spindle:
   pwm:
     output: gpio.2
     enable: gpio.22
-mist: gpio.21
+coolant:
-flood: gpio.25
+  mist: gpio.21
+  flood: gpio.25
 probe: gpio.32

Grbl_Esp32/src/MachineYAML/3axis_xyz.yaml

@@ -22,10 +22,12 @@ spindle:
   pwm:
     output: gpio.2
     enable: gpio.22
-mist: gpio.21
+coolant:
-flood: gpio.25
+  mist: gpio.21
+  flood: gpio.25
 probe: gpio.32
-door: gpio.35:low
+control:
-reset: gpio.34:low
+  door: gpio.35:low
-feed-hold: gpio.36:low
+  reset: gpio.34:low
-cycle-start: gpio.39:low
+  feed-hold: gpio.36:low
+  cycle-start: gpio.39:low

Grbl_Esp32/src/MachineYAML/atari_1020.yaml

@@ -5,6 +5,19 @@ defaults:
     idle: 200
 custom:
   filename: Custom/atari_1020.cpp
+  solenoid:
+    direction: gpio.4
+    pen: gpio.2
+    pwm-frequency: 5000
+    pwm-bits: 8
+    pulse-len: 255
+    pulse-hold: 40
+    duration: 50
+    task-frequency: 50
+  pens: 4
+  pen-change-bumps: 3
+  tool-change-z: 5.0
+  reed-switch: gpio.17
 x:
   unipolar:
     phase0: gpio.13
@@ -30,36 +43,18 @@ z:
   max-rate: 200000
   acceleration: 500
   max-travel: 10
-solenoid:
-  direction: gpio.4
-  pen: gpio.2
-  pwm-frequency: 5000
-  pwm-bits: 8
-  pulse-len: 255
-  pulse-hold: 40
-  duration: 50
-  task-frequency: 50
 
-pens: 4
-pen-change-bumps: 3
-tool-change-z: 5.0
-use-m30: on
-
-reed-switch: gpio.17
 macro:
-  button0: gpio.34
+  - gpio.34
-  button1: gpio.35
+  - gpio.35
-  button2: gpio.36
+  - gpio.36
 homing:
   feed-rate: 3000
   seek-rate: 3000
   delay: 250
   pulloff: 2.0
 
-junction-deviation: 0.01
+gcode:
-arc-tolerance: 0.002
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
 report-status-mask: 1
-
-invert-limit-pins: on
-
-    

Grbl_Esp32/src/MachineYAML/coolant_test.yaml

@@ -1,4 +1,5 @@
 ---
 name: Coolant Test
-mist: gpio.21
+coolant:
-flood: gpio.25
+  mist: gpio.21
+  flood: gpio.25

Grbl_Esp32/src/MachineYAML/esp32_printer_controller.yaml

@@ -6,19 +6,19 @@ custom:
 defaults:
   steppers:
     pulse: 4
-i2s0:
+  gpio:
+    debounce: 250
+    
+i2so:
   bits: 16
   stream: on
   bck: gpio.22
   ws: gpio.17
   data: gpio.21
 
-debounce: 100
-
 homing:
   feed-rate: 200
   seek-rate: 1000
-  debounce: 250
   pulloff: 3
   cycles:
     - x

Grbl_Esp32/src/MachineYAML/espduino.yaml

@@ -20,11 +20,11 @@ spindle:
   pwm:
     output: gpio.19
     direction: gpio.18
-
+coolant:
-mist: gpio.36
+  mist: gpio.36
-flood: gpio.34
+  flood: gpio.34
 probe: gpio.39
-
+control:
-reset: gpio.2:low
+  reset: gpio.2:low
-feed-hold: gpio.4:low
+  feed-hold: gpio.4:low
-cycle-start: gpio.35:low
+  cycle-start: gpio.35:low

Grbl_Esp32/src/MachineYAML/lowrider_v1p2_pwm.yaml

@@ -4,6 +4,9 @@ board: bdring-lowrider-v1p2
 defaults:
   steppers:
     disable: gpio.13
+  gpio:
+    debounce: 100
+
 x:
   limit: gpio.15:low
   stepstick:
@@ -31,9 +34,9 @@ spindle:
   pwm:
     output: gpio.16
     enable: gpio.32
-debounce: on
 
 probe: gpio.35
-reset: gpio.34
+control:
-feed-hold: gpio.36
+  reset: gpio.34
-cycle-start: gpio.39
+  feed-hold: gpio.36
+  cycle-start: gpio.39

Grbl_Esp32/src/MachineYAML/lowrider_v1p2_relay.yaml

@@ -4,6 +4,8 @@ board: bdring-lowrider-v1p2
 defaults:
   steppers:
     disable: gpio.13
+  debounce: 100
+
 x:
   limit: gpio.15:low
   stepstick:
@@ -30,9 +32,8 @@ z2:
 spindle:
   relay:
     output: gpio.2
-debounce: on
+control:
-
+  probe: gpio.35
-probe: gpio.35
+  reset: gpio.34
-reset: gpio.34
+  feed-hold: gpio.36
-feed-hold: gpio.36
+  cycle-start: gpio.39
-cycle-start: gpio.39

Grbl_Esp32/src/MachineYAML/midtbot.yaml

@@ -6,6 +6,8 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 x:
   limit: gpio.2:low
   stepstick:
@@ -38,10 +40,10 @@ homing:
     - x
   feed-rate: 200
   seek-rate: 1000
-  debounce: 250
   pulloff: 3
-
+report:
-status-report-mask: 1
+  status-mask: 1
-junction-deviation: 0.01
+  inches: off
-arc-tolerance: 0.002
+gcode:
-report-inches: 0
+  junction-deviation: 0.01
+  arc-tolerance: 0.002

Grbl_Esp32/src/MachineYAML/mpcnc_laser_module_v1p2.yaml

@@ -6,9 +6,12 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 100
+
 custom:
   filename: Custom/mpcnc_laser_module.cpp
-level-shift: gpio.32
+  level-shift: gpio.32
 homing:
   squared: xy
 x:
@@ -52,16 +55,16 @@ spindle:
     rpm-min: 0.0
 
 mist: gpio.2
-debounce: on
 
 probe: gpio.35
-
+control:
-reset: gpio.34,low
+  reset: gpio.34,low
-feed-hold: gpio.36,low
+  feed-hold: gpio.36,low
-cycle-start: gpio.39,low
+  cycle-start: gpio.39,low
-
+report:
-status-report-mask: 1
+  status-mask: 1
-junction_deviation: 0.01
+  inches: off
-arc-tolerance: 0.002
+gcode:
-report-inches: 0
+  junction-deviation: 0.01
-laser-mode: off
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/mpcnc_v1p1.yaml

@@ -6,11 +6,12 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 homing:
   squared: xy
   feed-rate: 100
   seek-rate: 200
-  debounce: 250
   pulloff: 2
 x:
   limit: gpio.2,low
@@ -58,12 +59,14 @@ spindle:
 
 probe: gpio.35
 
-reset: gpio.34,low
+control:
-feed-hold: gpio.36,low
+  reset: gpio.34,low
-cycle-start: gpio.39,low
+  feed-hold: gpio.36,low
-
+  cycle-start: gpio.39,low
-status-report-mask: 1
+report:
-junction_deviation: 0.01
+  status-mask: 1
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
-laser-mode: off
+  junction_deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/mpcnc_v1p1_relay.yaml

@@ -6,11 +6,12 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 homing:
   squared: xy
   feed-rate: 100
   seek-rate: 200
-  debounce: 250
   pulloff: 2
 x:
   limit: gpio.2,low
@@ -56,12 +57,14 @@ spindle:
     rpm-max: 1
 probe: gpio.35
 
-reset: gpio.34,low
+control:
-feed-hold: gpio.36,low
+  reset: gpio.34,low
-cycle-start: gpio.39,low
+  feed-hold: gpio.36,low
-
+  cycle-start: gpio.39,low
-status-report-mask: 1
+report:
-junction_deviation: 0.01
+  status-mask: 1
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
-laser-mode: off
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/mpcnc_v1p2.yaml

@@ -6,11 +6,12 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 homing:
   squared: xy
   feed-rate: 100
   seek-rate: 200
-  debounce: 250
   pulloff: 2
 x:
   limit: gpio.17,low
@@ -55,17 +56,17 @@ spindle:
     enable: gpio.32
     rpm-min: 0
     rpm-max: 1000
-
-debounce: on
-
 probe: gpio.35
 
-reset: gpio.34,low
+control:
-feed-hold: gpio.36,low
+  reset: gpio.34,low
-cycle-start: gpio.39,low
+  feed-hold: gpio.36,low
+  cycle-start: gpio.39,low
 
-status-report-mask: 1
+report:
-junction_deviation: 0.01
+  status-mask: 1
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
-laser-mode: off
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/mpcnc_v1p2_relay.yaml

@@ -6,11 +6,12 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 homing:
   squared: xy
   feed-rate: 100
   seek-rate: 200
-  debounce: 250
   pulloff: 2
 x:
   limit: gpio.17,low
@@ -55,16 +56,17 @@ spindle:
     rpm-min: 0
     rpm-max: 1
 
-debounce: on
-
 probe: gpio.35
 
-reset: gpio.34,low
+control:
-feed-hold: gpio.36,low
+  reset: gpio.34,low
-cycle-start: gpio.39,low
+  feed-hold: gpio.36,low
+  cycle-start: gpio.39,low
 
-status-report-mask: 1
+report:
-junction_deviation: 0.01
+  status-mask: 1
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
-laser-mode: off
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/pen_laser_v1.yaml

@@ -6,10 +6,11 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 homing:
   feed-rate: 200
   seek-rate: 1000
-  debounce: 250
   pulloff: 3
 x:
   limit: gpio.2:low
@@ -40,8 +41,10 @@ z:
   travel: 100
 probe: gpio.35
 
-status-report-mask: 1
+report:
-junction_deviation: 0.01
+  status-mask: 1
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
-laser-mode: off
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/pen_laser_v2.yaml

@@ -6,10 +6,11 @@ defaults:
     disable: gpio.13
     pulse: 3
     idle: never
+  gpio:
+    debounce: 250
 homing:
   feed-rate: 200
   seek-rate: 1000
-  debounce: 250
   pulloff: 3
 x:
   limit: gpio.15:low
@@ -40,8 +41,10 @@ z:
   travel: 100
 probe: gpio.35
 
-status-report-mask: 1
+report:
-junction_deviation: 0.01
+  status-mask: 1
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
-laser-mode: off
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/polar_coaster.yaml

@@ -6,17 +6,17 @@ defaults:
     disable: gpio.17
     pulse: 3
     idle: never
+  gpio:
+    debounce: 100
 custom:
   filename: Custom/polar_coaster.cpp
   radius-axis: 0
   polar-axis: 1
   segment-length: 0.5
   forward-kinematics: on
-m30: on
 homing:
   feed-rate: 200
   seek-rate: 1000
-  debounce: 250
   pulloff: 3
 x:
   limit: gpio.4:low
@@ -43,14 +43,15 @@ z:
   acceleration: 50
   travel: 100
 
-debounce: on
-    period: 100
 macro:
-  button0: gpio.13:low
+  - gpio.13:low
-  button1: gpio.12:low
+  - gpio.12:low
-  button2: gpio.14:low
+  - gpio.14:low
 
-status-report-mask: 2
+report:
-junction_deviation: 0.01
+  status-mask: 2
-arc-tolerance: 0.002
+  inches: off
-report-inches: 0
+gcode:
+  junction-deviation: 0.01
+  arc-tolerance: 0.002
+  laser-mode: off

Grbl_Esp32/src/MachineYAML/tapster3.yaml

@@ -49,19 +49,18 @@ z:
   acceleration: 200
   max-travel: 3.14159265
   mpos: 1.57079632675
-user-digital0:
+user-digital:
-  pin: gpio.25
+  - pin: gpio.25
-user-digital1:
+  - pin: gpio.26
-  pin: gpio.26
+  - pin: gpio.27
-user-digital2:
+user-analog:
-  pin: gpio.27
+  - analog-pin:
-user-analog0:
+      frequency: 50
-  pin: gpio.2
+      pin: gpio.2
-  frequency: 50
+  - analog-pin:
-user-analog1:
+      frequency: 50
-  pin: gpio.15
+      pin: gpio.15
-  frequency: 50
+  - analog-pin:
-user-analog2:
+      frequency: 50
-  pin: gpio.16
+      pin: gpio.16
-  frequency: 50
 status-report-mask: 1