Update

SHID1214 · Sep 4, 2024 · 1f8c8ce · 1f8c8ce
1 parent b297f1e
commit 1f8c8ce
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 * Configuration for the M200 3D printer.
   - It can be restored to its original state even if the user makes arbitrary corrections by mistake.
+  - Users comply with the laws and regulations of the country and region in which 3D printers are located (used), comply with work ethics, and pay attention to safety obligations. Users should strictly prohibit the use of our products or equipment for illegal purposes. Moment Co., Ltd. will not be held liable for the legal liability of the violator under any circumstances.
+  - Free support is not available if the user arbitrarily changes or modifies the printer.
   - If the manufacturer updates you, you can receive the service remotely.
 
 ## Requirements:

diff --git a/fans.cfg b/fans.cfg
@@ -9,25 +9,57 @@ kick_start_time: 0.5
 heater: extruder
 heater_temp: 50.0
 
-[fan] #Parts FAN
+[fan_generic Parts_fan] #Parts FAN / P0
 pin: EBBCan: PA1
-max_power: 1.0
-kick_start_time: 0.5
-off_below: 0.13
-cycle_time: 0.010
+cycle_time: 0.01
+hardware_pwm: false
 
-[heater_fan exhaust_fan] #Exhaust FAN
+[fan_generic Exhaust_fan] #Exhaust fan / P3
 pin: PA3
-max_power: 1.0 
-kick_start_time: 0.5
-fan_speed: 0.2
-heater: extruder
-heater_temp: 150
+cycle_time: 0.01
+hardware_pwm: false
 
-[heater_fan controller_fan] #Driver FAN
+################################################################################
+#When using the auxiliary fan, [heater_fan controller_fan] should be annotated.#
+#보조팬을 사용할 경우, [heater_fan controller_fan]를 주석처리해야 한다.############
+################################################################################
+#[fan_generic Auxiliary_fan] #Auxiliary fan / P2
+#pin: PA4
+#cycle_time: 0.01
+#hardware_pwm: false
+
+[heater_fan controller_fan] #Driver FAN / 
 pin: PA4
 max_power: 1.0
 kick_start_time: 0.5
 fan_speed: 0.8
 heater: heater_bed
-heater_temp: 40.0
+heater_temp: 40.0
+
+[gcode_macro M106]
+gcode:
+    {% set P = params.P | default(0) | int %}
+    {% set S = params.S | default(255) | int %}
+    {% set speed = S / 255 %}
+    {% if P == 0 %}
+        SET_FAN_SPEED FAN=Parts_fan SPEED={speed}
+    {% elif P == 2 %}
+        SET_FAN_SPEED FAN=Auxiliary_fan SPEED={speed}
+    {% elif P == 3 %}
+        SET_FAN_SPEED FAN=Exhaust_fan SPEED={speed}
+    {% endif %}
+
+[gcode_macro M107]
+gcode:
+    {% set fan = params.P | default(0) | int %}
+    {% if fan == 0 %}
+        SET_FAN_SPEED FAN=Parts_fan SPEED=0
+    {% elif fan == 2 %}
+        SET_FAN_SPEED FAN=Auxiliary_fan SPEED=0
+    {% elif fan == 3 %}
+        SET_FAN_SPEED FAN=Exhaust_fan SPEED=0
+    {% else %}
+        SET_FAN_SPEED FAN=Parts_fan SPEED=0
+        SET_FAN_SPEED FAN=Auxiliary_fan SPEED=0
+        SET_FAN_SPEED FAN=Exhaust_fan SPEED=0
+    {% endif %}
diff --git a/macros.cfg b/macros.cfg
@@ -10,29 +10,31 @@ gcode:
      BED_MESH_CLEAR
      BED_MESH_CALIBRATE
      G1 Z10 F2400
-     G1 X233 Y50 F27000
+     G1 X-30 Y50 F27000
      SKEW_PROFILE LOAD=my_skew
 
 [gcode_macro PURGE]
 gcode:     
      M117 Cleaning...
      G1 Z0.1 F1000
      G92 E0
