Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport / egalize main/develop #512

Merged
merged 4 commits into from
Feb 29, 2024
Merged

backport / egalize main/develop #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeb4916
Merge pull request #452 from Frix-x/develop
Frix-x Feb 27, 2024
658e024
fixed missing adaptive primeline variable
Frix-x Feb 28, 2024
5e78581
remplaced CANCEL_PRINT by PARK in the automated error management gcode
Frix-x Feb 28, 2024
9cf27c3
fixed typo in LDO Nitehawk manufacturer template
Frix-x Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/machine.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on_error_gcode:
{% if printer["gcode_macro _USER_VARIABLES"].probe_type_enabled == "dockable" %}
_PROBE_ON_ERROR_ACTION
{% endif %}
CANCEL_PRINT
PARK

[idle_timeout]
timeout: 1800
Expand Down
2 changes: 1 addition & 1 deletion config/mcu_definitions/toolhead/LDO_Nitehawk-SB_v1.0.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aliases:

MCU_HEAT=gpio9 , MCU_HEAT_CHAMBER=gpio28 , MCU_NH_TEMP=gpio26 ,

MCU_RGB=gpio17 , MCU_ACTIVITY_LED=gpio8 ,
MCU_RGB=gpio7 , MCU_ACTIVITY_LED=gpio8 ,

MCU_ADXL_CS=gpio21 , MCU_ADXL_SCK=gpio18 , MCU_ADXL_MOSI=gpio20 , MCU_ADXL_MISO=gpio19 ,

Expand Down
2 changes: 0 additions & 2 deletions macros/base/park.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ gcode:
G92 E0
G1 E-{E} F2100
{% endif %}
{% else %}
RESPOND MSG="no extruder retraction because extruder temperature ({printer.extruder.temperature}) is lower than min_extrude_temp ({printer.configfile.config.extruder.min_extrude_temp})"
{% endif %}

G90
Expand Down
1 change: 1 addition & 0 deletions macros/base/start_print.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ variable_material: "XXX"
variable_fl_size: "0_0_0_0"
variable_bed_mesh_profile: ""
variable_total_layer: 0
variable_adaptive_primeline: 1
gcode:
# Get all the parameters passed from the slicer
{% set BED_TEMP = params.BED_TEMP|default(printer["gcode_macro _USER_VARIABLES"].print_default_bed_temp)|float %} # Bed temperature
Expand Down
Loading