From 4e67885db4904975b837543cd3b2663da3d22fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Fri, 9 Feb 2024 18:57:47 +0100 Subject: [PATCH 1/7] misc improvements on homing and feedrate --- _gcode/G000-G001.md | 2 +- _gcode/G028.md | 2 +- _gcode/G034-zsaa.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_gcode/G000-G001.md b/_gcode/G000-G001.md index 4d97939a43..2dd7bf1a7f 100644 --- a/_gcode/G000-G001.md +++ b/_gcode/G000-G001.md @@ -51,7 +51,7 @@ parameters: - tag: F optional: true - description: The maximum movement rate of the move between the start and end point. The feedrate set here applies to subsequent moves that omit this parameter. + description: The maximum movement rate (in mm/min) of the move between the start and end point. The feedrate set here applies to subsequent moves that omit this parameter. values: - tag: rate type: float diff --git a/_gcode/G028.md b/_gcode/G028.md index 6aebb184d7..57d75eb300 100644 --- a/_gcode/G028.md +++ b/_gcode/G028.md @@ -6,7 +6,7 @@ author: thinkyhead group: calibration -codes: [ G28 ] +codes: [ G28, G34 ] notes: | - Homing is required before [`G29`](/docs/gcode/G029.html), [`M48`](/docs/gcode/M048.html), and some other procedures. diff --git a/_gcode/G034-zsaa.md b/_gcode/G034-zsaa.md index 00f6a11c09..f60aa910c3 100644 --- a/_gcode/G034-zsaa.md +++ b/_gcode/G034-zsaa.md @@ -9,7 +9,7 @@ experimental: true group: calibration codes: [ G34 ] -related: [ M422, M906, M907 ] +related: [ G28, M422, M906, M907 ] parameters: @@ -38,4 +38,4 @@ example: --- -Align multiple Z stepper motors using a bed probe by probing one position per stepper. See [`M422`](/docs/gcode/M422.html) for Z-Stepper automatic alignment parameter selection. +Align multiple Z stepper motors using a bed probe by probing one position per stepper. See [`M422`](/docs/gcode/M422.html) for Z-Stepper automatic alignment parameter selection. `G28` is done beforehand and is implicit. From c722f1558657c0521cd9f43885b573fb67bf84f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Fri, 9 Feb 2024 20:32:12 +0100 Subject: [PATCH 2/7] more on G34 --- _gcode/G034-zsaa.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_gcode/G034-zsaa.md b/_gcode/G034-zsaa.md index f60aa910c3..666c21a06d 100644 --- a/_gcode/G034-zsaa.md +++ b/_gcode/G034-zsaa.md @@ -38,4 +38,4 @@ example: --- -Align multiple Z stepper motors using a bed probe by probing one position per stepper. See [`M422`](/docs/gcode/M422.html) for Z-Stepper automatic alignment parameter selection. `G28` is done beforehand and is implicit. +Align multiple Z stepper motors using a bed probe by probing one position per stepper. See [`M422`](/docs/gcode/M422.html) for Z-Stepper automatic alignment parameter selection. `G28` is done beforehand and is implicit. Also see `HOME_AFTER_G34` in `Configuration_adv.h` From 3b558bba4aca184e700d2d58b907791a87718c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Sat, 10 Feb 2024 09:14:10 +0100 Subject: [PATCH 3/7] G34 in related --- _gcode/G028.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_gcode/G028.md b/_gcode/G028.md index 57d75eb300..7e91b27543 100644 --- a/_gcode/G028.md +++ b/_gcode/G028.md @@ -6,7 +6,8 @@ author: thinkyhead group: calibration -codes: [ G28, G34 ] +codes: [ G28 ] +related: [ G34 ] notes: | - Homing is required before [`G29`](/docs/gcode/G029.html), [`M48`](/docs/gcode/M048.html), and some other procedures. From 2f1ba9cd32a70d2239eb6ec024d45895129d01ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Sat, 9 Mar 2024 10:38:44 +0100 Subject: [PATCH 4/7] changes for pygcode automatic class generation see https://github.com/petaflot/pygcode/blob/master/src/pygcode/tools/marlin_parse_MarlinDocumentation.py --- _gcode/G034-zsaa.md | 2 +- _gcode/M043-T.md | 2 +- _gcode/M043.md | 2 +- _gcode/M193.md | 4 ++-- _gcode/M200.md | 2 +- _gcode/M407.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_gcode/G034-zsaa.md b/_gcode/G034-zsaa.md index 666c21a06d..eef80ac0a6 100644 --- a/_gcode/G034-zsaa.md +++ b/_gcode/G034-zsaa.md @@ -38,4 +38,4 @@ example: --- -Align multiple Z stepper motors using a bed probe by probing one position per stepper. See [`M422`](/docs/gcode/M422.html) for Z-Stepper automatic alignment parameter selection. `G28` is done beforehand and is implicit. Also see `HOME_AFTER_G34` in `Configuration_adv.h` +Align multiple Z stepper motors using a bed probe by probing one position per stepper. See [`M422`](/docs/gcode/M422.html) for Z-Stepper automatic alignment parameter selection. Also see `HOME_AFTER_G34` in `Configuration_adv.h` diff --git a/_gcode/M043-T.md b/_gcode/M043-T.md index c429f22a61..da9c6bcc3a 100644 --- a/_gcode/M043-T.md +++ b/_gcode/M043-T.md @@ -1,7 +1,7 @@ --- tag: m0043b title: Toggle Pins -brief: Get information about pins. +brief: Toggle pins states author: thinkyhead contrib: TwoRedCells diff --git a/_gcode/M043.md b/_gcode/M043.md index 3827a238f7..ca1648226f 100644 --- a/_gcode/M043.md +++ b/_gcode/M043.md @@ -1,7 +1,7 @@ --- tag: m0043 title: Debug Pins -brief: Get information about pins. +brief: Get information about pins ; set/get pins states author: thinkyhead experimental: true diff --git a/_gcode/M193.md b/_gcode/M193.md index b51e138095..a2a656647e 100644 --- a/_gcode/M193.md +++ b/_gcode/M193.md @@ -1,7 +1,7 @@ --- tag: m0193 -title: Set Laser Cooler Temperature -brief: Set a new target laser coolant temperature. +title: Wait For Laser Cooler Temperature +brief: Set a new target laser coolant temperature and wait until it is equal to or below the target. author: descipher group: thermal diff --git a/_gcode/M200.md b/_gcode/M200.md index 33e198738e..e4009d13bc 100644 --- a/_gcode/M200.md +++ b/_gcode/M200.md @@ -1,6 +1,6 @@ --- tag: m0200 -title: Set Filament Diameter +title: Set Filament Diameter Volumetric Extrusion brief: Set the diameter for volumetric extrusion. author: thinkyhead diff --git a/_gcode/M407.md b/_gcode/M407.md index 7f2453cc72..5f26e5ab01 100644 --- a/_gcode/M407.md +++ b/_gcode/M407.md @@ -1,6 +1,6 @@ --- tag: m0407 -title: Filament Width +title: Report Filament Width brief: Report the measured filament width author: thinkyhead From bfb114365c8d6e180d0e376fb477112d3b3aace3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Sat, 9 Mar 2024 14:13:30 +0100 Subject: [PATCH 5/7] fixed some command for better class names in pygcode see https://github.com/petaflot/pygcode/blob/master/src/pygcode/gcodes_marlin.py --- _gcode/G005.md | 4 ++-- _gcode/M031.md | 2 +- _gcode/M149.md | 2 +- _gcode/M207.md | 4 ++-- _gcode/M208.md | 4 ++-- _gcode/M906.md | 2 +- _gcode/M907.md | 2 +- _gcode/M909.md | 2 +- _gcode/T-mmu2.md | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/_gcode/G005.md b/_gcode/G005.md index 9157690076..0527cd1735 100644 --- a/_gcode/G005.md +++ b/_gcode/G005.md @@ -1,7 +1,7 @@ --- tag: g005 -title: Bézier cubic spline -brief: Cubic B-spline with XYE destination and IJPQ offsets +title: Bezier Cubic Spline +brief: Cubic Bézier spline with XYE destination and IJPQ offsets author: thinkyhead experimental: true diff --git a/_gcode/M031.md b/_gcode/M031.md index 0777645828..f7ced62cab 100644 --- a/_gcode/M031.md +++ b/_gcode/M031.md @@ -1,6 +1,6 @@ --- tag: m0031 -title: Print time +title: Report Print Time brief: Report the current print time. author: thinkyhead diff --git a/_gcode/M149.md b/_gcode/M149.md index ea91b4eeed..25704aeadf 100644 --- a/_gcode/M149.md +++ b/_gcode/M149.md @@ -1,7 +1,7 @@ --- tag: m0149 title: Set Temperature Units -brief: Set temperature units to Celsius, Fahrenheit, or Kelvin. +brief: Set/get temperature units to Celsius, Fahrenheit, or Kelvin. author: thinkyhead requires: TEMPERATURE_UNITS_SUPPORT diff --git a/_gcode/M207.md b/_gcode/M207.md index b649b1f10f..0f7f12de3e 100644 --- a/_gcode/M207.md +++ b/_gcode/M207.md @@ -1,7 +1,7 @@ --- tag: m0207 -title: Set Firmware Retraction -brief: Set options for firmware-based retraction. +title: Firmware Retraction Settings +brief: Set/get options for firmware-based retraction. author: thinkyhead requires: FWRETRACT diff --git a/_gcode/M208.md b/_gcode/M208.md index f54ad0bf72..19b4a2088e 100644 --- a/_gcode/M208.md +++ b/_gcode/M208.md @@ -1,7 +1,7 @@ --- tag: m0208 -title: Firmware Recover -brief: Firmware-retraction recover settings. +title: Firmware Recover Settings +brief: Set/get firmware-retraction recover settings. author: thinkyhead requires: FWRETRACT diff --git a/_gcode/M906.md b/_gcode/M906.md index 800b6470f5..46117caf90 100644 --- a/_gcode/M906.md +++ b/_gcode/M906.md @@ -1,6 +1,6 @@ --- tag: m0906 -title: Stepper Motor Current +title: Trinamic Stepper Motor Current brief: Set the motor current (in milliamps) author: thinkyhead diff --git a/_gcode/M907.md b/_gcode/M907.md index bf57c4cc51..84b3d126c5 100644 --- a/_gcode/M907.md +++ b/_gcode/M907.md @@ -1,6 +1,6 @@ --- tag: m0907 -title: Set Motor Current +title: Trimpot Stepper Motor Current brief: Set motor current via digital trimpot author: thinkyhead diff --git a/_gcode/M909.md b/_gcode/M909.md index 5ff3aafe63..bdd699ad23 100644 --- a/_gcode/M909.md +++ b/_gcode/M909.md @@ -1,6 +1,6 @@ --- tag: m0909 -title: DAC Print Values +title: Report DAC Stepper Current brief: Report DAC current values to host author: thinkyhead diff --git a/_gcode/T-mmu2.md b/_gcode/T-mmu2.md index 417853dbf0..e5011b1ae4 100644 --- a/_gcode/T-mmu2.md +++ b/_gcode/T-mmu2.md @@ -25,7 +25,7 @@ examples: - Tc --- -For the MMU2 and clones the `T0`-`T7` commands select a new filament. After this command you must extrude at least 38.1 mm of filament at feedrate 19.02 mm/s to reach the extruder. (The distance to the extruder may differ for your particular machine.) +For the MMU2 and other Multi Material Unit clones the `T0`-`T7` commands select a new filament. After this command you must extrude at least 38.1 mm of filament at feedrate 19.02 mm/s to reach the extruder. (The distance to the extruder may differ for your particular machine.) #### Special Commands From 914b4b51a4599720ebcc11a38bd44880047ecbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Mon, 3 Jun 2024 23:27:48 +0200 Subject: [PATCH 6/7] M205 fix --- _gcode/M205.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_gcode/M205.md b/_gcode/M205.md index bd853edc85..4a5da67609 100644 --- a/_gcode/M205.md +++ b/_gcode/M205.md @@ -16,21 +16,21 @@ parameters: - tag: X optional: true - description: X max jerk (units/s) + description: X max jerk (units/s) (requires `CLASSIC_JERK`) values: - tag: jerk type: float - tag: Y optional: true - description: Y max jerk (units/s) + description: Y max jerk (units/s) (requires `CLASSIC_JERK`) values: - tag: jerk type: float - tag: Z optional: true - description: Z max jerk (units/s) + description: Z max jerk (units/s) (requires `CLASSIC_JERK`) values: - tag: jerk type: float @@ -65,7 +65,7 @@ parameters: - tag: J optional: true - description: Junction deviation (requires `JUNCTION_DEVIATION`) + description: Junction deviation (requires `JUNCTION_DEVIATION_MM`) values: - tag: deviation type: float From 4f6b1377e6246d7466019a136aba6fdef6e8929e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesus=20Zen=20Dro=C3=AFd?= Date: Mon, 3 Jun 2024 23:28:09 +0200 Subject: [PATCH 7/7] M600 added ref to Configuration_adv.h --- _gcode/M600.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_gcode/M600.md b/_gcode/M600.md index 6f05c4078b..36619d80b2 100644 --- a/_gcode/M600.md +++ b/_gcode/M600.md @@ -83,7 +83,7 @@ parameters: examples: -- pre: With no parameters [`M600`](/docs/gcode/M600.html) uses the settings in `Configuration.h`. +- pre: With no parameters [`M600`](/docs/gcode/M600.html) uses the settings in `Configuration.h` and `Configuration_adv.h`. code: M600 ; execute filament change - pre: 'To set the change position:'