Browse Source

Applied printer-linter format

Joeydelarago 2 years ago
parent
commit
63108dd9f6

+ 100 - 80
resources/definitions/gutenberg_base.def.json

@@ -1,95 +1,115 @@
 {
-    "name": "Gutenberg Base",
     "version": 2,
+    "name": "Gutenberg Base",
     "inherits": "fdmprinter",
-    "metadata": 
+    "metadata":
     {
         "visible": false,
         "author": "Gutenberg Dev",
         "manufacturer": "Gutenberg",
         "file_formats": "text/x-gcode",
-        "first_start_actions": ["MachineSettingsAction"],
-        "preferred_quality_type": "normal",
+        "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "machine_extruder_trains": { "0": "gutenberg_extruder_0" },
-        "preferred_material": "generic_abs"
+        "preferred_material": "generic_abs",
+        "preferred_quality_type": "normal"
     },
     "overrides":
     {
-        "machine_name":                                 { "default_value": "GUTENBERG 3DP" },
-        "machine_width":                                { "default_value": 165 },
-        "machine_depth":                                { "default_value": 165 },
-        "machine_height":                               { "default_value": 165 },
-        "material_diameter":                            { "default_value": 1.75 },
-        "gantry_height":                                { "value": 30 },
+        "acceleration_enabled": { "default_value": true },
+        "acceleration_layer_0": { "value": 10000 },
+        "acceleration_print": { "default_value": 15000 },
+        "acceleration_roofing": { "value": 10000 },
+        "acceleration_travel_layer_0": { "value": 10000 },
+        "acceleration_wall_0": { "value": 7500 },
+        "adhesion_type": { "default_value": "skirt" },
+        "alternate_extra_perimeter": { "default_value": true },
+        "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" },
+        "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" },
+        "bridge_settings_enabled": { "default_value": true },
+        "bridge_wall_coast": { "default_value": 10 },
+        "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" },
+        "cool_fan_full_layer": { "value": 4 },
+        "cool_min_layer_time": { "default_value": 15 },
+        "cool_min_layer_time_fan_speed_max": { "default_value": 20 },
+        "gantry_height": { "value": 30 },
+        "infill_before_walls": { "default_value": false },
+        "infill_enable_travel_optimization": { "default_value": true },
+        "jerk_roofing": { "value": 10 },
+        "jerk_wall_0": { "value": 10 },
+        "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" },
+        "line_width": { "value": "machine_nozzle_size * 1.125" },
+        "machine_acceleration": { "default_value": 1500 },
+        "machine_depth": { "default_value": 165 },
+        "machine_end_gcode": { "default_value": "END_PRINT" },
+        "machine_endstop_positive_direction_x": { "default_value": true },
+        "machine_endstop_positive_direction_y": { "default_value": true },
+        "machine_endstop_positive_direction_z": { "default_value": false },
+        "machine_feeder_wheel_diameter": { "default_value": 7.5 },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-35, 65],
+                [-35, -50],
+                [35, -50],
+                [35, 65]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 165 },
+        "machine_max_acceleration_x": { "default_value": 15000 },
+        "machine_max_acceleration_y": { "default_value": 15000 },
+        "machine_max_acceleration_z": { "default_value": 250 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_max_jerk_e": { "default_value": 60 },
+        "machine_name": { "default_value": "GUTENBERG 3DP" },
+        "machine_start_gcode": { "default_value": ";Simple\nSTART_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0}\n;Or with custom bed mesh area\n;START_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} AREA_START=%MINX%,%MINY% AREA_END=%MAXX%,%MAXY% FILAMENT_TYPE={material_type}" },
+        "machine_steps_per_mm_x": { "default_value": 160 },
+        "machine_steps_per_mm_y": { "default_value": 160 },
+        "machine_steps_per_mm_z": { "default_value": 800 },
         "machine_use_extruder_offset_to_offset_coords": { "value": false },
-        "machine_heated_bed":                           { "default_value": true },
-        "machine_max_acceleration_x":                   { "default_value": 15000 },
-        "machine_max_acceleration_y":                   { "default_value": 15000 },
-        "machine_max_acceleration_z":                   { "default_value": 250 },
-        "machine_acceleration":                         { "default_value": 1500 },
-        "machine_max_jerk_e":                           { "default_value": 60 },
-        "machine_steps_per_mm_x":                       { "default_value": 160 },
-        "machine_steps_per_mm_y":                       { "default_value": 160 },
-        "machine_steps_per_mm_z":                       { "default_value": 800 },
-        "machine_endstop_positive_direction_x":         { "default_value": true },
-        "machine_endstop_positive_direction_y":         { "default_value": true },
-        "machine_endstop_positive_direction_z":         { "default_value": false },
-        "machine_feeder_wheel_diameter":                { "default_value": 7.5 },
-        "machine_head_with_fans_polygon":               { "default_value": [ [-35, 65], [-35, -50], [35, -50], [35, 65] ] },
-        "machine_max_feedrate_z":                       { "default_value": 40 },
-        "machine_max_feedrate_e":                       { "default_value": 120 },
-        "machine_start_gcode":                          { "default_value": ";Simple\nSTART_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0}\n;Or with custom bed mesh area\n;START_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} AREA_START=%MINX%,%MINY% AREA_END=%MAXX%,%MAXY% FILAMENT_TYPE={material_type}" },
-        "machine_end_gcode":                            { "default_value": "END_PRINT" },
-        "adhesion_type":                                { "default_value": "skirt" },
-        "retraction_amount":                            { "default_value": 0.80 },
-        "skirt_brim_minimal_length":                    { "default_value": 550 },
-        "retraction_speed":                             { "default_value": 35, "maximum_value_warning": 130 },
-        "retraction_retract_speed":                     { "maximum_value_warning": 130 },
-        "retraction_prime_speed":                       { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 },
-        "retraction_hop_enabled":                       { "default_value": true },
-        "retraction_hop":                               { "default_value": 0.2 },
-        "retraction_combing":                           { "value": "'noskin'" },
-        "retraction_combing_max_distance":              { "default_value": 10 },
-        "travel_avoid_other_parts":                     { "default_value": false },
-        "speed_travel":                                 { "value": 300, "maximum_value_warning": 501 },
-        "speed_travel_layer_0":                         { "value": "math.ceil(speed_travel * 0.4)" },
-        "speed_layer_0":                                { "value": "math.ceil(speed_print * 0.25)" },
-        "speed_wall":                                   { "value": "math.ceil(speed_print * 0.33)" },
-        "speed_wall_0":                                 { "value": "math.ceil(speed_print * 0.33)" },
-        "speed_wall_x":                                 { "value": "math.ceil(speed_print * 0.66)" },
-        "speed_topbottom":                              { "value": "math.ceil(speed_print * 0.33)" },
-        "speed_roofing":                                { "value": "math.ceil(speed_print * 0.33)" },
-        "speed_slowdown_layers":                        { "default_value": 4 },
-        "roofing_layer_count":                          { "value": 1 },
-        "optimize_wall_printing_order":                 { "default_value": true },
-        "infill_enable_travel_optimization":            { "default_value": true },
-        "minimum_polygon_circumference":                { "default_value": 0.2 },
-        "wall_overhang_angle":                          { "default_value": 75 },
-        "wall_overhang_speed_factor":                   { "default_value": 50 },
-        "bridge_settings_enabled":                      { "default_value": true },
-        "bridge_wall_coast":                            { "default_value": 10 },
-        "bridge_fan_speed_2":                           { "resolve": "max(cool_fan_speed, 50)" },
-        "bridge_fan_speed_3":                           { "resolve": "max(cool_fan_speed, 20)" },
-        "alternate_extra_perimeter":                    { "default_value": true },
-        "cool_min_layer_time_fan_speed_max":            { "default_value": 20 },
-        "cool_min_layer_time":                          { "default_value": 15 },
-        "cool_fan_full_at_height":                      { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" },
-        "cool_fan_full_layer":                          { "value": 4 },
-        "layer_height_0":                               { "resolve": "max(0.2, min(extruderValues('layer_height')))" },
-        "line_width":                                   { "value": "machine_nozzle_size * 1.125" },
-        "wall_line_width":                              { "value": "machine_nozzle_size" },
-        "meshfix_maximum_resolution":                   { "default_value": 0.01 },
-        "infill_before_walls":                          { "default_value": false },
-        "zig_zaggify_infill":                           { "value": true },
-        "min_infill_area":                              { "default_value": 5.0 },
-        "acceleration_enabled":                         { "default_value": true },
-        "acceleration_print":                           { "default_value": 15000 },
-        "acceleration_wall_0":                          { "value": 7500 },
-        "acceleration_layer_0":                         { "value": 10000 },
-        "acceleration_travel_layer_0":                  { "value": 10000 },
-        "acceleration_roofing":                         { "value": 10000 },
-        "jerk_wall_0":                                  { "value": 10 },
-        "jerk_roofing":                                 { "value": 10 }
+        "machine_width": { "default_value": 165 },
+        "material_diameter": { "default_value": 1.75 },
+        "meshfix_maximum_resolution": { "default_value": 0.01 },
+        "min_infill_area": { "default_value": 5.0 },
+        "minimum_polygon_circumference": { "default_value": 0.2 },
+        "optimize_wall_printing_order": { "default_value": true },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_combing_max_distance": { "default_value": 10 },
+        "retraction_hop": { "default_value": 0.2 },
+        "retraction_hop_enabled": { "default_value": true },
+        "retraction_prime_speed":
+        {
+            "maximum_value_warning": 130,
+            "value": "math.ceil(retraction_speed * 0.4)"
+        },
+        "retraction_retract_speed": { "maximum_value_warning": 130 },
+        "retraction_speed":
+        {
+            "default_value": 35,
+            "maximum_value_warning": 130
+        },
+        "roofing_layer_count": { "value": 1 },
+        "skirt_brim_minimal_length": { "default_value": 550 },
+        "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" },
+        "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" },
+        "speed_slowdown_layers": { "default_value": 4 },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" },
+        "speed_travel":
+        {
+            "maximum_value_warning": 501,
+            "value": 300
+        },
+        "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" },
+        "speed_wall": { "value": "math.ceil(speed_print * 0.33)" },
+        "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" },
+        "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" },
+        "travel_avoid_other_parts": { "default_value": false },
+        "wall_line_width": { "value": "machine_nozzle_size" },
+        "wall_overhang_angle": { "default_value": 75 },
+        "wall_overhang_speed_factor": { "default_value": 50 },
+        "zig_zaggify_infill": { "value": true }
     }
