From d9568a33a31dfde16da355e9daad874ecda559b7 Mon Sep 17 00:00:00 2001 From: Reijii Date: Wed, 7 May 2025 01:37:33 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B8=D0=BD=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=B5=D1=80=D0=B0,=20=D0=B8=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=B0=20=D1=8D=D0=BA=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B0=20=D0=B2=20=D0=BF=D1=80=D0=B5=D1=85?= =?UTF-8?q?=D0=B8=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/start_stop.cfg | 12 +++++++----- macros_installer.sh | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Scripts/start_stop.cfg b/Scripts/start_stop.cfg index ab6dfc6..8f711dc 100644 --- a/Scripts/start_stop.cfg +++ b/Scripts/start_stop.cfg @@ -57,6 +57,8 @@ gcode: M117 Heating Extruder... RESPOND MSG="Heating Extruder..." 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. _USER_START_PRINT_AFTER_HEATING_EXTRUDER # 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. # Also allows the bed heat to spread a little, and softens any plastic that might be stuck to the nozzle. 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 %} {% if printer["gcode_macro RatOS"].z_tilt_enabled|lower == 'true' %} {% set TARGET_TEMP = printer.heater_bed.target %} @@ -110,13 +113,11 @@ gcode: {% endif %} Z_TILT_ADJUST horizontal_move_z=2 RESTORE_GCODE_STATE NAME=STATE_Z_TILT - - M190 S{TARGET_TEMP} - M117 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. G28 Z + M140 S{TARGET_TEMP} {% endif %} @@ -144,9 +145,10 @@ gcode: M140 S0 {% endif %} {% 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 {% endif %} - M190 S{TARGET_TEMP} + M140 S{TARGET_TEMP} {% elif printer["gcode_macro RatOS"].bed_mesh_profile is defined %} BED_MESH_CLEAR BED_MESH_PROFILE LOAD={printer["gcode_macro RatOS"].bed_mesh_profile} diff --git a/macros_installer.sh b/macros_installer.sh index d4bba1a..8f41907 100644 --- a/macros_installer.sh +++ b/macros_installer.sh @@ -56,8 +56,8 @@ install_backup() { echo "name: $NAME" TOKEN=$(whiptail --inputbox "Please enter printer token" 10 100 3>&1 1>&2 2>&3) echo "TOKEN: $TOKEN" - #curl -fsSL get.klipperbackup.xyz | bash - cat << EOF > file.txt + curl -fsSL get.klipperbackup.xyz | bash + cat << EOF > ~/klipper-backup/.env #file.txt github_token=$TOKEN github_username=reijii github_repository=Klipper-Backups