From 2b81db03ed814e55a2939c81f482614dd093d801 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 18 Aug 2015 12:26:10 +0200 Subject: [PATCH] JSON: moved more settings to dual_extrusion_printer.json and corrected a json mistake there --- .../settings/dual_extrusion_printer.json | 62 ++++++++++++++++++- resources/settings/fdmprinter.json | 42 ------------- 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/resources/settings/dual_extrusion_printer.json b/resources/settings/dual_extrusion_printer.json index 894f4da0dd..d9205470c7 100644 --- a/resources/settings/dual_extrusion_printer.json +++ b/resources/settings/dual_extrusion_printer.json @@ -4,9 +4,67 @@ "inherits": "fdmprinter.json", "machine_settings": { - "extruder_nr": { "default": 0 } + "extruder_nr": { "default": 0 }, + + "machine_use_extruder_offset_to_offset_coords": { "default": false }, + + "machine_nozzle_offset_x": { "default": 0, "SEE_machine_extruder_trains": true }, + "machine_nozzle_offset_y": { "default": 0, "SEE_machine_extruder_trains": true }, + "machine_extruder_start_code": { "default": "", "SEE_machine_extruder_trains": true }, + "machine_extruder_start_pos_abs": { "default": false, "SEE_machine_extruder_trains": true }, + "machine_extruder_start_pos_x": { "default": 0, "SEE_machine_extruder_trains": true }, + "machine_extruder_start_pos_y": { "default": 0, "SEE_machine_extruder_trains": true }, + "machine_extruder_end_pos_abs": { "default": false, "SEE_machine_extruder_trains": true }, + "machine_extruder_end_pos_x": { "default": 0, "SEE_machine_extruder_trains": true }, + "machine_extruder_end_pos_y": { "default": 0, "SEE_machine_extruder_trains": true }, + "machine_extruder_end_code": { "default": "", "SEE_machine_extruder_trains": true } }, "categories": { + "resolution": { + "settings": { + "line_width": { + "children": { + "prime_tower_line_width": { + "label": "Prime Tower Line Width", + "description": "Width of a single prime tower line.", + "unit": "mm", + "min_value": 0.0001, + "min_value_warning": 0.2, + "max_value_warning": 5, + "default": 0.4, + "type": "float", + "visible": false, + "active_if": { + "setting": "prime_tower_enable", + "value": true + } + } + } + } + } + }, + "speed": { + "settings": { + "speed_print": { + "children": { + "speed_prime_tower": { + "label": "Prime Tower Speed", + "description": "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal.", + "unit": "mm/s", + "type": "float", + "min_value": 0.1, + "max_value_warning": 150, + "default": 50, + "visible": false, + "active_if": { + "setting": "prime_tower_enable", + "value": true + } + } + } + } + } + }, "dual": { "label": "Dual Extrusion", "visible": false, @@ -221,7 +279,7 @@ } } } - }, + } } } } diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 78b366d1c1..b96c7964f2 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -46,24 +46,11 @@ "machine_extruder_count": { "default": 1 }, - "machine_use_extruder_offset_to_offset_coords": { "default": false }, - - "machine_nozzle_offset_x": { "default": 0, "SEE_machine_extruder_trains": true }, - "machine_nozzle_offset_y": { "default": 0, "SEE_machine_extruder_trains": true }, "machine_nozzle_size": { "default": 0.4, "SEE_machine_extruder_trains": true }, "machine_nozzle_tip_outer_diameter": { "default": 1, "SEE_machine_extruder_trains": true }, "machine_nozzle_head_distance": { "default": 3, "SEE_machine_extruder_trains": true }, "machine_nozzle_expansion_angle": { "default": 45, "SEE_machine_extruder_trains": true }, "machine_heat_zone_length": { "default": 16, "SEE_machine_extruder_trains": true }, - "machine_extruder_start_code": { "default": "", "SEE_machine_extruder_trains": true }, - "machine_extruder_start_pos_abs": { "default": false, "SEE_machine_extruder_trains": true }, - "machine_extruder_start_pos_x": { "default": 0, "SEE_machine_extruder_trains": true }, - "machine_extruder_start_pos_y": { "default": 0, "SEE_machine_extruder_trains": true }, - "machine_extruder_end_pos_abs": { "default": false, "SEE_machine_extruder_trains": true }, - "machine_extruder_end_pos_x": { "default": 0, "SEE_machine_extruder_trains": true }, - "machine_extruder_end_pos_y": { "default": 0, "SEE_machine_extruder_trains": true }, - "machine_extruder_end_code": { "default": "", "SEE_machine_extruder_trains": true }, - "machine_gcode_flavor": { "default": "RepRap" }, @@ -257,21 +244,6 @@ "setting": "support_roof_enable", "value": true } - }, - "prime_tower_line_width": { - "label": "Prime Tower Line Width", - "description": "Width of a single prime tower line.", - "unit": "mm", - "min_value": 0.0001, - "min_value_warning": 0.2, - "max_value_warning": 5, - "default": 0.4, - "type": "float", - "visible": false, - "active_if": { - "setting": "prime_tower_enable", - "value": true - } } } } @@ -812,20 +784,6 @@ } } } - }, - "speed_prime_tower": { - "label": "Prime Tower Speed", - "description": "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal.", - "unit": "mm/s", - "type": "float", - "min_value": 0.1, - "max_value_warning": 150, - "default": 50, - "visible": false, - "active_if": { - "setting": "prime_tower_enable", - "value": true - } } } },