Browse Source

Applied printer-linter format

jellespijker 2 years ago
parent
commit
99d47fe772

+ 45 - 64
resources/definitions/flsun_v400.def.json

@@ -1,64 +1,45 @@
-{
-    "version": 2,
-    "name": "Flsun V400",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": true,
-        "author": "FLSUN, Guislain Cyril",
-        "manufacturer": "Flsun",
-        "file_formats": "text/x-gcode",
-	"platform": "flsun_v400.stl",
-        "platform_offset": [0,-40.6455,-43.5],
-        "has_materials": true,
-        "has_machine_quality": true,
-        "machine_extruder_trains": {
-            "0": "flsun_v400_extruder_0"
-        }
-    },
-    "overrides": {
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_width": {
-            "default_value": 300
-        },
-	"machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 410
-        },
-         "machine_center_is_zero": {
-            "default_value": true
-        },
-        "machine_head_with_fans_polygon": {
-            "default_value": [
-                [0, 0],
-                [0, 0],
-                [0, 0],
-                [0, 0]
-            ]
-        },
-        "z_seam_type": {
-            "value": "'back'"
-        },
-        "gantry_height": {
-            "value": "0"
-        },
-        "machine_shape": {
-            "default_value": "elliptic"
-        },
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "infill_sparse_density": {
-            "default_value": 15
-        },
-        "machine_start_gcode": {
-            "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG1 F3000 Z1\nG1 X-150 Y0 Z0.4\nG92 E0\nG3 X0 Y-130 I150 Z0.3 E30 F2000\nG92 E0\n"
-        },
-        "machine_end_gcode": {
-            "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300\nG1 Z+0.5  F6000\nG28 \nG90 ;absolute positioning\n"
-        }
-    }
-}
+{
+    "version": 2,
+    "name": "Flsun V400",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "FLSUN, Guislain Cyril",
+        "manufacturer": "Flsun",
+        "file_formats": "text/x-gcode",
+        "platform": "flsun_v400.stl",
+        "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "flsun_v400_extruder_0" },
+        "platform_offset": [
+            0,
+            -40.6455,
+            -43.5
+        ]
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": "0" },
+        "infill_sparse_density": { "default_value": 15 },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300\nG1 Z+0.5  F6000\nG28 \nG90 ;absolute positioning\n" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [0, 0],
+                [0, 0],
+                [0, 0],
+                [0, 0]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 410 },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG1 F3000 Z1\nG1 X-150 Y0 Z0.4\nG92 E0\nG3 X0 Y-130 I150 Z0.3 E30 F2000\nG92 E0\n" },
+        "machine_width": { "default_value": 300 },
+        "material_diameter": { "default_value": 1.75 },
+        "z_seam_type": { "value": "'back'" }
+    }
+}

+ 7 - 9
resources/extruders/flsun_v400_extruder_0.def.json

@@ -2,16 +2,14 @@
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
-    "metadata": {
+    "metadata":
+    {
         "machine": "flsun_v400",
         "position": "0"
     },
-    "overrides": {
-        "extruder_nr": { 
-            "default_value": 0 
-        },
-        "material_diameter": { 
-            "default_value": 1.75 
-        }
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "material_diameter": { "default_value": 1.75 }
     }
-}
+}

+ 126 - 125
resources/quality/flsun_v400/flsun_v400_normal.inst.cfg

