nocci/open4neptune-new
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert: Remove 'group' attribute from macros

Browse source 
The 'group' attribute is not supported in all Klipper versions.
This caused: 'Option group is not valid in section gcode_macro'

Macros will appear under 'Uncategorized' in Mainsail/Fluidd
until Klipper adds official support for macro grouping.
This commit is contained in:
root 2026-03-13 11:24:10 +00:00
parent 651f4cb7eb
commit 3ac9e9fb1f
4 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
calibration/calibration_macros.cfg
View file

@ -11,7 +11,6 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATION_MENU] [gcode_macro CALIBRATION_MENU]
description: Show calibration menu with all options description: Show calibration menu with all options
group: Calibration
gcode: gcode:
RESPOND MSG="==============================================" RESPOND MSG="=============================================="
RESPOND MSG=" NEPTUNE 4 PLUS CALIBRATION SUITE" RESPOND MSG=" NEPTUNE 4 PLUS CALIBRATION SUITE"
@ -34,7 +33,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_Z_OFFSET] [gcode_macro CALIBRATE_Z_OFFSET]
description: Calibrate Z-offset using Cartographer touch description: Calibrate Z-offset using Cartographer touch
group: Calibration
gcode: gcode:
RESPOND MSG="Starting Z-Offset Calibration..." RESPOND MSG="Starting Z-Offset Calibration..."
RESPOND MSG="" RESPOND MSG=""
@ -64,7 +62,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_INPUT_SHAPER] [gcode_macro CALIBRATE_INPUT_SHAPER]
description: Measure resonance frequencies with ADXL345 description: Measure resonance frequencies with ADXL345
group: Calibration
gcode: gcode:
RESPOND MSG="Starting Input Shaper Calibration..." RESPOND MSG="Starting Input Shaper Calibration..."
RESPOND MSG="" RESPOND MSG=""
@ -87,7 +84,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_PRESSURE_ADVANCE] [gcode_macro CALIBRATE_PRESSURE_ADVANCE]
description: Calibrate Pressure Advance for optimal corners description: Calibrate Pressure Advance for optimal corners
group: Calibration
gcode: gcode:
{% set FILAMENT = params.FILAMENT|default("PLA")|upper %} {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
{% set START_PA = params.START|default(0.01)|float %} {% set START_PA = params.START|default(0.01)|float %}
@ -143,7 +139,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_FLOW_RATE] [gcode_macro CALIBRATE_FLOW_RATE]
description: Calibrate flow rate for exact wall dimensions description: Calibrate flow rate for exact wall dimensions
group: Calibration
gcode: gcode:
{% set FILAMENT = params.FILAMENT|default("PLA")|upper %} {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
@ -195,7 +190,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_TEMPERATURE] [gcode_macro CALIBRATE_TEMPERATURE]
description: Print temperature tower to find optimal temp description: Print temperature tower to find optimal temp
group: Calibration
gcode: gcode:
{% set FILAMENT = params.FILAMENT|default("PLA")|upper %} {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
{% set START_TEMP = params.START|default(195)|int %} {% set START_TEMP = params.START|default(195)|int %}
@ -240,7 +234,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_RETRACTION] [gcode_macro CALIBRATE_RETRACTION]
description: Test retraction settings to minimize stringing description: Test retraction settings to minimize stringing
group: Calibration
gcode: gcode:
{% set FILAMENT = params.FILAMENT|default("PLA")|upper %} {% set FILAMENT = params.FILAMENT|default("PLA")|upper %}
{% set HOTEND = params.HOTEND|default("ORIGINAL")|upper %} {% set HOTEND = params.HOTEND|default("ORIGINAL")|upper %}
@ -303,7 +296,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATE_BED_MESH] [gcode_macro CALIBRATE_BED_MESH]
description: Calibrate bed mesh with Cartographer description: Calibrate bed mesh with Cartographer
group: Calibration
gcode: gcode:
RESPOND MSG="Starting Bed Mesh Calibration..." RESPOND MSG="Starting Bed Mesh Calibration..."
RESPOND MSG="" RESPOND MSG=""
@ -330,7 +322,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATION_FULL] [gcode_macro CALIBRATION_FULL]
description: Run complete calibration suite (takes ~2.5 hours) description: Run complete calibration suite (takes ~2.5 hours)
group: Calibration
gcode: gcode:
RESPOND MSG="==============================================" RESPOND MSG="=============================================="
RESPOND MSG=" STARTING FULL CALIBRATION SUITE" RESPOND MSG=" STARTING FULL CALIBRATION SUITE"
@ -390,7 +381,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro CALIBRATION_QUICK] [gcode_macro CALIBRATION_QUICK]
description: Run quick calibration (Z-offset + PA + Bed Mesh, ~30 min) description: Run quick calibration (Z-offset + PA + Bed Mesh, ~30 min)
group: Calibration
gcode: gcode:
RESPOND MSG="==============================================" RESPOND MSG="=============================================="
RESPOND MSG=" STARTING QUICK CALIBRATION" RESPOND MSG=" STARTING QUICK CALIBRATION"

4
calibration/test_patterns.cfg
View file

