From 0286c701fdfef3754ae0a5840baef2fdec95526d Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 8 Mar 2019 17:00:17 +0100 Subject: [PATCH] Change setting_version to be the same as in current master Also change the profiles to act as global profiles and fix indentation. Contributes to CURA-6080. --- .../definitions/anycubic_chiron.def.json | 44 +++++++++---------- .../anycubic_chiron_draft.inst.cfg | 5 ++- .../anycubic_chiron_high.inst.cfg | 5 ++- .../anycubic_chiron_normal.inst.cfg | 5 ++- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/resources/definitions/anycubic_chiron.def.json b/resources/definitions/anycubic_chiron.def.json index 78191d6cca..83c2056d76 100644 --- a/resources/definitions/anycubic_chiron.def.json +++ b/resources/definitions/anycubic_chiron.def.json @@ -7,21 +7,21 @@ "visible": true, "author": "Patrick Glatt", "manufacturer": "Anycubic", - "category": "Other", + "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "anycubic_chiron_platform.obj", - "platform_texture": "anycubic-chiron.png", + "platform_texture": "anycubic-chiron.png", "has_materials": true, - "preferred_material": "generic_pla", + "preferred_material": "generic_pla", "has_machine_quality": true, - "quality_definition": "anycubic_chiron", - "preferred_quality_type": "normal", + "quality_definition": "anycubic_chiron", + "preferred_quality_type": "normal", "machine_extruder_trains": { "0": "anycubic_chiron_extruder_0" - }, - "firmware_file": "MarlinChiron.hex" + }, + "firmware_file": "MarlinChiron.hex" }, "overrides": @@ -45,7 +45,7 @@ "machine_depth": { "default_value": 400 - }, + }, "machine_center_is_zero": { "default_value": false @@ -53,28 +53,28 @@ "gantry_height": { "default_value": 35 - }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [-45, 50], - [-45, -45], - [45, 50], - [45, -45] - ] - }, + }, + "machine_head_with_fans_polygon": + { + "default_value": + [ + [-45, 50], + [-45, -45], + [45, 50], + [45, -45] + ] + }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n" + "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n" }, "machine_end_gcode": { - "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n" - } + "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n" + } } } diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg index 881abc1152..6011fdbb32 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg @@ -4,10 +4,11 @@ name = Draft definition = anycubic_chiron [metadata] -setting_version = 5 +setting_version = 7 type = quality quality_type = draft -weight = 0 +weight = -2 +global_quality = True [values] acceleration_enabled = True diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg index 1fa6cc413c..93561d9956 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg @@ -4,10 +4,11 @@ name = High definition = anycubic_chiron [metadata] -setting_version = 5 +setting_version = 7 type = quality quality_type = high -weight = 2 +weight = 1 +global_quality = True [values] acceleration_enabled = True diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg index e0c583f25c..d1496ff187 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg @@ -4,10 +4,11 @@ name = Normal definition = anycubic_chiron [metadata] -setting_version = 5 +setting_version = 7 type = quality quality_type = normal -weight = 1 +weight = 0 +global_quality = True [values] acceleration_enabled = True