From e8e96ff113ba4abc9e05bdadab159bdf32e50e95 Mon Sep 17 00:00:00 2001 From: Mitch Bradley Date: Tue, 3 Nov 2020 09:32:15 -1000 Subject: [PATCH] Fewer top level categories --- Grbl_Esp32/src/MachineYAML/3axis_rs485.yaml | 7 +-- Grbl_Esp32/src/MachineYAML/3axis_v3.yaml | 14 +++--- Grbl_Esp32/src/MachineYAML/3axis_v4.yaml | 7 +-- Grbl_Esp32/src/MachineYAML/3axis_xyz.yaml | 14 +++--- Grbl_Esp32/src/MachineYAML/atari_1020.yaml | 43 ++++++++----------- Grbl_Esp32/src/MachineYAML/coolant_test.yaml | 5 ++- .../MachineYAML/esp32_printer_controller.yaml | 8 ++-- Grbl_Esp32/src/MachineYAML/espduino.yaml | 14 +++--- .../src/MachineYAML/lowrider_v1p2_pwm.yaml | 11 +++-- .../src/MachineYAML/lowrider_v1p2_relay.yaml | 13 +++--- Grbl_Esp32/src/MachineYAML/midtbot.yaml | 14 +++--- .../MachineYAML/mpcnc_laser_module_v1p2.yaml | 27 ++++++------ Grbl_Esp32/src/MachineYAML/mpcnc_v1p1.yaml | 23 +++++----- .../src/MachineYAML/mpcnc_v1p1_relay.yaml | 23 +++++----- Grbl_Esp32/src/MachineYAML/mpcnc_v1p2.yaml | 25 +++++------ .../src/MachineYAML/mpcnc_v1p2_relay.yaml | 24 ++++++----- Grbl_Esp32/src/MachineYAML/pen_laser_v1.yaml | 15 ++++--- Grbl_Esp32/src/MachineYAML/pen_laser_v2.yaml | 15 ++++--- Grbl_Esp32/src/MachineYAML/polar_coaster.yaml | 23 +++++----- Grbl_Esp32/src/MachineYAML/tapster3.yaml | 29 ++++++------- 20 files changed, 190 insertions(+), 164 deletions(-) diff --git a/Grbl_Esp32/src/MachineYAML/3axis_rs485.yaml b/Grbl_Esp32/src/MachineYAML/3axis_rs485.yaml index c7499a5d..8407f217 100644 --- a/Grbl_Esp32/src/MachineYAML/3axis_rs485.yaml +++ b/Grbl_Esp32/src/MachineYAML/3axis_rs485.yaml @@ -30,7 +30,8 @@ homing: - x - xy probe: gpio.14 -reset: gpio.27:low -feed-hold: gpio.26:low -cycle-start: gpio.25:low +control: + reset: gpio.27:low + feed-hold: gpio.26:low + cycle-start: gpio.25:low diff --git a/Grbl_Esp32/src/MachineYAML/3axis_v3.yaml b/Grbl_Esp32/src/MachineYAML/3axis_v3.yaml index 8b770536..d4a6c889 100644 --- a/Grbl_Esp32/src/MachineYAML/3axis_v3.yaml +++ b/Grbl_Esp32/src/MachineYAML/3axis_v3.yaml @@ -23,10 +23,12 @@ spindle: pwm: output: gpio.17 enable: gpio.22 -mist: gpio.21 -flood: gpio.16 +coolant: + mist: gpio.21 + flood: gpio.16 probe: gpio.32 -door: gpio.35:low -reset: gpio.34:low -feed-hold: gpio.36:low -cycle-start: gpio.39:low +control: + door: gpio.35:low + reset: gpio.34:low + feed-hold: gpio.36:low + cycle-start: gpio.39:low diff --git a/Grbl_Esp32/src/MachineYAML/3axis_v4.yaml b/Grbl_Esp32/src/MachineYAML/3axis_v4.yaml index 620b2b51..0f164044 100644 --- a/Grbl_Esp32/src/MachineYAML/3axis_v4.yaml +++ b/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 -flood: gpio.25 +coolant: + mist: gpio.21 + flood: gpio.25 probe: gpio.32 diff --git a/Grbl_Esp32/src/MachineYAML/3axis_xyz.yaml b/Grbl_Esp32/src/MachineYAML/3axis_xyz.yaml index 1d00b09c..be110df1 100644 --- a/Grbl_Esp32/src/MachineYAML/3axis_xyz.yaml +++ b/Grbl_Esp32/src/MachineYAML/3axis_xyz.yaml @@ -22,10 +22,12 @@ spindle: pwm: output: gpio.2 enable: gpio.22 -mist: gpio.21 -flood: gpio.25 +coolant: + mist: gpio.21 + flood: gpio.25 probe: gpio.32 -door: gpio.35:low -reset: gpio.34:low -feed-hold: gpio.36:low -cycle-start: gpio.39:low +control: + door: gpio.35:low + reset: gpio.34:low + feed-hold: gpio.36:low + cycle-start: gpio.39:low diff --git a/Grbl_Esp32/src/MachineYAML/atari_1020.yaml b/Grbl_Esp32/src/MachineYAML/atari_1020.yaml index cd6d5b7a..09433b06 100644 --- a/Grbl_Esp32/src/MachineYAML/atari_1020.yaml +++ b/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 - button1: gpio.35 - button2: gpio.36 + - gpio.34 + - gpio.35 + - gpio.36 homing: feed-rate: 3000 seek-rate: 3000 delay: 250 pulloff: 2.0 -junction-deviation: 0.01 -arc-tolerance: 0.002 +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 report-status-mask: 1 - -invert-limit-pins: on - - diff --git a/Grbl_Esp32/src/MachineYAML/coolant_test.yaml b/Grbl_Esp32/src/MachineYAML/coolant_test.yaml index 3bf2d79c..807cc5b8 100644 --- a/Grbl_Esp32/src/MachineYAML/coolant_test.yaml +++ b/Grbl_Esp32/src/MachineYAML/coolant_test.yaml @@ -1,4 +1,5 @@ --- name: Coolant Test -mist: gpio.21 -flood: gpio.25 +coolant: + mist: gpio.21 + flood: gpio.25 diff --git a/Grbl_Esp32/src/MachineYAML/esp32_printer_controller.yaml b/Grbl_Esp32/src/MachineYAML/esp32_printer_controller.yaml index 36f67df8..c9421f55 100644 --- a/Grbl_Esp32/src/MachineYAML/esp32_printer_controller.yaml +++ b/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 diff --git a/Grbl_Esp32/src/MachineYAML/espduino.yaml b/Grbl_Esp32/src/MachineYAML/espduino.yaml index 8ab82bab..33c3de8e 100644 --- a/Grbl_Esp32/src/MachineYAML/espduino.yaml +++ b/Grbl_Esp32/src/MachineYAML/espduino.yaml @@ -20,11 +20,11 @@ spindle: pwm: output: gpio.19 direction: gpio.18 - -mist: gpio.36 -flood: gpio.34 +coolant: + mist: gpio.36 + flood: gpio.34 probe: gpio.39 - -reset: gpio.2:low -feed-hold: gpio.4:low -cycle-start: gpio.35:low +control: + reset: gpio.2:low + feed-hold: gpio.4:low + cycle-start: gpio.35:low diff --git a/Grbl_Esp32/src/MachineYAML/lowrider_v1p2_pwm.yaml b/Grbl_Esp32/src/MachineYAML/lowrider_v1p2_pwm.yaml index cc63b7ff..3c543800 100644 --- a/Grbl_Esp32/src/MachineYAML/lowrider_v1p2_pwm.yaml +++ b/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 -feed-hold: gpio.36 -cycle-start: gpio.39 +control: + reset: gpio.34 + feed-hold: gpio.36 + cycle-start: gpio.39 diff --git a/Grbl_Esp32/src/MachineYAML/lowrider_v1p2_relay.yaml b/Grbl_Esp32/src/MachineYAML/lowrider_v1p2_relay.yaml index 5caae1c6..b25391bd 100644 --- a/Grbl_Esp32/src/MachineYAML/lowrider_v1p2_relay.yaml +++ b/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 - -probe: gpio.35 -reset: gpio.34 -feed-hold: gpio.36 -cycle-start: gpio.39 +control: + probe: gpio.35 + reset: gpio.34 + feed-hold: gpio.36 + cycle-start: gpio.39 diff --git a/Grbl_Esp32/src/MachineYAML/midtbot.yaml b/Grbl_Esp32/src/MachineYAML/midtbot.yaml index 0736abf4..4f773317 100644 --- a/Grbl_Esp32/src/MachineYAML/midtbot.yaml +++ b/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 - -status-report-mask: 1 -junction-deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 diff --git a/Grbl_Esp32/src/MachineYAML/mpcnc_laser_module_v1p2.yaml b/Grbl_Esp32/src/MachineYAML/mpcnc_laser_module_v1p2.yaml index 69cb17fd..ac2b02be 100644 --- a/Grbl_Esp32/src/MachineYAML/mpcnc_laser_module_v1p2.yaml +++ b/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 - -reset: gpio.34,low -feed-hold: gpio.36,low -cycle-start: gpio.39,low - -status-report-mask: 1 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +control: + reset: gpio.34,low + feed-hold: gpio.36,low + cycle-start: gpio.39,low +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p1.yaml b/Grbl_Esp32/src/MachineYAML/mpcnc_v1p1.yaml index 93854132..4cf75e0b 100644 --- a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p1.yaml +++ b/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 -feed-hold: gpio.36,low -cycle-start: gpio.39,low - -status-report-mask: 1 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +control: + reset: gpio.34,low + feed-hold: gpio.36,low + cycle-start: gpio.39,low +report: + status-mask: 1 + inches: off +gcode: + junction_deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p1_relay.yaml b/Grbl_Esp32/src/MachineYAML/mpcnc_v1p1_relay.yaml index 7b4a2164..a6a658cb 100644 --- a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p1_relay.yaml +++ b/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 -feed-hold: gpio.36,low -cycle-start: gpio.39,low - -status-report-mask: 1 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +control: + reset: gpio.34,low + feed-hold: gpio.36,low + cycle-start: gpio.39,low +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p2.yaml b/Grbl_Esp32/src/MachineYAML/mpcnc_v1p2.yaml index 9249f5cc..ecb0bdb8 100644 --- a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p2.yaml +++ b/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 -feed-hold: gpio.36,low -cycle-start: gpio.39,low +control: + reset: gpio.34,low + feed-hold: gpio.36,low + cycle-start: gpio.39,low -status-report-mask: 1 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p2_relay.yaml b/Grbl_Esp32/src/MachineYAML/mpcnc_v1p2_relay.yaml index 0e81db2f..07ceb1f8 100644 --- a/Grbl_Esp32/src/MachineYAML/mpcnc_v1p2_relay.yaml +++ b/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 -feed-hold: gpio.36,low -cycle-start: gpio.39,low +control: + reset: gpio.34,low + feed-hold: gpio.36,low + cycle-start: gpio.39,low -status-report-mask: 1 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/pen_laser_v1.yaml b/Grbl_Esp32/src/MachineYAML/pen_laser_v1.yaml index 72706a6d..1f00c339 100644 --- a/Grbl_Esp32/src/MachineYAML/pen_laser_v1.yaml +++ b/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 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/pen_laser_v2.yaml b/Grbl_Esp32/src/MachineYAML/pen_laser_v2.yaml index 0565f0ff..a8e00f8d 100644 --- a/Grbl_Esp32/src/MachineYAML/pen_laser_v2.yaml +++ b/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 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 -laser-mode: off +report: + status-mask: 1 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/polar_coaster.yaml b/Grbl_Esp32/src/MachineYAML/polar_coaster.yaml index 813a55ce..064aaca3 100644 --- a/Grbl_Esp32/src/MachineYAML/polar_coaster.yaml +++ b/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 - button1: gpio.12:low - button2: gpio.14:low + - gpio.13:low + - gpio.12:low + - gpio.14:low -status-report-mask: 2 -junction_deviation: 0.01 -arc-tolerance: 0.002 -report-inches: 0 +report: + status-mask: 2 + inches: off +gcode: + junction-deviation: 0.01 + arc-tolerance: 0.002 + laser-mode: off diff --git a/Grbl_Esp32/src/MachineYAML/tapster3.yaml b/Grbl_Esp32/src/MachineYAML/tapster3.yaml index 887b9602..59f22598 100644 --- a/Grbl_Esp32/src/MachineYAML/tapster3.yaml +++ b/Grbl_Esp32/src/MachineYAML/tapster3.yaml @@ -49,19 +49,18 @@ z: acceleration: 200 max-travel: 3.14159265 mpos: 1.57079632675 -user-digital0: - pin: gpio.25 -user-digital1: - pin: gpio.26 -user-digital2: - pin: gpio.27 -user-analog0: - pin: gpio.2 - frequency: 50 -user-analog1: - pin: gpio.15 - frequency: 50 -user-analog2: - pin: gpio.16 - frequency: 50 +user-digital: + - pin: gpio.25 + - pin: gpio.26 + - pin: gpio.27 +user-analog: + - analog-pin: + frequency: 50 + pin: gpio.2 + - analog-pin: + frequency: 50 + pin: gpio.15 + - analog-pin: + frequency: 50 + pin: gpio.16 status-report-mask: 1