From 7022b5d1af60994b786d980a32767a3412b8eb52 Mon Sep 17 00:00:00 2001 From: Reijii Date: Thu, 3 Apr 2025 02:10:33 +0300 Subject: [PATCH] =?UTF-8?q?Idle=20=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB,=20=D1=80=D1=8F=D0=B4=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8?= =?UTF-8?q?=D1=85=20=D1=84=D0=B8=D0=BA=D1=81=D0=BE=D0=B2=20=D0=B8=20=D1=82?= =?UTF-8?q?=D1=8E=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Macros/macros_variables.cfg | 3 ++- Scripts/fan_monitor.cfg.var | 6 +++--- Scripts/filament.cfg | 2 ++ Scripts/idle.cfg | 41 +++++++++++++++++++++++++++++-------- Scripts/macros.cfg | 2 +- Scripts/start_stop.cfg | 4 ++-- 6 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Macros/macros_variables.cfg b/Macros/macros_variables.cfg index 56097b5..ea49938 100644 --- a/Macros/macros_variables.cfg +++ b/Macros/macros_variables.cfg @@ -9,12 +9,13 @@ description: RatOS variable storage macro, will echo variables to the console wh # Мониторинг вентилятора термобарьера, для использования раскоментить инклуд, вентилятор toolhead_cooling_fan variable_hotend_fan_min_speed: 5000 # скорость вентилятора ниже которой начинается ор variable_hotend_fan_pause: False # остановка принтера и выключение хотенда при срабатывание +variable_chamber_temp_enabled: False # Переменные для выключения выключения (пока работает плохо) variable_power_device: "printer" # наименование павердевайса variable_poweroff_delay: 400 # время полного выключения принтера после выключения моторов variable_idle_delay: 200 # время до отключения моторов - +variable_load_unload_idle_delay: 120 # отключение грелки после лоад/анлоад # Z-tilt для использования раскоментить инклуд, и прописать переменную variable_z_tilt_enabled: False diff --git a/Scripts/fan_monitor.cfg.var b/Scripts/fan_monitor.cfg.var index 1627a0b..ead3cd0 100644 --- a/Scripts/fan_monitor.cfg.var +++ b/Scripts/fan_monitor.cfg.var @@ -26,7 +26,7 @@ gcode: SET_GCODE_VARIABLE MACRO=HOTEND_FAN_CHECK VARIABLE=he_stop_count VALUE={he_stop_count + 1} M118 WARNING: Fan stoppage detected ({he_stop_count+1}/{max_consecutive_stops}). {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} - RESPOND PREFIX=tgnotify MSG="Чот вентилятор термобарьера медленный" + RESPOND PREFIX=tgnotify MSG="Чот вентилятор термобарьера медленный. Скорость {rpm}" {% endif %} M400 {% if printer["gcode_macro HOTEND_FAN_CHECK"].he_stop_count|int >= max_consecutive_stops-1 %} @@ -44,7 +44,7 @@ gcode: {% if printer['pause_resume'].is_paused|int == 0 %} M117 !!FAN STOPPAGE!! {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} - RESPOND PREFIX=tgnotify MSG="Вентилятор термобарьера сдох." + RESPOND PREFIX=tgalarm MSG="Вентилятор термобарьера сдох. Скорость {rpm}" {% endif %} M118 FAN STOPPAGE DETECTED. PAUSING... @@ -52,7 +52,7 @@ gcode: PAUSE SET_HEATER_TEMPERATURE HEATER=extruder TARGET=0 {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} - RESPOND PREFIX=tgnotify MSG="Принтер на паузе, нагрев экструдера выключен." + RESPOND PREFIX=tgalarm ify MSG="Принтер на паузе, нагрев экструдера выключен." {% endif %} {% endif %} diff --git a/Scripts/filament.cfg b/Scripts/filament.cfg index 49df9eb..6a8a182 100644 --- a/Scripts/filament.cfg +++ b/Scripts/filament.cfg @@ -31,6 +31,7 @@ gcode: G0 E-{unload_length} F{unload_speed} M117 Filament unloaded! RESPOND MSG="Filament unloaded! Please inspect the tip of the filament before reloading." + UPDATE_DELAYED_GCODE ID=_IDLE_HEATER_SHUTDOWN DURATION={printer["gcode_macro RatOS"].load_unload_idle_delay} RESTORE_GCODE_STATE NAME=unload_state [gcode_macro LOAD_FILAMENT] @@ -62,4 +63,5 @@ gcode: M400 M117 Filament loaded! RESPOND MSG="Filament loaded!" + UPDATE_DELAYED_GCODE ID=_IDLE_HEATER_SHUTDOWN DURATION={printer["gcode_macro RatOS"].load_unload_idle_delay} RESTORE_GCODE_STATE NAME=load_state diff --git a/Scripts/idle.cfg b/Scripts/idle.cfg index 84e7603..b253f24 100644 --- a/Scripts/idle.cfg +++ b/Scripts/idle.cfg @@ -3,20 +3,27 @@ timeout: 120 gcode: RESPOND MSG="Idle start" UPDATE_DELAYED_GCODE ID=_FIRST_STAGE_IDLE DURATION={printer["gcode_macro RatOS"].idle_delay} - + +[delayed_gcode set_idle_work] +initial_duration: 1 +gcode: + M119 + [delayed_gcode _FIRST_STAGE_IDLE] gcode: {% if printer.idle_timeout.state == "Idle" or printer.idle_timeout.state == "Ready" %} - {% if printer.extruder.temperature < 50.0 and printer.heater_bed.temperature < 50.0 %} - {% if printer.extruder.target == 0.0 and printer.heater_bed.target == 0.0 %} + {% if printer.heater_bed.temperature < 50.0 %} + {% if printer.heater_bed.target == 0.0 %} UPDATE_DELAYED_GCODE ID=_FIRST_STAGE_IDLE DURATION=0 - {% if printer.toolhead.homed_axes is defined %} - {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} - RESPOND PREFIX=tgnotify MSG="Моторы погашены" - {% endif %} + {% if printer["gcode_macro RatOS"].powercheck == 0 %} + {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} + RESPOND PREFIX=tgnotify MSG="Моторы погашены" + {% endif %} M84 + UPDATE_DELAYED_GCODE ID=_POWER_OFF_PRINTER_CHECK DURATION={printer["gcode_macro RatOS"].poweroff_delay} + SET_GCODE_VARIABLE MACRO=RatOS VARIABLE=powercheck VALUE=1 + M104 S0 {% endif %} - UPDATE_DELAYED_GCODE ID=_POWER_OFF_PRINTER_CHECK DURATION={printer["gcode_macro RatOS"].poweroff_delay} {% else %} UPDATE_DELAYED_GCODE ID=_FIRST_STAGE_IDLE DURATION=2 {% endif %} @@ -27,7 +34,14 @@ gcode: {% if printer.extruder.target == 0.0 and printer.heater_bed.target == 0.0 %} UPDATE_DELAYED_GCODE ID=_FIRST_STAGE_IDLE DURATION=2 {% else %} - UPDATE_DELAYED_GCODE ID=_FIRST_STAGE_IDLE DURATION=0 + UPDATE_DELAYED_GCODE ID=_FIRST_STAGE_IDLE DURATION={printer["gcode_macro RatOS"].idle_delay} + {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} + {% if printer["gcode_macro RatOS"].chamber_temp_enabled|lower == 'true' %} + RESPOND PREFIX=tgnotify MSG="Хозяина, я тут греюсь стою. Температура камеры {printer['temperature_sensor Chamber'].temperature}" + {% else %} + RESPOND PREFIX=tgnotify MSG="Хозяина, я тут греюсь стою. Температура стола {printer.heater_bed.temperature}" + {% endif %} + {% endif %} {% endif %} {% endif %} {% endif %} @@ -59,6 +73,14 @@ gcode: {% endif %} {% endif %} +[delayed_gcode _IDLE_HEATER_SHUTDOWN] +gcode: + RESPOND MSG="Грелка выключена" + {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} + RESPOND PREFIX=tgnotify MSG="Грелка выключена" + {% endif %} + M104 S0 + [delayed_gcode _EXHAUST_FAN_DELAYED] gcode: SET_FAN_SPEED FAN=Exhaust_fan SPEED=0 @@ -70,6 +92,7 @@ gcode: [gcode_macro _POWER_OFF_PRINTER] gcode: + SET_GCODE_VARIABLE MACRO=RatOS VARIABLE=powercheck VALUE=0 {action_call_remote_method("set_device_power", device=printer["gcode_macro RatOS"].power_device, state="off")} diff --git a/Scripts/macros.cfg b/Scripts/macros.cfg index 71d43ac..70e4145 100644 --- a/Scripts/macros.cfg +++ b/Scripts/macros.cfg @@ -69,7 +69,7 @@ gcode: description: Cancels the printer rename_existing: CANCEL_PRINT_BASE gcode: - END_PRINT_ROUTINE + _END_PRINT_ROUTINE TURN_OFF_HEATERS CLEAR_PAUSE #SDCARD_RESET_FILE diff --git a/Scripts/start_stop.cfg b/Scripts/start_stop.cfg index 90b5faf..ab6dfc6 100644 --- a/Scripts/start_stop.cfg +++ b/Scripts/start_stop.cfg @@ -222,7 +222,7 @@ gcode: [gcode_macro END_PRINT] description: End print procedure, use this in your Slicer. gcode: - END_PRINT_ROUTINE + _END_PRINT_ROUTINE M117 Done :) RESPOND MSG="Done :)" {% if printer["gcode_macro RatOS"].tgbot_enabled|lower == 'true' %} @@ -232,7 +232,7 @@ gcode: beep {% endif %} -[gcode_macro END_PRINT_ROUTINE] +[gcode_macro _END_PRINT_ROUTINE] description: End print routine procedure gcode: SAVE_GCODE_STATE NAME=end_print_state