diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index bcf43d7d9b..550147fc8c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4948,7 +4948,7 @@ } } }, - "support_interface_offset": + "support_interface_offset": { "label": "Support Interface Horizontal Expansion", "description": "Amount of offset applied to the support interface polygons.", diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index 7df3adad12..acfd674ad1 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -7,33 +7,25 @@ "author": "Koonovo", "manufacturer": "Koonovo", "file_formats": "text/x-gcode", - "platform": "koonovo.obj", + "platform": "koonovo.obj", "platform_texture": "koonovo.png", "first_start_actions": [ "MachineSettingsAction" ], - "machine_extruder_trains": {"0": "koonovo_base_extruder_0"}, + "machine_extruder_trains": {"0": "koonovo_base_extruder_0"}, "has_materials": true, - "has_machine_quality": true, + "has_machine_quality": true, + - "preferred_quality_type": "standard", - "preferred_material": "generic_pla", - -"exclude_materials": [ - ] - - + "preferred_material": "generic_pla" }, "overrides": { - "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Move to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nM117 Printing..." }, - - "machine_end_gcode": { "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, @@ -112,7 +104,7 @@ "support_brim_width": { "value": 4 }, "support_enable": { "value": true }, - "support_interface_enable": { "value": true }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, diff --git a/resources/definitions/koonovo_elf.def.json b/resources/definitions/koonovo_elf.def.json index 4545b11293..03dcc6e632 100644 --- a/resources/definitions/koonovo_elf.def.json +++ b/resources/definitions/koonovo_elf.def.json @@ -21,6 +21,5 @@ "metadata": { "quality_definition": "koonovo_base", "visible": true - } } diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index 6f582303e6..5d490a75fe 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -7,37 +7,24 @@ "author": "Koonovo", "manufacturer": "Koonovo", "file_formats": "text/x-gcode", - "platform": "koonovo_kn3.stl", - "quality_definition": "koonovo_base", - - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "koonovo_kn3_extruder_0", - "1": "koonovo_kn3_extruder_1" - }, - - + "platform": "koonovo_kn3.stl", + "quality_definition": "koonovo_base", + "first_start_actions": ["MachineSettingsAction"], + "machine_extruder_trains": { + "0": "koonovo_kn3_extruder_0", + "1": "koonovo_kn3_extruder_1" + }, "has_materials": true, - "has_machine_quality": true, + "has_machine_quality": true, - "preferred_quality_type": "standard", - "preferred_material": "generic_pla", - - -"exclude_materials": [ - ] - - + "preferred_material": "generic_pla" }, - "overrides": { - - "machine_name": { "default_value": "KOONOVO KN3" }, + "machine_name": { "default_value": "Koonovo KN3" }, "machine_width": { "default_value": 310 }, "machine_depth": { "default_value": 310 }, "machine_height": { "default_value": 400 }, @@ -51,19 +38,15 @@ "gantry_height": { "value": 0 }, - "machine_extruder_count": { "default_value": 2 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Move to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nM117 Printing..." }, - - "machine_end_gcode": { "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, - "machine_max_feedrate_x": { "value": 200 }, "machine_max_feedrate_y": { "value": 200 }, "machine_max_feedrate_z": { "value": 50 }, @@ -138,7 +121,7 @@ "support_brim_width": { "value": 4 }, "support_enable": { "value": true }, - "support_interface_enable": { "value": true }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, @@ -154,7 +137,5 @@ "brim_replaces_support": { "value": false }, "skirt_gap": { "value": 6.0 }, "skirt_line_count": { "value": 3 } - - } } diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index d7f1c88b1d..3e0f3c8df5 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -7,37 +7,25 @@ "author": "Koonovo", "manufacturer": "Koonovo", "file_formats": "text/x-gcode", - "platform": "koonovo_kn5.stl", - "quality_definition": "koonovo_base", - - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "koonovo_kn5_extruder_0", - "1": "koonovo_kn5_extruder_1" - }, - - + "platform": "koonovo_kn5.stl", + "quality_definition": "koonovo_base", + "first_start_actions": ["MachineSettingsAction"], + "machine_extruder_trains": { + "0": "koonovo_kn5_extruder_0", + "1": "koonovo_kn5_extruder_1" + }, "has_materials": true, - "has_machine_quality": true, + "has_machine_quality": true, - "preferred_quality_type": "standard", - "preferred_material": "generic_pla", - - -"exclude_materials": [ - ] - - + "preferred_material": "generic_pla" }, "overrides": { - - "machine_name": { "default_value": "KOONOVO KN5" }, + "machine_name": { "default_value": "Koonovo KN5" }, "machine_width": { "default_value": 420 }, "machine_depth": { "default_value": 420 }, "machine_height": { "default_value": 400 }, @@ -57,13 +45,10 @@ "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Move to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nM117 Printing..." }, - - "machine_end_gcode": { "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, - "machine_max_feedrate_x": { "value": 200 }, "machine_max_feedrate_y": { "value": 200 }, "machine_max_feedrate_z": { "value": 50 }, @@ -153,7 +138,5 @@ "brim_replaces_support": { "value": false }, "skirt_gap": { "value": 6.0 }, "skirt_line_count": { "value": 3 } - - } } \ No newline at end of file diff --git a/resources/definitions/koonovo_pyramid.def.json b/resources/definitions/koonovo_pyramid.def.json index fedad3021b..8e4ff8a20e 100644 --- a/resources/definitions/koonovo_pyramid.def.json +++ b/resources/definitions/koonovo_pyramid.def.json @@ -16,11 +16,9 @@ }, "gantry_height": { "value": 0 } - }, "metadata": { "quality_definition": "koonovo_base", "visible": true - } }