-     G1 X233 Y50 E6.0 F300
-     G1 X210 Y50 F6000 
+     G1 X-30 Y50 E6.0 F120
+     G1 X-15 Y50 F6000 
      G92 E0
-     G1 Z0.3 F1000  
-     G1 E10.0 F1000
-     G92 E0
-     G1 X210 Y100 E7.0 F500
-     G1 X215 Y100 E7.8 F500
-     G1 X215 Y80 E10.0 F500
-     G1 X205 Y80 E11.5 F500
-     G1 X207 Y80 E10.5 F500
-	 INNER_LED_OFF
+     INNER_LED_OFF
      INNER_LED_ON
-     M117 Printing...
+     G1 Z0.3 F1000
+     G1 E10.0 F150
+     G92 E0
+     G1 X-15 Y100 E6.05
+     G92 E0
+     G1 X-10 Y100 E0.55
+     G92 E0
+     G1 X-10 Y80 E2.38
      G92 E0
+     G1 X-20 Y80 E1.15
+     G92 E0
+     M117 Printing...
 
 [gcode_macro echo_moment_vars]
 description: Echo MomentOS variables to the console.
@@ -117,6 +119,7 @@ description: Resumes the print if the printer is paused.
 rename_existing: RESUME_BASE
 gcode:
   M117 Printing...
+  STATUS_PRINTING
   {% set E = printer["gcode_macro PAUSE"].extrude|float %}
   # Prime
   {% if printer.extruder.can_extrude|lower == 'true' %}
@@ -144,16 +147,17 @@ gcode:
   SAVE_GCODE_STATE NAME=end_print_state
   {% set z_max = printer.toolhead.axis_maximum.z %} 
   G92 E0
-  G1 E-1.5 F2100 
+  G0 E-1.0 F6000                 ; rectract
+  G1 Z{z_max}                    ; move Z max
+  G28 X                          ; move X home
+  G28 Y                          ; move Y home
+  G92 E0
+  G1 E5 F3600                    ; extrude
+  M107                           ; parts fan off (on is M106)
+  M84                            ; motor off 
   M104 S0                        ; hotend off
   M140 S0                        ; bed off
-  M107                           ; parts fan off (on is M106)
-  G1 Z{z_max}
-  G28 X
-  G28 Y
-  M84                            ; motor off    
   G91                            ; relative positioning
-  G92 E0
   BED_MESH_CLEAR
   STATUS_READY
   INNER_LED_OFF
@@ -162,9 +166,10 @@ gcode:
   SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT=0.6
   SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT=0.6
   SET_SKEW CLEAR=1
+  M106 P3 S51 #(SET_FAN_SPEED FAN=Exhaust_fan SPEED=0.2)
+  #M106 P2 S0 #(SET_FAN_SPEED FAN=Auxiliary_fan SPEED=0)
   M117 Finished...
   RESTORE_GCODE_STATE NAME=end_print_state
-
 
 [gcode_macro _END_PRINT_PARK]
 gcode:
@@ -202,6 +207,13 @@ gcode:
   UNLOAD_FILAMENT
   M117 Please load new filament and resume
 
+[gcode_macro M601]
+description: Puase macro
+gcode:
+  PAUSE
+  UNLOAD_FILAMENT
+  M117 Please load new filament and resume
+
 [gcode_macro UNLOAD_FILAMENT]
 description: Unloads the filament. The function is applied to the screen.
 gcode:
@@ -210,6 +222,7 @@ gcode:
       {% if current_temp >= 215 %}
     {% set unload_speed = printer["gcode_macro MomentOS"].filament_unload_speed|float * 60 %}
     {% set unload_length = printer["gcode_macro MomentOS"].filament_unload_length|float %}
+    STATUS_LOAD_UNLOAD
     M117 Unloading filament...
     G92 E0 #Reset the current position of the extruder. Unloading without this command may cause a lot of motor spinning or an "extrude only move too long" error.
     G0 E5 F3600 # Push back the filament to smash any stringing 
@@ -219,6 +232,7 @@ gcode:
     # End - Cooling, hardening, shaping filament process   
     G0 E-{unload_length} F{unload_speed} # Extract quickly to ensure no seals or blockages.
     #M400 # Wait for purge to complete