@ -9,7 +9,6 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro PA_TEST_PATTERN] [gcode_macro PA_TEST_PATTERN]
description: Print Pressure Advance test pattern description: Print Pressure Advance test pattern
group: Calibration
gcode: gcode:
{% set START_PA = params.START|default(0.01)|float %} {% set START_PA = params.START|default(0.01)|float %}
{% set END_PA = params.END|default(0.05)|float %} {% set END_PA = params.END|default(0.05)|float %}
@ -67,7 +66,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro FLOW_TEST_CUBE] [gcode_macro FLOW_TEST_CUBE]
description: Print flow rate calibration cube description: Print flow rate calibration cube
group: Calibration
gcode: gcode:
{% set START_FLOW = params.START|default(0.90)|float %} {% set START_FLOW = params.START|default(0.90)|float %}
{% set END_FLOW = params.END|default(1.10)|float %} {% set END_FLOW = params.END|default(1.10)|float %}
@ -137,7 +135,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro RETRACT_TEST_PATTERN] [gcode_macro RETRACT_TEST_PATTERN]
description: Print retraction test pattern description: Print retraction test pattern
group: Calibration
gcode: gcode:
{% set START_RETRACT = params.START|default(1.0)|float %} {% set START_RETRACT = params.START|default(1.0)|float %}
{% set END_RETRACT = params.END|default(4.0)|float %} {% set END_RETRACT = params.END|default(4.0)|float %}
@ -213,7 +210,6 @@ gcode:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
[gcode_macro TEMP_TOWER] [gcode_macro TEMP_TOWER]
description: Print temperature tower description: Print temperature tower
group: Calibration
gcode: gcode:
{% set START_TEMP = params.START|default(195)|int %} {% set START_TEMP = params.START|default(195)|int %}
{% set END_TEMP = params.END|default(225)|int %} {% set END_TEMP = params.END|default(225)|int %}

6
optimized_user_settings.cfg
View file

@ -79,7 +79,6 @@ runout_gcode:
# ============================================================================ # ============================================================================
[gcode_macro PRINT_START] [gcode_macro PRINT_START]
group: Printing
gcode: gcode:
#--- Setup & Reset --- #--- Setup & Reset ---
M117 Setting up parameters... M117 Setting up parameters...
@ -134,7 +133,6 @@ gcode:
# ============================================================================ # ============================================================================
[gcode_macro PRINT_END] [gcode_macro PRINT_END]
group: Printing
gcode: gcode:
M117 Finishing print... M117 Finishing print...
RESPOND MSG="Print completed! Finishing up..." RESPOND MSG="Print completed! Finishing up..."
@ -165,7 +163,6 @@ gcode:
[gcode_macro QUICK_TOUCH] [gcode_macro QUICK_TOUCH]
description: Quick Z measurement with Cartographer description: Quick Z measurement with Cartographer
group: Calibration
gcode: gcode:
{% if printer.toolhead.homed_axes != "xyz" %} {% if printer.toolhead.homed_axes != "xyz" %}
G28 G28
@ -175,7 +172,6 @@ gcode:
[gcode_macro CALIBRATE_PROBE] [gcode_macro CALIBRATE_PROBE]
description: Manual Z-offset calibration description: Manual Z-offset calibration
group: Calibration
gcode: gcode:
{% if printer.toolhead.homed_axes != "xyz" %} {% if printer.toolhead.homed_axes != "xyz" %}
G28 G28
@ -184,12 +180,10 @@ gcode:
CARTOGRAPHER_CALIBRATE CARTOGRAPHER_CALIBRATE
[gcode_macro BABYZ_PLUS] [gcode_macro BABYZ_PLUS]
group: Helpers
gcode: gcode:
SET_GCODE_OFFSET Z_ADJUST=0.005 MOVE=1 SET_GCODE_OFFSET Z_ADJUST=0.005 MOVE=1
[gcode_macro BABYZ_MINUS] [gcode_macro BABYZ_MINUS]
group: Helpers
gcode: gcode:
SET_GCODE_OFFSET Z_ADJUST=-0.005 MOVE=1 SET_GCODE_OFFSET Z_ADJUST=-0.005 MOVE=1

6
user_settings_clean.cfg
View file

@ -79,7 +79,6 @@ runout_gcode:
# ============================================================================ # ============================================================================
[gcode_macro PRINT_START] [gcode_macro PRINT_START]
group: Printing
gcode: gcode:
#--- Setup & Reset --- #--- Setup & Reset ---
M117 Setting up parameters... M117 Setting up parameters...
@ -134,7 +133,6 @@ gcode:
# ============================================================================ # ============================================================================
[gcode_macro PRINT_END] [gcode_macro PRINT_END]
group: Printing
gcode: gcode:
M117 Finishing print... M117 Finishing print...
RESPOND MSG="Print completed! Finishing up..." RESPOND MSG="Print completed! Finishing up..."
@ -165,7 +163,6 @@ gcode:
[gcode_macro QUICK_TOUCH] [gcode_macro QUICK_TOUCH]
description: Quick Z measurement with Cartographer description: Quick Z measurement with Cartographer
group: Calibration
gcode: gcode:
{% if printer.toolhead.homed_axes != "xyz" %} {% if printer.toolhead.homed_axes != "xyz" %}
G28 G28
@ -175,7 +172,6 @@ gcode:
[gcode_macro CALIBRATE_PROBE] [gcode_macro CALIBRATE_PROBE]
description: Manual Z-offset calibration description: Manual Z-offset calibration
group: Calibration
gcode: gcode:
{% if printer.toolhead.homed_axes != "xyz" %} {% if printer.toolhead.homed_axes != "xyz" %}
G28 G28
@ -184,12 +180,10 @@ gcode:
CARTOGRAPHER_CALIBRATE CARTOGRAPHER_CALIBRATE
[gcode_macro BABYZ_PLUS] [gcode_macro BABYZ_PLUS]
group: Helpers
gcode: gcode:
SET_GCODE_OFFSET Z_ADJUST=0.005 MOVE=1 SET_GCODE_OFFSET Z_ADJUST=0.005 MOVE=1
[gcode_macro BABYZ_MINUS] [gcode_macro BABYZ_MINUS]
group: Helpers
gcode: gcode:
SET_GCODE_OFFSET Z_ADJUST=-0.005 MOVE=1 SET_GCODE_OFFSET Z_ADJUST=-0.005 MOVE=1