Browse Source

Extruders gcodes sequences were inverted...

orel 4 years ago
parent
commit
36f70e43c2

+ 1 - 1
resources/definitions/dagoma_discoeasy200_bicolor.def.json

@@ -29,7 +29,7 @@
             "default_value": true
         },
         "machine_start_gcode": {
-            "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200 Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E60 F3000 ;Reverse multi-extruder retract\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200 Bicolor\n"
+            "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200 Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200 Bicolor\n"
         },
         "machine_end_gcode": {
             "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200 Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200 Bicolor\n"

+ 1 - 1
resources/definitions/dagoma_discoultimate_bicolor.def.json

@@ -29,7 +29,7 @@
             "default_value": true
         },
         "machine_start_gcode": {
-            "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E60 F3000 ;Reverse multi-extruder retract\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate Bicolor\n"
+            "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate Bicolor\n"
         },
         "machine_end_gcode": {
             "default_value": ";Begin End Gcode for Dagoma DiscoUltimate Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate Bicolor\n"

+ 2 - 2
resources/extruders/dagoma_discoeasy200_extruder_0.def.json

@@ -18,10 +18,10 @@
             "default_value": 1.75
         },
         "machine_extruder_start_code": {
-            "default_value": ";This start extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;Start T0\n;G92 E0\n;G1 E-{retraction_amount} F10000\n;G92 E0\n;G1 E1.5 F3000\n;G1 E-60 F10000\n;G92 E0"
+            "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0"
         },
         "machine_extruder_end_code": {
-            "default_value": ";This end extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;G92 E0\n;G1 E{retraction_amount} F3000\n;G92 E0\n;G1 E60 F3000\n;G92 E0\n;G1 E-{retraction_amount} F5000\n;End T0"
+            "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0"
         }
     }
 }

+ 2 - 2
resources/extruders/dagoma_discoeasy200_extruder_1.def.json

@@ -18,10 +18,10 @@
             "default_value": 1.75
         },
         "machine_extruder_start_code": {
-            "default_value": ";This start extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;Start T1\n;G92 E0\n;G1 E-{retraction_amount} F10000\n;G92 E0\n;G1 E1.5 F3000\n;G1 E-60 F10000\n;G92 E0"
+            "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0"
         },
         "machine_extruder_end_code": {
-            "default_value": ";This end extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;G92 E0\n;G1 E{retraction_amount} F3000\n;G92 E0\n;G1 E60 F3000\n;G92 E0\n;G1 E-{retraction_amount} F5000\n;End T1"
+            "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1"
         }
     }
 }

+ 2 - 2
resources/extruders/dagoma_discoultimate_extruder_0.def.json

@@ -18,10 +18,10 @@
             "default_value": 1.75
         },
         "machine_extruder_start_code": {
-            "default_value": ";This start extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;Start T0\n;G92 E0\n;G1 E-{retraction_amount} F10000\n;G92 E0\n;G1 E1.5 F3000\n;G1 E-60 F10000\n;G92 E0"
+            "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0"
         },
         "machine_extruder_end_code": {
-            "default_value": ";This end extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;G92 E0\n;G1 E{retraction_amount} F3000\n;G92 E0\n;G1 E60 F3000\n;G92 E0\n;G1 E-{retraction_amount} F5000\n;End T0"
+            "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0"
         }
     }
 }

+ 2 - 2
resources/extruders/dagoma_discoultimate_extruder_1.def.json

@@ -18,10 +18,10 @@
             "default_value": 1.75
         },
         "machine_extruder_start_code": {
-            "default_value": ";This start extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;Start T1\n;G92 E0\n;G1 E-{retraction_amount} F10000\n;G92 E0\n;G1 E1.5 F3000\n;G1 E-60 F10000\n;G92 E0"
+            "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0"
         },
         "machine_extruder_end_code": {
-            "default_value": ";This end extruder gcode comes from CuraByDagoma\n;Commented for now as there is discussion regarding its usage in Ultimaker Cura\n;G92 E0\n;G1 E{retraction_amount} F3000\n;G92 E0\n;G1 E60 F3000\n;G92 E0\n;G1 E-{retraction_amount} F5000\n;End T1"
+            "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1"
         }
     }
 }