-}
+}

+ 6 - 6
resources/definitions/gutenberg_gzero.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "G-ZERO",
     "version": 2,
+    "name": "G-ZERO",
     "inherits": "gutenberg_base",
     "metadata":
     {
@@ -9,9 +9,9 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "G-ZERO" },
-        "machine_width":    { "default_value": 250 },
-        "machine_depth":    { "default_value": 200 },
-        "machine_height":   { "default_value": 201 }
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 201 },
+        "machine_name": { "default_value": "G-ZERO" },
+        "machine_width": { "default_value": 250 }
     }
-}
+}

+ 7 - 4
resources/extruders/gutenberg_extruder_0.def.json

@@ -7,10 +7,13 @@
         "machine": "gutenberg_base",
         "position": "0"
     },
-
     "overrides":
     {
-        "extruder_nr":              { "default_value": 0, "maximum_value": 1 },
-        "material_diameter":        { "default_value": 1.75 }
+        "extruder_nr":
+        {
+            "default_value": 0,
+            "maximum_value": 1
+        },
+        "material_diameter": { "default_value": 1.75 }
     }
-}
+}

+ 11 - 11
resources/quality/gutenberg/gutenberg_global_fast_quality.inst.cfg

@@ -1,34 +1,32 @@
-
 [general]
