From 2c331604e82cc4a6d2d2fbbf592d41f51c68f169 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Sep 2022 11:39:08 +0200 Subject: [PATCH] Clean up a lot of duplicate settings from machine profiles These were errors that were copy pasted from other definitions. So leaving them as is would continue to decrease the quality of third party profiles. --- .../definitions/Mark2_for_Ultimaker2.def.json | 3 - resources/definitions/SV01.def.json | 6 +- resources/definitions/SV03.def.json | 6 +- resources/definitions/anet3d.def.json | 37 ++++------ resources/definitions/anycubic_4max.def.json | 1 - .../definitions/anycubic_i3_mega_s.def.json | 11 +-- .../definitions/anycubic_mega_zero.def.json | 1 - resources/definitions/artillery_base.def.json | 2 +- resources/definitions/biqu_base.def.json | 12 +--- .../definitions/blv_mgn_cube_base.def.json | 3 - .../builder_premium_large.def.json | 1 - .../builder_premium_medium.def.json | 1 - .../builder_premium_small.def.json | 1 - resources/definitions/cartesio.def.json | 1 - resources/definitions/creality_base.def.json | 35 ++++----- .../dagoma_pro_430_bowden.def.json | 1 - .../definitions/deltacomb_dc20flux.def.json | 2 +- .../definitions/deltacomb_dc21flux.def.json | 2 +- resources/definitions/dxu.def.json | 3 - resources/definitions/eryone_er20.def.json | 3 - resources/definitions/eryone_thinker.def.json | 3 - .../definitions/flyingbear_base.def.json | 8 --- resources/definitions/goofoo_base.def.json | 20 ++---- .../definitions/hctech_hc300-m1&m1h.def.json | 3 - .../definitions/hctech_hc300-m2h.def.json | 2 - .../definitions/hctech_hc300-m3.def.json | 2 - resources/definitions/hms434.def.json | 6 +- resources/definitions/inat_base.def.json | 11 --- resources/definitions/kingroon_base.def.json | 9 +-- resources/definitions/koonovo_base.def.json | 13 +--- resources/definitions/koonovo_kn3.def.json | 10 --- resources/definitions/koonovo_kn5.def.json | 13 +--- resources/definitions/liquid.def.json | 3 +- resources/definitions/longer_base.def.json | 16 +---- resources/definitions/lotmaxx_sc10.def.json | 72 +++++++++---------- resources/definitions/lotmaxx_sc20.def.json | 3 - resources/definitions/malyan_m200.def.json | 2 - resources/definitions/mingda_base.def.json | 9 +-- .../definitions/mixware_hyper_s.def.json | 9 --- resources/definitions/rigid3d_base.def.json | 2 +- ...tur3d_discov3ry1_complete_um2plus.def.json | 3 - resources/definitions/tank_m_base.def.json | 11 --- .../definitions/trimaker_nebula_plus.def.json | 1 - resources/definitions/tronxy_x.def.json | 16 ++--- resources/definitions/two_trees_base.def.json | 18 +---- .../ultimaker2_plus_connect.def.json | 2 - resources/definitions/ultimaker3.def.json | 1 - resources/definitions/ultimaker_s3.def.json | 1 - resources/definitions/ultimaker_s5.def.json | 1 - resources/definitions/weedo_x40.def.json | 16 +---- resources/definitions/winbo_dragonl4.def.json | 26 ++++--- resources/definitions/winbo_mini2.def.json | 16 ++--- .../definitions/winbo_superhelper105.def.json | 21 +++--- 53 files changed, 122 insertions(+), 359 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 68498db423..2418445a26 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -63,9 +63,6 @@ "machine_heated_bed": { "default_value": true }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall_x": { "value": "speed_wall" }, diff --git a/resources/definitions/SV01.def.json b/resources/definitions/SV01.def.json index 439ced7d38..bd7773de6f 100644 --- a/resources/definitions/SV01.def.json +++ b/resources/definitions/SV01.def.json @@ -45,16 +45,12 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - "infill_sparse_density": { "value": "20" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, "infill_pattern": { "value": "'lines'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, diff --git a/resources/definitions/SV03.def.json b/resources/definitions/SV03.def.json index 5968a82c0d..b056175b27 100644 --- a/resources/definitions/SV03.def.json +++ b/resources/definitions/SV03.def.json @@ -45,16 +45,12 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - "infill_sparse_density": { "value": "20" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, , "infill_pattern": { "value": "'lines'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index 59ad93416c..1946b81bc0 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -51,14 +51,11 @@ "speed_print": { "value": 50.0 } , "speed_infill": { "value": "speed_print * 2" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": "speed_print / 2" }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_print" }, "speed_support": { "value": "speed_print" }, @@ -67,18 +64,14 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, - "optimize_wall_printing_order": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": true }, "infill_overlap": { "value": 30.0 }, @@ -88,34 +81,34 @@ "fill_outline_gaps": { "value": false }, - "retraction_speed": { + "retraction_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_retract_speed": { + "retraction_retract_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_prime_speed": { + "retraction_prime_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 1 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adaptive_layer_height_variation": { "value": 0.04 }, @@ -133,16 +126,12 @@ "extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"}, "extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"}, - "relative_extrusion":{"value": false,"enabled": false}, + "relative_extrusion":{"value": false, "enabled": false}, "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "0" - } + "machine_center_is_zero": { "default_value": false }, + "gantry_height": { "value": "0"} } } diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json index 6d6c20e8f5..838c81f991 100644 --- a/resources/definitions/anycubic_4max.def.json +++ b/resources/definitions/anycubic_4max.def.json @@ -51,7 +51,6 @@ "gantry_height": { "value": "25.0" }, "skin_overlap": { "value": "10" }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "900" }, diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index 2e972c78b6..54fa459946 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -53,8 +53,6 @@ "material_bed_temperature": { "maximum_value_warning": 110 }, "material_bed_temperature_layer_0": { "maximum_value_warning": 110 }, - "material_flow": { "value": 100 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" }, "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" }, @@ -70,15 +68,11 @@ "jerk_enabled": { "value": true }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "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, "maximum_value": 200.0 }, "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "speed_travel" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -101,7 +95,7 @@ "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 }, @@ -114,7 +108,6 @@ "cool_fan_speed": { "value": 100 }, "cool_fan_speed_0": { "value": 30 }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, diff --git a/resources/definitions/anycubic_mega_zero.def.json b/resources/definitions/anycubic_mega_zero.def.json index 5f71d243ab..c483a4ad09 100644 --- a/resources/definitions/anycubic_mega_zero.def.json +++ b/resources/definitions/anycubic_mega_zero.def.json @@ -99,7 +99,6 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "retraction_speed": { "value": 30 }, "retraction_amount": { "value": 7 }, "retraction_count_max": { "value": 100 }, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index a6da7e7d96..171ac4a524 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -159,7 +159,7 @@ "travel_retract_before_outer_wall": { "value": true }, "retraction_amount": { "value": 2 }, - "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index 82ee71dd7a..44a582e545 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -59,15 +59,11 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -76,19 +72,16 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, "infill_line_width": { "value": "line_width * 1.2" }, - "infill_sparse_density": { "value": "20" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -111,7 +104,6 @@ "maximum_value": 200 }, - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, @@ -119,13 +111,11 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json index 2c73b80cfc..84c585e016 100644 --- a/resources/definitions/blv_mgn_cube_base.def.json +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -165,9 +165,6 @@ "skin_overlap": { "value": 10.0 }, - "speed_infill": { - "value": "speed_print" - }, "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index f0e64921e7..8f49efedb2 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -54,7 +54,6 @@ "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index e85c654fa2..c87e3f70c4 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -54,7 +54,6 @@ "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index c89b01566b..8a7969ec50 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -53,7 +53,6 @@ "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 631f947324..996e03ef0a 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -41,7 +41,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, - "prime_tower_enable": { "default_value": false }, "prime_tower_min_volume": { "value": "0.7" }, "prime_tower_size": { "value": 24.0 }, "prime_tower_position_x": { "value": "125" }, diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index 9d1c578f81..a947369de7 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -73,7 +73,8 @@ "zyyx_pro_pla" ] }, - "overrides": { + "overrides": + { "machine_name": { "default_value": "Creawsome Base Printer" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, @@ -109,36 +110,25 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_print": { "value": 50.0 }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - - "line_width": { "value": "machine_nozzle_size" }, - "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -148,34 +138,33 @@ "fill_outline_gaps": { "value": false }, - "retraction_speed": { + "retraction_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_retract_speed": { + "retraction_retract_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_prime_speed": { + "retraction_prime_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, @@ -189,7 +178,7 @@ "meshfix_maximum_resolution": { "value": "0.25" }, "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, "support_use_towers": { "value": false }, diff --git a/resources/definitions/dagoma_pro_430_bowden.def.json b/resources/definitions/dagoma_pro_430_bowden.def.json index 7ed1adb0b7..5a2608d4d8 100644 --- a/resources/definitions/dagoma_pro_430_bowden.def.json +++ b/resources/definitions/dagoma_pro_430_bowden.def.json @@ -25,7 +25,6 @@ "machine_max_jerk_e": { "value": 5 }, "machine_max_feedrate_e": { "default_value": 200 }, "machine_steps_per_mm_e": { "default_value": 139.5 }, - "acceleration_enabled": { "value": "True" }, "acceleration_print": { "value": "1250", "maximum_value": 1500 }, "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value": 1500 }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1250)", "maximum_value": 1500 }, diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json index fa6fdb0ca7..f907649312 100644 --- a/resources/definitions/deltacomb_dc20flux.def.json +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -25,7 +25,7 @@ "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, "prime_tower_min_volume": { "value": "50" }, - "prime_tower_enable": { "value": "1" }, + "prime_tower_enable": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" } diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json index f2b7941518..42e1851ab0 100644 --- a/resources/definitions/deltacomb_dc21flux.def.json +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -25,7 +25,7 @@ "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, "prime_tower_min_volume": { "value": "50" }, - "prime_tower_enable": { "value": "1" }, + "prime_tower_enable": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" } diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index 4d7c3eb446..e810506fea 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -70,9 +70,6 @@ "machine_heated_bed": { "default_value": true }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall_x": { "value": "speed_wall" }, diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json index c19a8b1035..f9fe209151 100644 --- a/resources/definitions/eryone_er20.def.json +++ b/resources/definitions/eryone_er20.def.json @@ -156,9 +156,6 @@ "skirt_line_count": { "value": 3 }, - "speed_infill": { - "value": "speed_print" - }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 50)" }, diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index e2dbd44215..e48803e368 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -143,9 +143,6 @@ "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall": { "value": "speed_print" }, diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 9dc406494e..68c709a630 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -116,7 +116,6 @@ "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "value": 0.2 }, - "line_width": { "value": "machine_nozzle_size" }, "skin_line_width": { "value": "machine_nozzle_size" }, "infill_line_width": { "value": "line_width + 0.1" }, "skirt_brim_line_width": { "value": "line_width + 0.1" }, @@ -140,25 +139,19 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, - "retraction_enable": { "value": true }, "retraction_min_travel": { "value": 1.5 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "speed_print": { "value": 60 } , "speed_infill": { "value": "speed_print * 1.5" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_print" }, "speed_roofing": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_support": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": "speed_print / 2" }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "skirt_brim_speed": { "value": "speed_layer_0" }, "speed_z_hop": { "value": 5 }, @@ -171,7 +164,6 @@ "retraction_hop_enabled": { "value": false }, "retraction_hop": { "value": 0.2 }, - "cool_fan_enabled": { "value": true }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_min_layer_time": { "value": 10 }, diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json index 05f34bf8fe..65c0b9067c 100644 --- a/resources/definitions/goofoo_base.def.json +++ b/resources/definitions/goofoo_base.def.json @@ -59,16 +59,13 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, - "speed_print": { "value": 40.0 } , - "speed_infill": { "value": "speed_print" }, + "speed_print": { "value": 40.0 }, "speed_wall": { "value": "speed_print" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, "speed_topbottom": { "value": "speed_print" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "80" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "60" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -77,18 +74,15 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -110,26 +104,20 @@ "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "3 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - - - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" } diff --git a/resources/definitions/hctech_hc300-m1&m1h.def.json b/resources/definitions/hctech_hc300-m1&m1h.def.json index 188ed3e7e7..7a311975e6 100644 --- a/resources/definitions/hctech_hc300-m1&m1h.def.json +++ b/resources/definitions/hctech_hc300-m1&m1h.def.json @@ -36,7 +36,6 @@ "retraction_speed": { "default_value": 35}, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 60.0 } , @@ -48,8 +47,6 @@ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 P1;clean nozzle\nG1 X5 Y300 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" }, "cool_fan_speed": { "value": 75 }, - "cool_fan_enabled": { "value": true }, - "line_width": { "value": 0.38 }, "travel_avoid_distance": { "value": 1 }, "infill_before_walls": { "value": false } diff --git a/resources/definitions/hctech_hc300-m2h.def.json b/resources/definitions/hctech_hc300-m2h.def.json index d08258c7c6..651af04ec6 100644 --- a/resources/definitions/hctech_hc300-m2h.def.json +++ b/resources/definitions/hctech_hc300-m2h.def.json @@ -37,7 +37,6 @@ "retraction_speed": { "default_value": 35}, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 60.0 } , @@ -49,7 +48,6 @@ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 ;clean nozzle\nG1 X5 Y319 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" }, "cool_fan_speed": { "value": 75 }, - "cool_fan_enabled": { "value": true }, "line_width": { "value": 0.38 }, "travel_avoid_distance": { "value": 1 }, diff --git a/resources/definitions/hctech_hc300-m3.def.json b/resources/definitions/hctech_hc300-m3.def.json index cbbae35cfa..10fea4272b 100644 --- a/resources/definitions/hctech_hc300-m3.def.json +++ b/resources/definitions/hctech_hc300-m3.def.json @@ -38,7 +38,6 @@ "retraction_speed": { "default_value": 35}, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 60.0 } , @@ -49,7 +48,6 @@ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 Z1 E-2 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG1 X5 Y290 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z" }, "cool_fan_speed": { "value": 75 }, - "cool_fan_enabled": { "value": true }, "line_width": { "value": 0.38 }, "travel_avoid_distance": { "value": 1 }, diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 584a642ceb..9f9183c99e 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -124,10 +124,9 @@ "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, "speed_print": {"value": "50"}, - "speed_infill": {"value": "speed_print"}, - "speed_wall": {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"}, + "speed_wall": {"value": "(speed_print/ 5 * 3) if speed_print > 45 else speed_print"}, "speed_wall_x": {"value": "speed_wall"}, - "speed_layer_0": {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"}, + "speed_layer_0": {"value": "(speed_print / 5 * 4) if speed_print > 45 else speed_print"}, "speed_topbottom": {"value": "speed_layer_0"}, "speed_travel": {"value": "250"}, "speed_travel_layer_0": {"value": "speed_travel"}, @@ -165,7 +164,6 @@ "skirt_gap": {"value": 1}, "skirt_brim_minimal_length": {"value": 50}, - "prime_tower_enable": {"value": false }, "prime_tower_size": {"value": 20.6 }, "prime_tower_position_x": {"value": 125 }, "prime_tower_position_y": {"value": 70 }, diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 61a543c9cc..42a71ee149 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -151,43 +151,32 @@ "value": "4" }, "default_material_print_temperature": { - "maximum_value_warning": "470", "maximum_value": "470" }, "material_print_temperature": { - "maximum_value_warning": "470", "maximum_value": "470" }, "material_print_temperature_layer_0": { "value": "material_print_temperature", - "maximum_value_warning": "470", "maximum_value": "470" }, "material_initial_print_temperature": { "value": "material_print_temperature", - "maximum_value_warning": "470", "maximum_value": "470" }, "material_final_print_temperature": { "value": "material_print_temperature", - "maximum_value_warning": "470", "maximum_value": "470" }, "default_material_bed_temperature": { - "maximum_value_warning": "150", "maximum_value": "150" }, "material_bed_temperature": { - "maximum_value_warning": "150", "maximum_value": "150" }, "material_bed_temperature_layer_0": { - "maximum_value_warning": "150", "maximum_value": "150" }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall": { "value": "speed_print" }, diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index 4ea97f2527..c78f1fc31a 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -170,15 +170,11 @@ "default_material_bed_temperature": { "maximum_value": "150" }, "speed_print": { "value": 60.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -193,7 +189,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, @@ -230,13 +225,11 @@ "travel_retract_before_outer_wall": { "value": true }, "retraction_amount": { "value": 2 }, - "retraction_enable": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 2 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index 3b3ab06fff..868129109e 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -49,7 +49,6 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -63,33 +62,23 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature": { "value": "55" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "material_print_temperature" }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_z_hop": { "value": 5 }, - - "retraction_enable": { "value": true }, "retraction_amount": { "value": 2.5 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - "support_brim_enable": { "value": true }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index c67209805d..2f8ba71ecf 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -66,7 +66,6 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -79,30 +78,21 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "default_material_bed_temperature": { "value": "55" }, - "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "material_print_temperature" }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_z_hop": { "value": 5 }, - "retraction_enable": { "value": true }, "retraction_amount": { "value": 2.5 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index 7cd82a61aa..d206c9b87a 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -67,8 +67,6 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -82,31 +80,22 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, "default_material_bed_temperature": { "value": "45" }, - "material_flow": { "value": 100 }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_print": { "value": 50.0 } , , "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_z_hop": { "value": 5 }, - "retraction_enable": { "value": true }, "retraction_amount": { "value": 2.5 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - "support_brim_enable": { "value": true }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index 0fc0f3c9ca..0d0d5f0a43 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -87,8 +87,7 @@ "value": true, "enabled": true }, - - "acceleration_enabled": { "value": "True" }, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "4000" }, diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json index 2a2e6f5867..435b3000ab 100644 --- a/resources/definitions/longer_base.def.json +++ b/resources/definitions/longer_base.def.json @@ -60,15 +60,10 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -77,18 +72,15 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -112,8 +104,7 @@ "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, @@ -121,13 +112,12 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'raft'" }, diff --git a/resources/definitions/lotmaxx_sc10.def.json b/resources/definitions/lotmaxx_sc10.def.json index b94c63533c..6700521b53 100644 --- a/resources/definitions/lotmaxx_sc10.def.json +++ b/resources/definitions/lotmaxx_sc10.def.json @@ -14,7 +14,8 @@ "0": "lotmaxx_sc10_extruder_0" } }, - "overrides": { + "overrides": + { "machine_name": { "default_value": "Lotmaxx SC-10" }, "machine_width": { "default_value": 235 }, "machine_depth": { "default_value": 235 }, @@ -23,42 +24,39 @@ "gantry_height": { "value": 40 }, "machine_start_gcode": { "default_value": "; SC-10 Custom Start G-code\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End of custom start GCode" }, "machine_end_gcode": { "default_value": "; SC-10 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z20 ; Move Z Axis up 20 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM84 ; Disable stepper motors\n; End of custom end GCode" }, - "machine_max_jerk_xy":{ "value":10 }, - "machine_max_jerk_z":{ "value":0.4 }, - "machine_max_jerk_e":{ "value":5 }, - "machine_heated_bed":{ "default_value":true }, - "material_diameter":{ "default_value":1.75 }, - "jerk_print":{ "value":8 }, - "jerk_travel":{ "value":"jerk_print" }, - "jerk_travel_layer_0":{ "value":"jerk_travel" }, - "acceleration_enabled":{ "value":false }, - "jerk_enabled":{ "value":false }, - "speed_print":{ "value":60.0 }, - "speed_infill":{ "value":"speed_print * 2" }, - "speed_wall":{ "value":"speed_print / 2" }, - "speed_wall_0":{ "value":"speed_wall" }, - "speed_wall_x":{ "value":"speed_wall" }, - "speed_topbottom":{ "value":"speed_print / 2" }, - "speed_roofing":{ "value":"speed_topbottom" }, - "speed_travel":{ "value":"150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, - "speed_layer_0":{ "value":20.0 }, - "speed_print_layer_0":{ "value":"speed_layer_0" }, - "speed_travel_layer_0":{ "value":"100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, - "speed_prime_tower":{ "value":"speed_topbottom" }, - "speed_support":{ "value":"speed_wall_0" }, - "speed_support_interface":{ "value":"speed_topbottom" }, - "skirt_brim_speed":{ "value":"speed_layer_0" }, - "retraction_enable":{ "value":true }, - "retraction_count_max":{ "value":100 }, - "retraction_extrusion_window":{ "value":10 }, - "retraction_min_travel":{ "value":1.5 }, - "cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled":{ "value":true }, - "cool_min_layer_time":{ "value":10 }, - "meshfix_maximum_resolution":{ "value":"0.25" }, - "meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" }, + "machine_max_jerk_xy":{ "value": 10 }, + "machine_max_jerk_z":{ "value": 0.4 }, + "machine_max_jerk_e":{ "value": 5 }, + "machine_heated_bed":{ "default_value": true }, + "material_diameter":{ "default_value": 1.75 }, + "jerk_print":{ "value": 8 }, + "jerk_travel":{ "value": "jerk_print" }, + "jerk_travel_layer_0":{ "value":" jerk_travel" }, + "acceleration_enabled":{ "value": false }, + "jerk_enabled":{ "value": false }, + "speed_print":{ "value": 60.0 }, + "speed_infill":{ "value": "speed_print * 2" }, + "speed_wall_0":{ "value": "speed_wall" }, + "speed_wall_x":{ "value": "speed_wall" }, + "speed_roofing":{ "value": "speed_topbottom" }, + "speed_travel":{ "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_layer_0":{ "value": 20.0 }, + "speed_travel_layer_0":{ "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_prime_tower":{ "value": "speed_topbottom" }, + "speed_support":{ "value": "speed_wall_0" }, + "speed_support_interface":{ "value": "speed_topbottom" }, + "skirt_brim_speed":{ "value": "speed_layer_0" }, + "retraction_enable":{ "value": true }, + "retraction_count_max":{ "value": 100 }, + "retraction_extrusion_window":{ "value": 10 }, + "retraction_min_travel":{ "value": 1.5 }, + "cool_fan_full_at_height":{ "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled":{ "value": true }, + "cool_min_layer_time":{ "value": 10 }, + "meshfix_maximum_resolution":{ "value": "0.25" }, + "meshfix_maximum_travel_resolution":{ "value": "meshfix_maximum_resolution" }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "skirt_gap":{ "value":5.0 }, - "skirt_line_count":{ "value":4 } + "skirt_gap":{ "value": 5.0 }, + "skirt_line_count":{ "value": 4 } } } diff --git a/resources/definitions/lotmaxx_sc20.def.json b/resources/definitions/lotmaxx_sc20.def.json index f96cb0839a..1aa982430d 100644 --- a/resources/definitions/lotmaxx_sc20.def.json +++ b/resources/definitions/lotmaxx_sc20.def.json @@ -35,14 +35,11 @@ "jerk_enabled":{ "value":false }, "speed_print":{ "value":60.0 }, "speed_infill":{ "value":"speed_print * 2" }, - "speed_wall":{ "value":"speed_print / 2" }, "speed_wall_0":{ "value":"speed_wall" }, "speed_wall_x":{ "value":"speed_wall" }, - "speed_topbottom":{ "value":"speed_print / 2" }, "speed_roofing":{ "value":"speed_topbottom" }, "speed_travel":{ "value":"150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0":{ "value":20.0 }, - "speed_print_layer_0":{ "value":"speed_layer_0" }, "speed_travel_layer_0":{ "value":"100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower":{ "value":"speed_topbottom" }, "speed_support":{ "value":"speed_wall_0" }, diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index c8eb4eb654..2eeef96cbd 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -28,7 +28,6 @@ "speed_wall_x": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" }, - "speed_infill": { "value": "speed_print" }, "speed_topbottom": {"value": "speed_print / 2"}, "layer_height": @@ -80,7 +79,6 @@ "retraction_amount" : { "default_value": 4.5}, "retraction_speed" : { "default_value": 40}, "coasting_enable": { "default_value": true }, - "prime_tower_enable": { "default_value": false}, "speed_z_hop": {"default_value": 1.5} } } diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index ce80fda7c4..169adc8b85 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -108,15 +108,10 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 60.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -131,7 +126,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, @@ -168,13 +162,12 @@ "travel_retract_before_outer_wall": { "value": true }, "retraction_amount": { "value": 2 }, - "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index 12e55444cf..b467f8e98c 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -241,12 +241,6 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "speed_infill": { - "value": "speed_print" - }, - "speed_wall": { - "value": "speed_print / 2" - }, "speed_wall_0": { "value": "speed_wall" }, @@ -262,9 +256,6 @@ "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, - "speed_print_layer_0": { - "value": "speed_layer_0" - }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index b205f03cc8..bc592ccff8 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -113,7 +113,7 @@ "travel_avoid_other_parts": { "value": "False" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_density": { "value": 70 }, "minimum_interface_area": { "value": 5.0 }, "minimum_support_area": { "value": 5 }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 6f04cdd93c..6b280a6c7b 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -28,9 +28,6 @@ "overrides": { "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, - "speed_infill": { - "value": "speed_print" - }, "infill_sparse_density": { "value": 100 }, diff --git a/resources/definitions/tank_m_base.def.json b/resources/definitions/tank_m_base.def.json index 41387fad7e..b3e0bcfb86 100644 --- a/resources/definitions/tank_m_base.def.json +++ b/resources/definitions/tank_m_base.def.json @@ -49,7 +49,6 @@ "acceleration_print": { "value": 2500 }, "acceleration_travel": { "value": 2500 }, - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -63,33 +62,23 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature": { "value": "55" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "material_print_temperature" }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_travel": { "value": "120.0 if speed_print < 60 else 300.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_z_hop": { "value": 5 }, - "retraction_enable": { "value": true }, "retraction_amount": { "value": 1.0 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - "support_brim_enable": { "value": true }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, diff --git a/resources/definitions/trimaker_nebula_plus.def.json b/resources/definitions/trimaker_nebula_plus.def.json index 71fb729c0f..0a2983e67e 100644 --- a/resources/definitions/trimaker_nebula_plus.def.json +++ b/resources/definitions/trimaker_nebula_plus.def.json @@ -32,7 +32,6 @@ "machine_acceleration": { "default_value": 3000 }, "machine_extruder_count": { "default_value": 1 }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_print": { "value": "4000" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 9665ca0f4f..488316ded2 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -46,15 +46,12 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 60.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print *0.75" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_wall": { "value": "speed_print * 0.75" }, "speed_wall_x": { "value": "speed_wall" }, "speed_topbottom": { "value": "speed_print * 0.5" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" }, "speed_layer_0": { "value": 30.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -63,7 +60,6 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, @@ -74,8 +70,7 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -105,8 +100,7 @@ "travel_avoid_other_parts": { "value": false }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retraction_enable": { "value": true }, + "retract_at_layer_change": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 5 }, @@ -114,7 +108,6 @@ "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, @@ -140,8 +133,7 @@ "support_wall_count": { "value": 0 }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 4 }, - - "support_interface_enable": { "value": false }, + , "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json index b672a2f4cd..f6918c6121 100644 --- a/resources/definitions/two_trees_base.def.json +++ b/resources/definitions/two_trees_base.def.json @@ -32,15 +32,10 @@ "material_diameter": { "default_value": 1.75 }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_print": { "value": 50.0 }, "speed_wall_x": { "value": "speed_print / 1.5" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, @@ -48,14 +43,12 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -65,24 +58,20 @@ "fill_outline_gaps": { "value": false }, - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_speed": { "default_value" : 40 }, "retraction_amount": { "default_value" : 7 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, - "cool_fan_full_layer": { "value": "2" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, @@ -108,7 +97,6 @@ "support_brim_enable": { "value": true }, "support_brim_width": { "value": 5 }, - "support_interface_enable": { "value": false }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 8ccbd7f380..adb5efadcf 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -57,8 +57,6 @@ "infill_wipe_dist": { "value": "0" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, - "speed_infill": { "value": "speed_print" }, - "speed_wall_x": { "value": "speed_wall" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "optimize_wall_printing_order": { "value": "True" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index ddb02b7810..97a83c5ee7 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -82,7 +82,6 @@ "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 5ccbc2c5a0..5d1464396f 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -75,7 +75,6 @@ "value": "150" }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 9eb00e6155..314da546de 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -77,7 +77,6 @@ "value": "150" }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index 9fb5cad2d8..305dd8b765 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -215,7 +215,6 @@ "infill_overlap": { "value": 30.0 }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_wipe_dist": { "value": 0.0 }, - "infill_sparse_density": { "value": "20" }, "infill_before_walls": { "value": false }, "jerk_enabled": { "value": false }, "jerk_print": { "value": 11 }, @@ -223,41 +222,32 @@ "jerk_wall": { "value": "jerk_print - 2" }, "jerk_travel": { "value": 18 }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - "layer_height_0": { "value": "round(layer_height * 1.5, 2)" }, - "line_width": { "value": "machine_nozzle_size" }, + "layer_height_0": { "value": "round(layer_height * 1.5, 2)" }, "machine_min_cool_heat_time_window": { "default_value": 360 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, "machine_center_is_zero": { "default_value": false }, "material_diameter": { "default_value": 1.75 }, - "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "100" }, - "material_print_temp_prepend": { "default_value":false }, - "prime_tower_enable": { "default_value": false }, + "material_print_temp_prepend": { "default_value": false }, "raft_airgap": { "default_value": 0.22 }, "raft_base_speed":{ "value": 20 }, "raft_interface_speed": { "value": 33 }, "raft_margin": { "default_value": 8 }, - "retraction_enable": { "value": true }, + "retraction_amount": { "default_value": 4.5 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 8 }, "retraction_hop": { "value": 0.5 }, - "retraction_hop_enabled": { "value": "False" }, "retraction_min_travel": { "value": 1.5 }, "skin_overlap": { "value": 10.0 }, "speed_layer_0": { "value": "round(speed_print / 2.5, 2)" }, "speed_print": { "value": 50.0 }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_print" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_infill": { "value": "speed_print" }, "speed_support_infill": { "value": 58.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": 60 }, "speed_support_roof": { "value": 39.0 }, "speed_support_bottom": { "value": 39.0 }, diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 746b9ce2fe..d365cb2672 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -40,7 +40,6 @@ "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nM9998\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F800 X585 E12\nG92 E0" }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "1800" }, @@ -69,11 +68,11 @@ "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "wall_thickness": { "value": "2.4"}, - "line_width": { "value": "extruderValue(-1,'machine_nozzle_size')" }, + "line_width": { "value": "extruderValue(-1, 'machine_nozzle_size')" }, "wall_0_inset": { "value": "0.05" }, "wall_line_width_x": { "value": "line_width" }, "wall_line_width_0": { "value": "line_width-0.05" }, - "support_line_width": { "value": "max(min(line_width,0.4),line_width/2)" }, + "support_line_width": { "value": "max(min(line_width, 0.4),line_width / 2)" }, "support_interface_line_width": { "value": "support_line_width" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, @@ -99,33 +98,32 @@ "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "25" }, "speed_print": { "value": "70" }, - "speed_support": { "value": "speed_print*line_width/support_line_width" }, - "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" }, - "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" }, + "speed_support": { "value": "speed_print * line_width / support_line_width" }, + "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" }, + "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" }, "speed_travel": { "value": "100" }, - "speed_infill": { "value": "speed_print*line_width/infill_line_width" }, - "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, + "speed_wall": { "value": "speed_print * wall_line_width_0 / line_width" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" }, "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": "50" }, "support_xy_distance": { "value": "1" }, - "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" }, - "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" }, - "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, + "support_z_distance": { "value": "max((0.2 if(0.2 % layer_height == 0) else layer_height * int((0.2 + layer_height) / layer_height)), layer_height)" }, + "support_bottom_distance": { "value": "max(support_z_distance, layer_height * int(0.45 / layer_height))" }, + "top_bottom_thickness": { "value": "max(1.2, layer_height * 6)" }, "travel_avoid_distance": { "value": "3" }, "gradual_support_infill_step_height": { "value": "0.2" }, "gradual_support_infill_steps": { "value": "1" }, - "infill_sparse_density": { "value": "20" }, "gradual_infill_step_height": { "value": "1" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_travel": { "value": "25" }, "support_bottom_enable": { "value": "True" }, - "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, + "support_bottom_height": { "value": "max((0.15 if(0.15 % layer_height == 0) else layer_height * int((0.15 + layer_height) / layer_height)), layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, "z_seam_type": { "value": "'shortest'" } diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index 903142010b..73c6562edd 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -40,7 +40,6 @@ "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F1000 Z3\nG1 F4000 X0\nG1 F4000 Y0\nG1 F1000 Z0.2\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "2000" }, @@ -99,23 +98,22 @@ "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_print": { "value": "50" }, - "speed_support": { "value": "speed_print*line_width/support_line_width" }, - "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" }, - "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" }, + "speed_support": { "value": "speed_print * line_width / support_line_width" }, + "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" }, + "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" }, "speed_travel": { "value": "90" }, - "speed_infill": { "value": "speed_print*line_width/infill_line_width" }, - "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, + "speed_wall": { "value": "speed_print * wall_line_width_0 /line_width" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" }, "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": "50" }, "support_xy_distance": { "value": "1" }, - "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" }, + "support_z_distance": { "value": "max((0.2 if(0.2 % layer_height==0) else layer_height * int((0.2 + layer_height) / layer_height)), layer_height)" }, "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" }, "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, "travel_avoid_distance": { "value": "3" }, "gradual_support_infill_step_height": { "value": "0.2" }, "gradual_support_infill_steps": { "value": "1" }, - "infill_sparse_density": { "value": "20" }, "gradual_infill_step_height": { "value": "1" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_travel": { "value": "25" }, @@ -125,7 +123,7 @@ "support_connect_zigzags": { "value": "False" }, "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, "z_seam_type": { "value": "'shortest'" } diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 055967f8ab..5fa6fe7eb6 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -88,33 +88,32 @@ "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_print": { "value": "52" }, - "speed_support": { "value": "speed_print*line_width/support_line_width" }, - "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" }, - "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" }, + "speed_support": { "value": "speed_print * line_width / support_line_width" }, + "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" }, + "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" }, "speed_travel": { "value": "80" }, - "speed_infill": { "value": "speed_print*line_width/infill_line_width" }, - "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, + "speed_wall": { "value": "speed_print * wall_line_width_0 / line_width" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" }, "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": "50" }, "support_xy_distance": { "value": "1" }, - "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" }, - "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" }, + "support_z_distance": { "value": "max((0.2 if(0.2 % layer_height == 0) else layer_height * int((0.2 + layer_height) / layer_height)), layer_height)" }, + "support_bottom_distance": { "value": "max(support_z_distance,layer_height * int(0.45 / layer_height))" }, "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, "travel_avoid_distance": { "value": "3" }, "gradual_support_infill_step_height": { "value": "0.2" }, "gradual_support_infill_steps": { "value": "1" }, - "infill_sparse_density": { "value": "20" }, "gradual_infill_step_height": { "value": "1" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_travel": { "value": "25" }, - "support_bottom_enable": { "value": "True" }, + "support_bottom_enable": { "value": true }, "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, - "support_connect_zigzags": { "value": "False" }, + "support_connect_zigzags": { "value": false }, "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, "z_seam_type": { "value": "'shortest'" }