reijii/Macros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

фикс инсталера, и изменение нагрева экструдера в прехите

Browse Source
This commit is contained in:
Reijii
2025-05-07 01:37:33 +03:00
parent 14d16ff37e
commit d9568a33a3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Scripts/start_stop.cfg
View File

@@ -57,6 +57,8 @@ gcode:
M117 Heating Extruder... M117 Heating Extruder...
RESPOND MSG="Heating Extruder..." RESPOND MSG="Heating Extruder..."
M109 S{params.EXTRUDER_TEMP|default(printer.extruder.target, true) } M109 S{params.EXTRUDER_TEMP|default(printer.extruder.target, true) }
# M190 S{params.BED_TEMP|default(printer.heater_bed.target, true) } #возможно потребуется чтоб стол догревался
# Run the user created "AFTER_HEATING_EXTRUDER" macro. # Run the user created "AFTER_HEATING_EXTRUDER" macro.
_USER_START_PRINT_AFTER_HEATING_EXTRUDER _USER_START_PRINT_AFTER_HEATING_EXTRUDER
# Run the customizable "AFTER_HEATING_EXTRUDER" macro. # Run the customizable "AFTER_HEATING_EXTRUDER" macro.
@@ -93,7 +95,8 @@ gcode:
# Wait for extruder to reach a predefined preheat temp so an inductive probe (if present) is at a predictable temp. # Wait for extruder to reach a predefined preheat temp so an inductive probe (if present) is at a predictable temp.
# Also allows the bed heat to spread a little, and softens any plastic that might be stuck to the nozzle. # Also allows the bed heat to spread a little, and softens any plastic that might be stuck to the nozzle.
M104 S{min_temp} M104 S{min_temp}
TEMPERATURE_WAIT SENSOR=extruder MINIMUM={min_temp} MAXIMUM={max_temp} #TEMPERATURE_WAIT SENSOR=extruder MINIMUM={min_temp} MAXIMUM={max_temp}
# выключил ожидание температуры, для теста
{% endif %} {% endif %}
{% if printer["gcode_macro RatOS"].z_tilt_enabled|lower == 'true' %} {% if printer["gcode_macro RatOS"].z_tilt_enabled|lower == 'true' %}
{% set TARGET_TEMP = printer.heater_bed.target %} {% set TARGET_TEMP = printer.heater_bed.target %}
@@ -110,13 +113,11 @@ gcode:
{% endif %} {% endif %}
Z_TILT_ADJUST horizontal_move_z=2 Z_TILT_ADJUST horizontal_move_z=2
RESTORE_GCODE_STATE NAME=STATE_Z_TILT RESTORE_GCODE_STATE NAME=STATE_Z_TILT
M190 S{TARGET_TEMP}
M117 Rehoming Z after Z tilt adjustment... M117 Rehoming Z after Z tilt adjustment...
RESPOND MSG="Rehoming Z after Z tilt adjustment..." RESPOND MSG="Rehoming Z after Z tilt adjustment..."
# Home again as Z will have changed after tilt adjustment and bed heating. # Home again as Z will have changed after tilt adjustment and bed heating.
G28 Z G28 Z
M140 S{TARGET_TEMP}
{% endif %} {% endif %}
@@ -144,9 +145,10 @@ gcode:
M140 S0 M140 S0
{% endif %} {% endif %}
{% if printer["gcode_macro RatOS"].touch_cart_enabled|lower == 'true' %} {% if printer["gcode_macro RatOS"].touch_cart_enabled|lower == 'true' %}
M109 S{min_temp}
CARTOGRAPHER_TOUCH FUZZY = {printer["gcode_macro RatOS"].touch_cart_fuzzy} ; Perform touch probe CARTOGRAPHER_TOUCH FUZZY = {printer["gcode_macro RatOS"].touch_cart_fuzzy} ; Perform touch probe
{% endif %} {% endif %}
M190 S{TARGET_TEMP} M140 S{TARGET_TEMP}
{% elif printer["gcode_macro RatOS"].bed_mesh_profile is defined %} {% elif printer["gcode_macro RatOS"].bed_mesh_profile is defined %}
BED_MESH_CLEAR BED_MESH_CLEAR
BED_MESH_PROFILE LOAD={printer["gcode_macro RatOS"].bed_mesh_profile} BED_MESH_PROFILE LOAD={printer["gcode_macro RatOS"].bed_mesh_profile}

4
macros_installer.sh
View File

@@ -56,8 +56,8 @@ install_backup() {
echo "name: $NAME" echo "name: $NAME"
TOKEN=$(whiptail --inputbox "Please enter printer token" 10 100 3>&1 1>&2 2>&3) TOKEN=$(whiptail --inputbox "Please enter printer token" 10 100 3>&1 1>&2 2>&3)
echo "TOKEN: $TOKEN" echo "TOKEN: $TOKEN"
#curl -fsSL get.klipperbackup.xyz | bash curl -fsSL get.klipperbackup.xyz | bash
cat << EOF > file.txt cat << EOF > ~/klipper-backup/.env #file.txt
github_token=$TOKEN github_token=$TOKEN
github_username=reijii github_username=reijii
github_repository=Klipper-Backups github_repository=Klipper-Backups