-version = 4
-name = Fast
 definition = gutenberg_base
+name = Fast
+version = 4
 
 [metadata]
+global_quality = True
+quality_type = fast
 setting_version = 20
 type = quality
-quality_type = fast
-global_quality = True
 
 [values]
 acceleration_enabled = True
-adhesion_type = skirt
-layer_height = 0.2
-layer_height_0 = 0.2
-retraction_combing = noskin
-support_enable = False
 acceleration_print = 15000
 acceleration_roofing = 10000
 acceleration_topbottom = 10000
 acceleration_travel = 15000
 acceleration_wall = 15000
 acceleration_wall_0 = 10000
+adhesion_type = skirt
 alternate_extra_perimeter = False
 infill_line_width = 0.5
 infill_pattern = lines
 infill_sparse_density = 10
+layer_height = 0.2
+layer_height_0 = 0.2
 optimize_wall_printing_order = True
 retraction_amount = 0.8
+retraction_combing = noskin
 retraction_hop = 0.2
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
@@ -49,9 +47,11 @@ speed_wall = 100
 speed_wall_0 = 100
 speed_wall_x = 150
 support_angle = 46
+support_enable = False
 top_bottom_thickness = 0.6
 travel_avoid_supports = True
 wall_line_width = 0.45
 wall_line_width_0 = 0.4
 wall_thickness = 1.25
-zig_zaggify_infill = True
+zig_zaggify_infill = True
+

+ 11 - 11
resources/quality/gutenberg/gutenberg_global_fine_quality.inst.cfg

@@ -1,36 +1,34 @@
-
 [general]
-version = 4
-name = Fine
 definition = gutenberg_base
+name = Fine
+version = 4
 
 [metadata]