@@ -1,125 +1,126 @@
-[general]
-version = 4
-name = Normal
-definition = flsun_v400
-
-[metadata]
-setting_version = 20
-type = quality
-quality_type = normal
-weight = -2
-global_quality = True
-
-[values]
-layer_height = 0.2
-layer_height_0 = 0.3
-retraction_combing = noskin
-retraction_combing_max_distance = 10
-travel_retract_before_outer_wall = False
-adhesion_type = brim
-skirt_line_count = 2
-cool_fan_speed = 100
-cool_lift_head = False
-cool_min_layer_time = 5
-infill_before_walls = False
-infill_enable_travel_optimization = False
-infill_support_angle = 50
-ironing_enabled = False
-max_skin_angle_for_expansion = 90
-retract_at_layer_change = False
-retraction_amount = 0.6
-retraction_hop_only_when_collides = False
-skin_no_small_gaps_heuristic = False
-skin_overlap = 10
-small_hole_max_size = 5.0
-support_enable = False
-support_type = everywhere
-support_wall_count = 1
-support_angle = 65
-support_brim_enable = True
-support_brim_width = 8.8
-support_interface_density = 70
-support_interface_enable = True
-support_interface_height = 0.6
-support_interface_pattern = lines
-support_interface_skip_height = 0.2
-support_roof_density = 70
-support_xy_distance = 0.5
-support_z_distance = 0.2
-support_use_towers = False
-support_xy_overrides_z = xy_overrides_z
-speed_support = 350
-speed_support_interface = 100
-minimum_interface_area = 2.0
-minimum_support_area = 2.0
-top_bottom_thickness = 0.6
-travel_avoid_other_parts = True
-travel_avoid_supports = True
-acceleration_enabled = True
-infill_pattern = grid
-ironing_only_highest_layer = True
-material_flow_dependent_temperature = False
-material_initial_print_temperature = 210
-material_final_print_temperature = 210
-material_print_temperature = 210
-material_print_temperature_layer_0 = 210
-material_bed_temperature = 60
-material_bed_temperature_layer_0 = 60
-retraction_hop = 0.3
-retraction_hop_enabled = True
-retraction_speed = 40
-small_feature_speed_factor = 60.0
-wall_thickness = =line_width*2
-z_seam_corner = z_seam_corner_inner
-z_seam_type = sharpest_corner
-bridge_settings_enabled = True
-acceleration_print = 8000.0
-acceleration_topbottom = 6000.0
-acceleration_travel = 8000.0
-acceleration_wall = 5000.0
-bridge_enable_more_layers = False
-bridge_skin_material_flow = 60
-bridge_skin_speed = 60
-bridge_skin_support_threshold = 50
-bridge_wall_material_flow = 100.0
-bridge_wall_speed = 60
-brim_width = 6.6
-cool_fan_full_at_height = 0.6
-infill_sparse_density = 10.0
-jerk_enabled = True
-jerk_infill = 100.0
-jerk_layer_0 = 10.0
-jerk_print = 10.0
-jerk_roofing = 10.0
-jerk_support_interface = 10.0
-jerk_topbottom = 10.0
-jerk_travel = 100.0
-jerk_wall = 10.0
-jerk_wall_0 = 5.0
-line_width = 0.44
-optimize_wall_printing_order = True
-raft_speed = 75.0
-roofing_layer_count = 1
-speed_infill = 350.0
-speed_layer_0 = 25
-speed_print = 400.0
-speed_roofing = 120.0
-speed_topbottom = 120.0
-speed_travel = 400.0
-speed_travel_layer_0 = 50.0
-speed_wall = 120.0
-speed_wall_x = 280.0
-speed_z_hop = 50.0
-support_infill_rate = 10
-support_pattern = zigzag
-top_layers = =0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))
-top_thickness = 1
-wall_overhang_angle = 35.0
-wall_overhang_speed_factor = 60.0
-z_seam_position = backright
-zig_zaggify_infill = True
-expand_skins_expand_distance = 0.8
-skin_preshrink = 0.8
-skin_monotonic = True
-fill_outline_gaps = False
-inset_direction = inside_out
+[general]
+definition = flsun_v400
+name = Normal
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = normal
+setting_version = 20
+type = quality
+weight = -2
+
+[values]
+acceleration_enabled = True
+acceleration_print = 8000.0
+acceleration_topbottom = 6000.0
+acceleration_travel = 8000.0
+acceleration_wall = 5000.0
+adhesion_type = brim
+bridge_enable_more_layers = False
+bridge_settings_enabled = True
+bridge_skin_material_flow = 60
+bridge_skin_speed = 60
+bridge_skin_support_threshold = 50
+bridge_wall_material_flow = 100.0
+bridge_wall_speed = 60
+brim_width = 6.6
+cool_fan_full_at_height = 0.6
+cool_fan_speed = 100
+cool_lift_head = False
+cool_min_layer_time = 5
+expand_skins_expand_distance = 0.8
+fill_outline_gaps = False
+infill_before_walls = False
+infill_enable_travel_optimization = False
+infill_pattern = grid
+infill_sparse_density = 10.0
+infill_support_angle = 50
+inset_direction = inside_out
+ironing_enabled = False
+ironing_only_highest_layer = True
+jerk_enabled = True
+jerk_infill = 100.0
+jerk_layer_0 = 10.0
+jerk_print = 10.0
+jerk_roofing = 10.0
+jerk_support_interface = 10.0
+jerk_topbottom = 10.0
+jerk_travel = 100.0
+jerk_wall = 10.0
+jerk_wall_0 = 5.0
+layer_height = 0.2
+layer_height_0 = 0.3
+line_width = 0.44
+material_bed_temperature = 60
+material_bed_temperature_layer_0 = 60
+material_final_print_temperature = 210
+material_flow_dependent_temperature = False
+material_initial_print_temperature = 210
+material_print_temperature = 210
+material_print_temperature_layer_0 = 210
+max_skin_angle_for_expansion = 90
+minimum_interface_area = 2.0
+minimum_support_area = 2.0
+optimize_wall_printing_order = True
+raft_speed = 75.0
+retract_at_layer_change = False
+retraction_amount = 0.6
+retraction_combing = noskin
+retraction_combing_max_distance = 10
+retraction_hop = 0.3
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = False
+retraction_speed = 40
+roofing_layer_count = 1
+skin_monotonic = True
+skin_no_small_gaps_heuristic = False
+skin_overlap = 10
+skin_preshrink = 0.8
+skirt_line_count = 2
+small_feature_speed_factor = 60.0
+small_hole_max_size = 5.0
+speed_infill = 350.0
+speed_layer_0 = 25
+speed_print = 400.0
+speed_roofing = 120.0
+speed_support = 350
+speed_support_interface = 100
+speed_topbottom = 120.0
+speed_travel = 400.0
+speed_travel_layer_0 = 50.0
+speed_wall = 120.0
+speed_wall_x = 280.0
+speed_z_hop = 50.0
+support_angle = 65
+support_brim_enable = True
+support_brim_width = 8.8
+support_enable = False
+support_infill_rate = 10
+support_interface_density = 70
+support_interface_enable = True
+support_interface_height = 0.6
+support_interface_pattern = lines
+support_interface_skip_height = 0.2
+support_pattern = zigzag
+support_roof_density = 70
+support_type = everywhere
+support_use_towers = False
+support_wall_count = 1
+support_xy_distance = 0.5
+support_xy_overrides_z = xy_overrides_z
+support_z_distance = 0.2
+top_bottom_thickness = 0.6
+top_layers = =0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))
+top_thickness = 1
+travel_avoid_other_parts = True
+travel_avoid_supports = True
+travel_retract_before_outer_wall = False
+wall_overhang_angle = 35.0
+wall_overhang_speed_factor = 60.0
+wall_thickness = =line_width*2
+z_seam_corner = z_seam_corner_inner
+z_seam_position = backright
+z_seam_type = sharpest_corner
+zig_zaggify_infill = True
+