+    STATUS_READY
     M117 Filament unloaded...
   {% endif %}
   RESTORE_GCODE_STATE NAME=unload_state
@@ -236,10 +250,13 @@ gcode:
   {% set load_speed = printer["gcode_macro MomentOS"].filament_load_speed|float * 60 %}
   {% set load_length = printer["gcode_macro MomentOS"].filament_load_length|float %}
   M117 Loading filament...
+  STATUS_LOAD_UNLOAD
+  G92 E0 #Reset the current position of the extruder. Unloading without this command may cause a lot of motor spinning or an "extrude only move too long" error.
   G0 E{load_length} F{load_speed} # Load the filament into the hotend area.
   G4 P1000  # Wait a secod
   G0 E100 F100 # Purge
   #M400 # Wait for purge to complete
+  STATUS_READY
   M117 Filament loaded...
   RESTORE_GCODE_STATE NAME=load_state
 

diff --git a/motors.cfg b/motors.cfg
@@ -7,10 +7,11 @@ step_pin: PC8
 dir_pin: !PC9
 enable_pin: !PA15
 rotation_distance: 40
-microsteps: 32
+microsteps: 16
 full_steps_per_rotation: 200
 endstop_pin: !EBBCan:PB6
 position_endstop: 240
+position_min: -30
 position_max: 240
 homing_speed: 150
 second_homing_speed: 15.0
@@ -25,7 +26,7 @@ step_pin: PA10
 dir_pin: !PA14
 enable_pin: !PA13
 rotation_distance: 40
-microsteps: 32
+microsteps: 16
 full_steps_per_rotation: 200
 endstop_pin: !PD3
 position_endstop: 246

diff --git a/motors_v2.cfg b/motors_v2.cfg
@@ -11,6 +11,7 @@ microsteps: 16
 full_steps_per_rotation: 200
 endstop_pin: !EBBCan:PB6
 position_endstop: 240
+position_min: -30
 position_max: 240
 homing_speed: 150
 second_homing_speed: 15.0

diff --git a/printer_settings.cfg b/printer_settings.cfg
@@ -52,11 +52,8 @@ max_temp: 130
 switch_pin: !PC2
 insert_gcode: 
       M117 Insert Detected
-
 runout_gcode: 
-      M117 Runout Detected, Run Unload fillament.
-      PAUSE
-      #UNLOAD_FILAMENT
+      M601
 
 #####################################################################
 #   Probe

diff --git a/tool_head_leds.cfg b/tool_head_leds.cfg
@@ -26,13 +26,15 @@ variable_colors: {
             'off': {'r': 0.0, 'g': 0.0, 'b': 0.0, 'w': 0.0},
             'printing': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w': 0.0},
             'standby': {'r': 0.5, 'g': 0.5, 'b': 0.5, 'w': 0.1},
+            'load_unload': {'r': 1.0, 'g': 1.0, 'b': 0.0, 'w':0.0},
         },
         'nozzle': {
             'heating': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w':0.0},
             'off': {'r': 0.0, 'g': 0.0, 'b': 0.0, 'w': 0.0},
             'on': {'r': 0.5, 'g': 0.5, 'b': 0.5, 'w':1.0},
             'standby': {'r': 0.5, 'g': 0.5, 'b': 0.5, 'w':0.5},
             'printing': {'r': 0.5, 'g': 0.5, 'b': 0.5, 'w':1.0},
+            'load_unload': {'r': 1.0, 'g': 1.0, 'b': 0.0, 'w':0.0},
         },
         'thermal': {
             'hot': {'r': 1.0, 'g': 0.0, 'b': 0.0, 'w': 0.0},
@@ -153,4 +155,9 @@ gcode:
 [gcode_macro status_printing]
 gcode:
     _set_toolhead_leds_by_name leds="logo" color="printing" transmit=0
-    set_nozzle_leds_on
+    set_nozzle_leds_on
+
+[gcode_macro status_load_unload]
+gcode:
+    _set_toolhead_leds_by_name leds="logo" color="load_unload" transmit=0
+    _set_toolhead_leds_by_name leds="nozzle" color="load_unload" transmit=1