+global_quality = True
+quality_type = fine
 setting_version = 20
 type = quality
-quality_type = fine
-global_quality = True
 
 [values]
 acceleration_enabled = True
-adhesion_type = skirt
-layer_height = 0.2
-layer_height_0 = 0.2
-retraction_combing = noskin
-support_enable = False
 acceleration_print = 15000
 acceleration_roofing = 10000
 acceleration_topbottom = 10000
 acceleration_travel = 15000
 acceleration_wall = 7500
 acceleration_wall_0 = 7500
+adhesion_type = skirt
 alternate_extra_perimeter = False
 cool_min_layer_time = 10
 infill_line_width = 0.5
 infill_pattern = gyroid
 infill_sparse_density = 15
 inset_direction = outside_in
+layer_height = 0.2
+layer_height_0 = 0.2
 optimize_wall_printing_order = True
 retraction_amount = 0.8
+retraction_combing = noskin
 retraction_hop = 0.2
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
@@ -49,9 +47,11 @@ speed_wall = 100
 speed_wall_0 = 75
 speed_wall_x = 100
 support_angle = 46
+support_enable = False
 top_bottom_thickness = 0.8
 travel_avoid_supports = True
 wall_line_width = 0.45
 wall_line_width_0 = 0.4
 wall_thickness = 1.65
-zig_zaggify_infill = True
+zig_zaggify_infill = True
+

+ 11 - 11
resources/quality/gutenberg/gutenberg_global_normal_quality.inst.cfg

@@ -1,35 +1,33 @@
-
 [general]
-version = 4
-name = Normal
 definition = gutenberg_base
+name = Normal
+version = 4
 
 [metadata]
+global_quality = True
+quality_type = normal
 setting_version = 20
 type = quality
-quality_type = normal
-global_quality = True
 
 [values]
 acceleration_enabled = True
-adhesion_type = skirt
-layer_height = 0.2
-layer_height_0 = 0.2
-retraction_combing = noskin
-support_enable = False
 acceleration_print = 15000
 acceleration_roofing = 10000
 acceleration_topbottom = 10000
 acceleration_travel = 15000
 acceleration_wall = 10000
 acceleration_wall_0 = 7500
+adhesion_type = skirt
 alternate_extra_perimeter = True
 bottom_layers = 3
 infill_line_width = 0.5
 infill_pattern = gyroid
 infill_sparse_density = 15
+layer_height = 0.2
+layer_height_0 = 0.2
 optimize_wall_printing_order = True
 retraction_amount = 0.8
+retraction_combing = noskin
 retraction_hop = 0.2
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
@@ -48,10 +46,12 @@ speed_wall = 100
 speed_wall_0 = 100
 speed_wall_x = 150
 support_angle = 46
+support_enable = False
 top_bottom_thickness = 0.6
 top_layers = 3
 travel_avoid_supports = True
 wall_line_width = 0.45
 wall_line_width_0 = 0.4
 wall_thickness = 1.25
-zig_zaggify_infill = True
+zig_zaggify_infill = True
+

+ 11 - 11
resources/quality/gutenberg/gutenberg_global_strong_quality.inst.cfg

@@ -1,34 +1,32 @@
-
 [general]
-version = 4
-name = Strong
 definition = gutenberg_base
+name = Strong
+version = 4
 
 [metadata]
+global_quality = True
+quality_type = strong
 setting_version = 20
 type = quality
-quality_type = strong
-global_quality = True
 
 [values]
 acceleration_enabled = True
-adhesion_type = skirt
-layer_height = 0.2
-layer_height_0 = 0.2
-retraction_combing = noskin
-support_enable = False
 acceleration_print = 15000
 acceleration_roofing = 10000
 acceleration_topbottom = 10000
 acceleration_travel = 15000
 acceleration_wall = 10000
 acceleration_wall_0 = 7500
+adhesion_type = skirt
 alternate_extra_perimeter = True
 infill_line_width = 0.5
 infill_pattern = gyroid
 infill_sparse_density = 30
+layer_height = 0.2
+layer_height_0 = 0.2
 optimize_wall_printing_order = True
 retraction_amount = 0.8
+retraction_combing = noskin
 retraction_hop = 0.2
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
@@ -48,9 +46,11 @@ speed_wall = 100
 speed_wall_0 = 75
 speed_wall_x = 100
 support_angle = 46
+support_enable = False
 top_bottom_thickness = 1
 travel_avoid_supports = True
 wall_line_width = 0.45
 wall_line_width_0 = 0.4
 wall_thickness = 2.05
-zig_zaggify_infill = True
+zig_zaggify_infill = True
+