Merge pull request #227 from stereotech/STEAPP-857

STEAPP-857: added command for set temperature for the chamber heater
stereotech · Dec 28, 2023 · f63e26c · f63e26c
2 parents e4eabc9 + 83bbcf9
commit f63e26c
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 36 deletions.
diff --git a/HTE750-0-0-23.cfg b/HTE750-0-0-23.cfg
@@ -18,6 +18,7 @@ path: /home/ste/uploads
 [include stereotech_config/common/homing_macros.cfg]
 
 [include stereotech_config/750/chamber.cfg]
+[include stereotech_config/750/chamber_heater.cfg]
 
 [include stereotech_config/750/printhead.cfg]
 

diff --git a/stereotech_config/750/chamber.cfg b/stereotech_config/750/chamber.cfg
@@ -1,6 +1,9 @@
 # [fan_generic chamber_fan]
 # pin: second_mcu: cooling_fan_heat
 
+# for fan webcam
+# [fan_generic webcam_fan]
+# pin: second_mcu: cooling_fan_heat
 [heater_generic chamber_heater]
 gcode_id: C
 heater_pin: multi_pin:chamber_heater
@@ -44,28 +47,6 @@ pin: !door_switch_pin
 press_gcode: QUERY_BUTTON BUTTON=door_switch
 release_gcode: QUERY_BUTTON BUTTON=door_switch
 
-
-# [gcode_macro STATUS_LED]
-# gcode:
-#     {% set status = params.STATUS|default(printing) %}
-#     {% if status == "started" %}
-#         SET_LED_TEMPLATE LED=case_led TEMPLATE=led_heatup
-#     {% elif status == "paused" %}
-#         M150 R255 G255 B0 D5
-#     {% elif status == "completed" %}
-#         M150 R0 G255 B0 D5
-#     {% elif status == "cancelled" %}
-#         M150 R255 G0 B0 D3
-#     {% elif status == "printing" %}
-#         {% if printer["gcode_macro TOGGLE_LIGHT"].light > 0 %}
-#             M150 R255 G255 B255
-#         {% else %}
-#             M150 R0 G0 B0
-#         {% endif %}
-#     {% else %}
-#         UPDATE_DELAYED_GCODE ID=return_color DURATION=0.1
-#     {% endif %}
-
 [gcode_macro M106]
 rename_existing: M106.1
 gcode:
@@ -89,11 +70,10 @@ gcode:
     {% if p == 3 %}
         HEATER_FAN_TEST FAN=chamber_fan SPEED=0.0
     {% else %}
-        M107.1 ;TURN ON PUMP
+        M107.1 ;TURN OFF PUMP
         {% if p == 1 %}
             SET_PIN PIN=extruder1_cooling_valve VALUE=0
         {% else %}
             SET_PIN PIN=extruder_cooling_valve VALUE=0
         {% endif %}
     {% endif %}
-
diff --git a/stereotech_config/750/chamber_heater.cfg b/stereotech_config/750/chamber_heater.cfg
@@ -0,0 +1,28 @@
+[heater_generic chamber_heater]
+gcode_id: C
+heater_pin: multi_pin:chamber_heater
+sensor_type: ATC Semitec 104GT-2
+sensor_pin: chamber_sensor_pin
+control: pid
+pid_Kp: 39.120
+pid_Ki: 0.196
+pid_Kd: 1955.496
+min_temp: -150
+max_temp: 200
+
+[heater_fan chamber_fan]
+pin: chamber_fan_pin
+heater: chamber_heater
+heater_temp: 40
+
+#ONLY FOR DEBUG
+[verify_heater chamber_heater]
+check_gain_time: 1000
+
+[gcode_macro M141]
+gcode:
+    SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={params.S}
+
+[gcode_macro M191]
+gcode:
+    TEMPERATURE_WAIT SENSOR='heater_generic chamber_heater' MINIMUM={params.S} MAXIMUM={params.S|float + 5}
diff --git a/stereotech_config/750/module_3d_macros.cfg b/stereotech_config/750/module_3d_macros.cfg
@@ -1,17 +1,17 @@
 [gcode_macro M140]
-rename_existing: M141
+rename_existing: M140.1
 gcode:
     {% if printer.heater_bed.temperature > 5 %}
-        M141 S{ params.S }
+        M140.1 S{ params.S }
     {% endif %}
 
 [gcode_macro M190]
-rename_existing: M191
+rename_existing: M190.1
 gcode:
     {% if printer.heater_bed.temperature > 5 %}
         ;STATUS_LED STATUS=started
         M117 platform_heating
-        M191 S{ params.S }
+        M190.1 S{ params.S }
         ;STATUS_LED STATUS=printing
         M117
     {% endif %}

diff --git a/stereotech_config/HTE750-0-0-23.cfg b/stereotech_config/HTE750-0-0-23.cfg
@@ -18,6 +18,7 @@ path: /home/ste/uploads
 [include config/common/homing_macros.cfg]
 
 [include config/750/chamber.cfg]
+[include config/750/chamber_heater.cfg]
 
 [include config/750/printhead.cfg]
 

diff --git a/stereotech_config/common/module_3d_macros.cfg b/stereotech_config/common/module_3d_macros.cfg
@@ -1,17 +1,17 @@
 [gcode_macro M140]
-rename_existing: M141
+rename_existing: M140.1
 gcode:
     {% if printer["gcode_button five_axis_module"].state == "RELEASED" %}
-        M141 S{ params.S }
+        M140.1 S{ params.S }
     {% endif %}
 
 [gcode_macro M190]
-rename_existing: M191
+rename_existing: M190.1
 gcode:
     {% if printer["gcode_button five_axis_module"].state == "RELEASED" %}
         STATUS_LED STATUS=started HEATER=heater_bed
         M117 platform_heating
-        M191 S{ params.S }
+        M190.1 S{ params.S }
         STATUS_LED STATUS=printing
         M117
     {% endif %}

diff --git a/stereotech_config/ender/module_3d_macros.cfg b/stereotech_config/ender/module_3d_macros.cfg
@@ -1,16 +1,16 @@
 [gcode_macro M140]
-rename_existing: M141
+rename_existing: M140.1
 gcode:
     {% if printer["gcode_button five_axis_module"].state == "RELEASED" %}
-        M141 S{ params.S }
+        M140.1 S{ params.S }
     {% endif %}
 
 [gcode_macro M190]
-rename_existing: M191
+rename_existing: M190.1
 gcode:
     {% if printer["gcode_button five_axis_module"].state == "RELEASED" %}
         M117 platform_heating
-        M191 S{ params.S }
+        M190.1 S{ params.S }
         M117
     {% endif %}