Merge pull request #11023 from NilsRo/master

Update anycubic_i3_mega_s.def.json

CURA-8971

2 files changed, 50 insertions, 33 deletions

diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json
index f73c57ce81..bf14aed04c 100644
--- a/resources/definitions/anycubic_i3_mega_s.def.json
+++ b/resources/definitions/anycubic_i3_mega_s.def.json
@@ -29,22 +29,30 @@
         "machine_center_is_zero": { "default_value": false },
         "gantry_height": { "value": "0" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": { "default_value": "G21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}           ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_initial_print_temperature}         ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}           ; wait for bed \nM109 S{material_initial_print_temperature}         ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E25 F500                            ; Extrude 25mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X120 F4000                              ; Quickly wipe away from the filament line`" },
+        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X120 F4000                              ; Quickly wipe away from the filament line`" },
         "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
 
         "machine_max_acceleration_x": { "value": 3000 },
-        "machine_max_acceleration_y": { "value": 3000 },
-        "machine_max_acceleration_z": { "value": 3000 },
-        "machine_max_acceleration_e": { "value": 3000 },
+        "machine_max_acceleration_y": { "value": 2000 },
+        "machine_max_acceleration_z": { "value": 60 },
+        "machine_max_acceleration_e": { "value": 10000 },
         "machine_acceleration": { "value": 3000 },
 
+        "machine_max_feedrate_x": { "default_value": 500 },
+        "machine_max_feedrate_y": { "default_value": 500 },
+        "machine_max_feedrate_z": { "default_value": 8 },
+
         "machine_max_jerk_xy": { "value": 10 },
         "machine_max_jerk_z": { "value": 0.4 },
         "machine_max_jerk_e": { "value": 5 },
 
         "material_diameter": { "default_value": 1.75 },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5"},
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_flow": { "value": 100 },
 
         "acceleration_print": { "value": 1500 },
+        "acceleration_enabled": { "value": false },
         "acceleration_travel": { "value": 3000 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
         "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
@@ -52,8 +60,6 @@
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": 10 },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-
-        "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": true },
 
         "speed_print": { "value": 50.0 } ,
@@ -63,45 +69,40 @@
         "speed_wall_x": { "value": "speed_wall" },
         "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
-        "speed_travel": { "value": 100.0,  "maximum_value_warning": 150.0 },
-        "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
+        "speed_travel": { "value": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 },
+        "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
+        "speed_print_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
         "speed_travel_layer_0": { "value": 100.0 },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_support_interface": { "value": "speed_topbottom" },
-        
+        "speed_z_hop": { "value": 8 },
+
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
-        "material_initial_print_temperature": { "value": "material_print_temperature + 10" },
-        "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
-        
         "infill_sparse_density": { "value": 25 },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 15.0 },
-       
-       
-        "retraction_speed": { "value": 25, "maximum_value": 40 },
-        "retraction_retract_speed": { "maximum_value": 40 },
-        "retraction_prime_speed": { "maximum_value": 40 },
-        
+
+        "retraction_speed": { "value": 30, "maximum_value_warning": 60 },
+        "retraction_retract_speed": { "maximum_value_warning": 60 },
+        "retraction_prime_speed": { "maximum_value_warning": 60 },
+
         "retraction_hop_enabled": { "value": true },
         "retraction_hop": { "value": 0.075 },
         "retraction_hop_only_when_collides": { "value": true },
-
+        "retraction_amount": { "value": 6 },
+        "retraction_enable": { "value": true },
+        "retraction_min_travel": { "value": 1.5 },
         "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "value": 30 },
+        
         "travel_avoid_other_parts": { "value": true },
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_amount": { "value": 6 },
-        "retraction_enable": { "value": true },
-        "retraction_min_travel": { "value": 1.5 },
-
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_fan_speed": { "value": 70 },
         "cool_fan_speed_0": { "value": 30 },
@@ -112,7 +113,7 @@
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
         "brim_replaces_support": { "value": false },
         "skirt_gap": { "value": 5.0 },
-        "skirt_line_count": { "value": 4 },
+        "skirt_line_count": { "value": 2 },
 
         "meshfix_maximum_deviation": { "value": 0.05 },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
diff --git a/resources/definitions/anycubic_i3_mega_x.def.json b/resources/definitions/anycubic_i3_mega_x.def.json
index 1bdab1028c..52ce84bd33 100644
--- a/resources/definitions/anycubic_i3_mega_x.def.json
+++ b/resources/definitions/anycubic_i3_mega_x.def.json
@@ -2,11 +2,11 @@
     "version": 2,
     "name": "Anycubic i3 Mega X",
     "inherits": "anycubic_i3_mega_s",
-	"metadata":
+    "metadata":
     {
-		"quality_definition": "anycubic_i3_mega_s",
-		"platform": "anycubic_i3_mega_x_platform.stl"
-	},
+        "quality_definition": "anycubic_i3_mega_s",
+        "platform": "anycubic_i3_mega_x_platform.stl"
+    },
     "overrides":
     {
         "machine_name": { "default_value": "Anycubic i3 Mega X" },
@@ -14,7 +14,23 @@
         "machine_height": { "default_value": 305 },
         "machine_depth": { "default_value": 300 },
 
+        "machine_max_acceleration_x": { "value": 400 },
+        "machine_max_acceleration_y": { "value": 400 },
+        "machine_max_acceleration_z": { "value": 60 },
+        "machine_max_acceleration_e": { "value": 10000 },
+        "machine_acceleration": { "value": 3000 },
+
+        "machine_max_feedrate_x": { "default_value": 120 },
+        "machine_max_feedrate_y": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 20 },
+
+        "speed_travel": { "value": 100.0,  "maximum_value": 120.0 },
+
         "acceleration_print": { "value": 400 },
-        "acceleration_travel": { "value": 400 }
-	}
-}
+        "acceleration_travel": { "value": 400 },
+        
+        "retraction_speed": { "value": 30, "maximum_value_warning": 60 },
+        "retraction_retract_speed": { "maximum_value_warning": 60 },
+        "retraction_prime_speed": { "maximum_value_warning": 60 }
+    }
+}
\ No newline at end of file