3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name

Browse source
This commit is contained in:
Lipu Fei 2019-05-14 09:42:57 +02:00
commit 7c1d589528
90 changed files with 116 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -517,9 +517,6 @@ class CuraEngineBackend(QObject, Backend):
self._build_plates_to_be_sliced.append(build_plate_number) self._build_plates_to_be_sliced.append(build_plate_number)
self.printDurationMessage.emit(source_build_plate_number, {}, []) self.printDurationMessage.emit(source_build_plate_number, {}, [])
self.processingProgress.emit(0.0) self.processingProgress.emit(0.0)
self.setState(BackendState.NotStarted)
# if not self._use_timer:
# With manually having to slice, we want to clear the old invalid layer data.
self._clearLayerData(build_plate_changed) self._clearLayerData(build_plate_changed)
self._invokeSlice() self._invokeSlice()
@ -563,10 +560,10 @@ class CuraEngineBackend(QObject, Backend):
## Convenient function: mark everything to slice, emit state and clear layer data ## Convenient function: mark everything to slice, emit state and clear layer data
def needsSlicing(self) -> None: def needsSlicing(self) -> None:
self.determineAutoSlicing()
self.stopSlicing() self.stopSlicing()
self.markSliceAll() self.markSliceAll()
self.processingProgress.emit(0.0) self.processingProgress.emit(0.0)
self.setState(BackendState.NotStarted)
if not self._use_timer: if not self._use_timer:
# With manually having to slice, we want to clear the old invalid layer data. # With manually having to slice, we want to clear the old invalid layer data.
self._clearLayerData() self._clearLayerData()

2
resources/definitions/101Hero.def.json
View file

@ -38,7 +38,7 @@
"speed_wall": { "value": "speed_print * 0.7" }, "speed_wall": { "value": "speed_print * 0.7" },
"speed_topbottom": { "value": "speed_print * 0.7" }, "speed_topbottom": { "value": "speed_print * 0.7" },
"speed_layer_0": { "value": "speed_print * 0.7" }, "speed_layer_0": { "value": "speed_print * 0.7" },
"gantry_height": { "default_value": 0 }, "gantry_height": { "value": "0" },
"retraction_speed": { "default_value" : 10 }, "retraction_speed": { "default_value" : 10 },
"retraction_amount": { "default_value" : 2.5 }, "retraction_amount": { "default_value" : 2.5 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },

2
resources/definitions/3dator.def.json
View file

@ -45,7 +45,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 30 "value": "30"
}, },
"machine_start_gcode": { "machine_start_gcode": {
"default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG29 ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0 ;zero the extruded length\nG1 X10 E30 F500 ;printing a Line from right to left\nG92 E0 ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" }, "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG29 ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0 ;zero the extruded length\nG1 X10 E30 F500 ;printing a Line from right to left\nG92 E0 ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" },

3
resources/definitions/Mark2_for_Ultimaker2.def.json
View file

@ -13,7 +13,6 @@
"has_machine_materials": false, "has_machine_materials": false,
"has_machine_quality": false, "has_machine_quality": false,
"has_variant_materials": false, "has_variant_materials": false,
"weight": 2,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"icon": "icon_ultimaker.png", "icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
@ -37,7 +36,7 @@
"default_value": 203 "default_value": 203
}, },
"gantry_height": { "gantry_height": {
"default_value": 52 "value": "52"
}, },
"machine_center_is_zero": { "machine_center_is_zero": {
"default_value": false "default_value": false

2
resources/definitions/alfawise_u20.def.json
View file

@ -39,7 +39,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/alfawise_u30.def.json
View file

@ -36,7 +36,7 @@
"retraction_enable": { "default_value": true }, "retraction_enable": { "default_value": true },
"retraction_amount": { "default_value": 5 }, "retraction_amount": { "default_value": 5 },
"retraction_speed": { "default_value": 45 }, "retraction_speed": { "default_value": 45 },
"gantry_height": { "default_value": 25 }, "gantry_height": { "value": "25" },
"machine_width": { "default_value": 220 }, "machine_width": { "default_value": 220 },
"machine_height": { "default_value": 250 }, "machine_height": { "default_value": 250 },
"machine_depth": { "default_value": 220 }, "machine_depth": { "default_value": 220 },

2
resources/definitions/alya3dp.def.json
View file

@ -30,7 +30,7 @@
"machine_height": { "default_value": 133 }, "machine_height": { "default_value": 133 },
"machine_depth": { "default_value": 100 }, "machine_depth": { "default_value": 100 },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55"},
"retraction_amount": { "default_value": 1.5 }, "retraction_amount": { "default_value": 1.5 },
"support_enable": { "default_value": true}, "support_enable": { "default_value": true},
"machine_head_with_fans_polygon": { "machine_head_with_fans_polygon": {

2
resources/definitions/alyanx3dp.def.json
View file

@ -30,7 +30,7 @@
"machine_height": { "default_value": 170 }, "machine_height": { "default_value": 170 },
"machine_depth": { "default_value": 160 }, "machine_depth": { "default_value": 160 },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55"},
"retraction_amount": { "default_value": 1.5 }, "retraction_amount": { "default_value": 1.5 },
"support_enable": { "default_value": true}, "support_enable": { "default_value": true},
"machine_head_with_fans_polygon": { "machine_head_with_fans_polygon": {

2
resources/definitions/anycubic_4max.def.json
View file

@ -50,7 +50,7 @@
"jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
"jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
"gantry_height": { "default_value": 25.0 }, "gantry_height": { "value": "25.0" },
"skin_overlap": { "value": "10" }, "skin_overlap": { "value": "10" },
"acceleration_enabled": { "value": "True" }, "acceleration_enabled": { "value": "True" },

2
resources/definitions/anycubic_chiron.def.json
View file

@ -52,7 +52,7 @@
}, },
"gantry_height": "gantry_height":
{ {
"default_value": 35 "value": "35"
}, },
"machine_head_with_fans_polygon": "machine_head_with_fans_polygon":
{ {

2
resources/definitions/anycubic_i3_mega.def.json
View file

@ -46,7 +46,7 @@
}, },
"gantry_height": "gantry_height":
{ {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": "machine_gcode_flavor":
{ {

2
resources/definitions/bibo2_dual.def.json
View file

@ -64,7 +64,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 12 "value": "12"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/builder_premium_large.def.json
View file

@ -93,7 +93,7 @@
"machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },

2
resources/definitions/builder_premium_medium.def.json
View file

@ -93,7 +93,7 @@
"machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },

2
resources/definitions/builder_premium_small.def.json
View file

@ -92,7 +92,7 @@
"machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },

2
resources/definitions/cartesio.def.json
View file

@ -35,7 +35,7 @@
"machine_extruder_count": { "default_value": 2 }, "machine_extruder_count": { "default_value": 2 },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 35 }, "gantry_height": { "value": "35" },
"machine_height": { "default_value": 400 }, "machine_height": { "default_value": 400 },
"machine_depth": { "default_value": 270 }, "machine_depth": { "default_value": 270 },
"machine_width": { "default_value": 430 }, "machine_width": { "default_value": 430 },

2
resources/definitions/cocoon_create_modelmaker.def.json
View file

@ -39,7 +39,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/creality_cr-x.def.json
View file

@ -30,7 +30,7 @@
"retraction_amount": { "default_value": 3 }, "retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 70}, "retraction_speed": { "default_value": 70},
"adhesion_type": { "default_value": "skirt" }, "adhesion_type": { "default_value": "skirt" },
"gantry_height": { "default_value": 30 }, "gantry_height": { "value": "30" },
"speed_print": { "default_value": 60 }, "speed_print": { "default_value": 60 },
"speed_travel": { "default_value": 120 }, "speed_travel": { "default_value": 120 },
"machine_max_acceleration_x": { "default_value": 500 }, "machine_max_acceleration_x": { "default_value": 500 },

2
resources/definitions/creality_cr10.def.json
View file

@ -71,7 +71,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 30 "value": "30"
}, },
"acceleration_enabled": { "acceleration_enabled": {
"default_value": true "default_value": true

2
resources/definitions/creality_ender3.def.json
View file

@ -31,7 +31,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 30 "value": "30"
}, },
"machine_head_polygon": { "machine_head_polygon": {
"default_value": [ "default_value": [

4
resources/definitions/creatable_d3.def.json
View file

@ -24,8 +24,8 @@
"machine_depth": { "default_value": 250 }, "machine_depth": { "default_value": 250 },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_shape": { "default_value": "elliptic" }, "machine_shape": { "default_value": "elliptic" },
"machine_max_feedrate_z": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 300 },
"gantry_height": {"default_value": 43}, "gantry_height": {"value": "43"},
"layer_height": { "default_value": 0.1 }, "layer_height": { "default_value": 0.1 },
"relative_extrusion": { "default_value": false }, "relative_extrusion": { "default_value": false },
"retraction_combing": { "default_value": "off" }, "retraction_combing": { "default_value": "off" },

2
resources/definitions/dagoma_discoeasy200.def.json
View file

@ -38,7 +38,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_start_gcode": { "machine_start_gcode": {
"default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n" "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n"

2
resources/definitions/dagoma_magis.def.json
View file

@ -38,7 +38,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_shape": { "machine_shape": {
"default_value": "elliptic" "default_value": "elliptic"

2
resources/definitions/dagoma_neva.def.json
View file

@ -38,7 +38,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_shape": { "machine_shape": {
"default_value": "elliptic" "default_value": "elliptic"

2
resources/definitions/fabtotum.def.json
View file

@ -28,7 +28,7 @@
"machine_end_gcode": { "machine_end_gcode": {
"default_value": "M104 S0 ;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-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" "default_value": "M104 S0 ;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-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)"
}, },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"machine_width": { "default_value": 214 }, "machine_width": { "default_value": 214 },
"machine_height": { "default_value": 241.5 }, "machine_height": { "default_value": 241.5 },
"machine_depth": { "default_value": 234 }, "machine_depth": { "default_value": 234 },

4
resources/definitions/fdmprinter.def.json
View file

@ -2062,8 +2062,8 @@
"description": "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted.", "description": "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted.",
"unit": "°C", "unit": "°C",
"type": "float", "type": "float",
"default_value": 0, "default_value": 35,
"resolve": "max(extruderValues('build_volume_temperature'))", "resolve": "min(extruderValues('build_volume_temperature'))",
"minimum_value": "-273.15", "minimum_value": "-273.15",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "285", "maximum_value_warning": "285",

2
resources/definitions/folgertech_FT-5.def.json
View file

@ -18,7 +18,7 @@
"machine_width": { "default_value": 300 }, "machine_width": { "default_value": 300 },
"machine_height": { "default_value": 400 }, "machine_height": { "default_value": 400 },
"machine_depth": { "default_value": 300 }, "machine_depth": { "default_value": 300 },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"machine_start_gcode": { "machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."

2
resources/definitions/gmax15plus.def.json
View file

@ -37,7 +37,7 @@
"retraction_amount": { "default_value": 1 }, "retraction_amount": { "default_value": 1 },
"retraction_speed": { "default_value": 70}, "retraction_speed": { "default_value": 70},
"adhesion_type": { "default_value": "skirt" }, "adhesion_type": { "default_value": "skirt" },
"gantry_height": { "default_value": 50 }, "gantry_height": { "value": "50" },
"speed_print": { "default_value": 50 }, "speed_print": { "default_value": 50 },
"speed_travel": { "default_value": 70 }, "speed_travel": { "default_value": 70 },
"machine_max_acceleration_x": { "default_value": 600 }, "machine_max_acceleration_x": { "default_value": 600 },

2
resources/definitions/gmax15plus_dual.def.json
View file

@ -35,7 +35,7 @@
"retraction_amount": { "default_value": 1 }, "retraction_amount": { "default_value": 1 },
"retraction_speed": { "default_value": 70}, "retraction_speed": { "default_value": 70},
"adhesion_type": { "default_value": "skirt" }, "adhesion_type": { "default_value": "skirt" },
"gantry_height": { "default_value": 50 }, "gantry_height": { "value": "50" },
"speed_print": { "default_value": 50 }, "speed_print": { "default_value": 50 },
"speed_travel": { "default_value": 70 }, "speed_travel": { "default_value": 70 },
"machine_max_acceleration_x": { "default_value": 600 }, "machine_max_acceleration_x": { "default_value": 600 },

2
resources/definitions/grr_neo.def.json
View file

@ -37,7 +37,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/hms434.def.json
View file

@ -43,7 +43,7 @@
"material_diameter": {"default_value": 1.75 }, "material_diameter": {"default_value": 1.75 },
"machine_heated_bed": {"default_value": true }, "machine_heated_bed": {"default_value": true },
"machine_center_is_zero": {"default_value": false }, "machine_center_is_zero": {"default_value": false },
"gantry_height": {"default_value": 35 }, "gantry_height": {"value": "35" },
"machine_height": {"default_value": 400 }, "machine_height": {"default_value": 400 },
"machine_depth": {"default_value": 325 }, "machine_depth": {"default_value": 325 },
"machine_width": {"default_value": 450 }, "machine_width": {"default_value": 450 },

2
resources/definitions/innovo_inventor.def.json
View file

@ -41,7 +41,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 82.3 "value": "82.3"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/jgaurora_a1.def.json
View file

@ -39,7 +39,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/jgaurora_a5.def.json
View file

@ -41,7 +41,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/jgaurora_jgmaker_magic.def.json
View file

@ -39,7 +39,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/jgaurora_z_603s.def.json
View file

@ -39,7 +39,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 10 "value": "10"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/kemiq_q2_beta.def.json
View file

@ -41,7 +41,7 @@
"default_value": 2 "default_value": 2
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/kemiq_q2_gama.def.json
View file

@ -42,7 +42,7 @@
"default_value": 2 "default_value": 2
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/kupido.def.json
View file

@ -29,7 +29,7 @@
"machine_height": { "default_value": 190 }, "machine_height": { "default_value": 190 },
"machine_depth": { "default_value": 195 }, "machine_depth": { "default_value": 195 },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"retraction_amount": { "default_value": 1 }, "retraction_amount": { "default_value": 1 },
"support_enable": { "default_value": true}, "support_enable": { "default_value": true},
"machine_head_with_fans_polygon": { "machine_head_with_fans_polygon": {

2
resources/definitions/makeR_pegasus.def.json
View file

@ -41,7 +41,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": -25 "value": "25"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/makeR_prusa_tairona_i3.def.json
View file

@ -41,7 +41,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/makeit_pro_l.def.json
View file

@ -39,7 +39,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 330 "value": "330"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/makeit_pro_m.def.json
View file

@ -39,7 +39,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 200 "value": "200"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/maker_starter.def.json
View file

@ -33,7 +33,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/malyan_m180.def.json
View file

@ -53,7 +53,7 @@
"default_value": 92 "default_value": 92
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/mankati_fullscale_xt_plus.def.json
View file

@ -28,7 +28,7 @@
[ 3, 3 ] [ 3, 3 ]
] ]
}, },
"gantry_height": { "default_value": 0 }, "gantry_height": { "value": "0" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "machine_start_gcode": {

2
resources/definitions/mendel90.def.json
View file

@ -68,7 +68,7 @@
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_head_with_fans_polygon": "machine_head_with_fans_polygon":
{ {

50
resources/definitions/nwa3d_a5.def.json
View file

@ -15,50 +15,50 @@
"preferred_quality_type": "normal", "preferred_quality_type": "normal",
"has_machine_quality": true, "has_machine_quality": true,
"preferred_material": "generic_pla", "preferred_material": "generic_pla",
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "nwa3d_a5_extruder_0" "0": "nwa3d_a5_extruder_0"
} }
}, },
"overrides": { "overrides": {
"machine_name": { "machine_name": {
"default_value": "NWA3D A5" "default_value": "NWA3D A5"
}, },
"machine_width": { "machine_width": {
"default_value": 125 "default_value": 125
}, },
"machine_height": { "machine_height": {
"default_value": 100 "default_value": 100
}, },
"machine_depth": { "machine_depth": {
"default_value": 150 "default_value": 150
}, },
"machine_head_polygon": { "machine_head_polygon": {
"default_value": [ "default_value": [
[-30, 34], [-30, 34],
[-30, -32], [-30, -32],
[30, -32], [30, -32],
[30, 34] [30, 34]
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 30 "value": "30"
}, },
"machine_heated_bed": { "machine_heated_bed": {
"default_value": false "default_value": false
}, },
"material_diameter": { "material_diameter": {
"default_value": 1.75 "default_value": 1.75
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (RepRap)" "default_value": "RepRap (RepRap)"
}, },
"machine_start_gcode": { "machine_start_gcode": {
"default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
}, },
"machine_end_gcode": { "machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
} }
} }
} }

2
resources/definitions/printrbot_play.def.json
View file

@ -27,7 +27,7 @@
"retraction_speed": { "default_value": 45}, "retraction_speed": { "default_value": 45},
"adhesion_type": { "default_value": "skirt" }, "adhesion_type": { "default_value": "skirt" },
"machine_head_with_fans_polygon": { "default_value": [[-32,999],[37,999],[37,-32],[-32,-32]] }, "machine_head_with_fans_polygon": { "default_value": [[-32,999],[37,999],[37,-32],[-32,-32]] },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"speed_print": { "default_value": 50 }, "speed_print": { "default_value": 50 },
"speed_travel": { "default_value": 55 }, "speed_travel": { "default_value": 55 },
"machine_max_feedrate_x": {"default_value": 125}, "machine_max_feedrate_x": {"default_value": 125},

1
resources/definitions/printrbot_simple.def.json
View file

@ -30,7 +30,6 @@
[55, -99999] [55, -99999]
] ]
}, },
"gantry_height": { "default_value": 99999 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "machine_start_gcode": {

2
resources/definitions/printrbot_simple_extended.def.json
View file

@ -30,7 +30,7 @@
[ -49, -20 ] [ -49, -20 ]
] ]
}, },
"gantry_height": { "default_value": 99999 }, "gantry_height": { "value": "99999" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "machine_start_gcode": {

2
resources/definitions/printrbot_simple_makers_kit.def.json
View file

@ -27,7 +27,7 @@
[60, -10] [60, -10]
] ]
}, },
"gantry_height": { "default_value": 1000 }, "gantry_height": { "value": "1000" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "machine_start_gcode": {

2
resources/definitions/prusa_i3.def.json
View file

@ -48,7 +48,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/prusa_i3_mk2.def.json
View file

@ -31,7 +31,7 @@
"retraction_prime_speed": { "default_value": 35 }, "retraction_prime_speed": { "default_value": 35 },
"adhesion_type": { "default_value": "skirt" }, "adhesion_type": { "default_value": "skirt" },
"machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
"gantry_height": { "default_value": 28 }, "gantry_height": { "value": "28" },
"machine_max_feedrate_z": { "default_value": 12 }, "machine_max_feedrate_z": { "default_value": 12 },
"machine_max_feedrate_e": { "default_value": 120 }, "machine_max_feedrate_e": { "default_value": 120 },
"machine_max_acceleration_z": { "default_value": 500 }, "machine_max_acceleration_z": { "default_value": 500 },

2
resources/definitions/prusa_i3_xl.def.json
View file

@ -40,7 +40,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/raise3D_N2_dual.def.json
View file

@ -58,7 +58,7 @@
"default_value": "skirt" "default_value": "skirt"
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/raise3D_N2_plus_dual.def.json
View file

@ -58,7 +58,7 @@
"default_value": "skirt" "default_value": "skirt"
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/raise3D_N2_plus_single.def.json
View file

@ -57,7 +57,7 @@
"default_value": "skirt" "default_value": "skirt"
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/raise3D_N2_single.def.json
View file

@ -57,7 +57,7 @@
"default_value": "skirt" "default_value": "skirt"
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/rigid3d_zero2.def.json
View file

@ -81,7 +81,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 25 "value": "25"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap" "default_value": "RepRap"

2
resources/definitions/rigidbot.def.json
View file

@ -29,7 +29,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/rigidbot_big.def.json
View file

@ -29,7 +29,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

3
resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
View file

@ -6,7 +6,6 @@
"author": "Andrew Finkle, CTO", "author": "Andrew Finkle, CTO",
"manufacturer": "Structur3d.io", "manufacturer": "Structur3d.io",
"visible": true, "visible": true,
"weight": 1,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Plusbackplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
@ -77,7 +76,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 52 "value": "52"
}, },
"machine_nozzle_head_distance": { "machine_nozzle_head_distance": {
"default_value": 5 "default_value": 5

4
resources/definitions/tam.def.json
View file

@ -32,8 +32,8 @@
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_head_with_fans_polygon": { "default_value": [ [ -35, 65 ], [ -35, -55 ], [ 55, 65 ], [ 55, -55 ] ] }, "machine_head_with_fans_polygon": { "default_value": [ [ -35, 65 ], [ -35, -55 ], [ 55, 65 ], [ 55, -55 ] ] },
"gantry_height": { "default_value": 35 }, "gantry_height": { "value": "35" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"speed_print": { "default_value": 60 }, "speed_print": { "default_value": 60 },

2
resources/definitions/tevo_blackwidow.def.json
View file

@ -44,7 +44,7 @@
}, },
"gantry_height": "gantry_height":
{ {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": "machine_gcode_flavor":
{ {

2
resources/definitions/tevo_tarantula.def.json
View file

@ -33,7 +33,7 @@
[18, -18] [18, -18]
] ]
}, },
"gantry_height": { "default_value": 55 }, "gantry_height": { "value": "55" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_acceleration": { "default_value": 2650 }, "machine_acceleration": { "default_value": 2650 },
"machine_max_jerk_xy": { "default_value": 15.0 }, "machine_max_jerk_xy": { "default_value": 15.0 },

2
resources/definitions/tevo_tornado.def.json
View file

@ -70,7 +70,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 30 "value": "30"
}, },
"acceleration_enabled": { "acceleration_enabled": {
"default_value": false "default_value": false

2
resources/definitions/tizyx_evy.def.json
View file

@ -32,7 +32,7 @@
"machine_extruder_count": { "default_value": 1 }, "machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 500 }, "gantry_height": { "value": "500" },
"machine_height": { "default_value": 255 }, "machine_height": { "default_value": 255 },
"machine_depth": { "default_value": 255 }, "machine_depth": { "default_value": 255 },
"machine_width": { "default_value": 255 }, "machine_width": { "default_value": 255 },

2
resources/definitions/tizyx_evy_dual.def.json
View file

@ -33,7 +33,7 @@
"machine_extruder_count": { "default_value": 2 }, "machine_extruder_count": { "default_value": 2 },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 500 }, "gantry_height": { "value": "500" },
"machine_height": { "default_value": 255 }, "machine_height": { "default_value": 255 },
"machine_depth": { "default_value": 255 }, "machine_depth": { "default_value": 255 },
"machine_width": { "default_value": 255 }, "machine_width": { "default_value": 255 },

2
resources/definitions/tizyx_k25.def.json
View file

@ -30,7 +30,7 @@
"machine_height": { "default_value": 255 }, "machine_height": { "default_value": 255 },
"machine_depth": { "default_value": 255 }, "machine_depth": { "default_value": 255 },
"machine_center_is_zero": { "default_value": false }, "machine_center_is_zero": { "default_value": false },
"gantry_height": { "default_value": 500 }, "gantry_height": { "value": "500" },
"machine_head_with_fans_polygon": { "machine_head_with_fans_polygon": {
"default_value": [ "default_value": [
[25, 49], [25, 49],

2
resources/definitions/ubuild-3d_mr_bot_280.def.json
View file

@ -34,7 +34,7 @@
"machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 }, "machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_with_fans_polygon": { "default_value": [[-20,20],[10,10],[10,10],[10,10]] }, "machine_head_with_fans_polygon": { "default_value": [[-20,20],[10,10],[10,10],[10,10]] },
"gantry_height": { "default_value": 275 }, "gantry_height": { "value": "275" },
"machine_max_feedrate_z": { "default_value": 15 }, "machine_max_feedrate_z": { "default_value": 15 },
"machine_max_feedrate_e": { "default_value": 60 }, "machine_max_feedrate_e": { "default_value": 60 },
"machine_max_acceleration_z": { "default_value": 1000 }, "machine_max_acceleration_z": { "default_value": 1000 },

2
resources/definitions/ultimaker2.def.json
View file

@ -55,7 +55,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 48 "value": "48"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/ultimaker2_plus.def.json
View file

@ -51,7 +51,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 52 "value": "52"
}, },
"machine_nozzle_head_distance": { "machine_nozzle_head_distance": {
"default_value": 5 "default_value": 5

2
resources/definitions/ultimaker3.def.json
View file

@ -63,7 +63,7 @@
"machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 3000 }, "machine_acceleration": { "default_value": 3000 },
"gantry_height": { "default_value": 60 }, "gantry_height": { "value": "60" },
"machine_disallowed_areas": { "default_value": [ "machine_disallowed_areas": { "default_value": [
[[92.8, -53.4], [92.8, -97.5], [116.5, -97.5], [116.5, -53.4]], [[92.8, -53.4], [92.8, -97.5], [116.5, -97.5], [116.5, -53.4]],
[[73.8, 107.5], [73.8, 100.5], [116.5, 100.5], [116.5, 107.5]], [[73.8, 107.5], [73.8, 100.5], [116.5, 100.5], [116.5, 107.5]],

2
resources/definitions/ultimaker_original.def.json
View file

@ -46,7 +46,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/ultimaker_original_dual.def.json
View file

@ -48,7 +48,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/ultimaker_s5.def.json
View file

@ -62,7 +62,7 @@
"machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 3000 }, "machine_acceleration": { "default_value": 3000 },
"gantry_height": { "default_value": 60 }, "gantry_height": { "value": "60" },
"machine_extruder_count": { "default_value": 2 }, "machine_extruder_count": { "default_value": 2 },
"extruder_prime_pos_abs": { "default_value": true }, "extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" }, "machine_start_gcode": { "default_value": "" },

2
resources/definitions/uniqbot_one.def.json
View file

@ -30,7 +30,7 @@
"default_value": false "default_value": false
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/vertex_delta_k8800.def.json
View file

@ -31,7 +31,7 @@
"default_value": "elliptic" "default_value": "elliptic"
}, },
"gantry_height": { "gantry_height": {
"default_value": 0 "value": "0"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/vertex_k8400.def.json
View file

@ -58,7 +58,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 18 "value": "18"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/vertex_k8400_dual.def.json
View file

@ -59,7 +59,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 18 "value": "18"
}, },
"machine_extruder_count": { "machine_extruder_count": {
"default_value": 2 "default_value": 2

2
resources/definitions/wanhao_d6.def.json
View file

@ -36,7 +36,7 @@
"default_value": true "default_value": true
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_gcode_flavor": { "machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)" "default_value": "RepRap (Marlin/Sprinter)"

2
resources/definitions/winbo_dragonl4.def.json
View file

@ -37,7 +37,7 @@
"machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 2000 }, "machine_acceleration": { "default_value": 2000 },
"gantry_height": { "default_value": 80 }, "gantry_height": { "value": "80" },
"machine_extruder_count": { "default_value": 1 }, "machine_extruder_count": { "default_value": 1 },
"machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nM9998\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F800 X585 E12\nG92 E0" }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nM9998\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F800 X585 E12\nG92 E0" },
"machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },

2
resources/definitions/winbo_mini2.def.json
View file

@ -37,7 +37,7 @@
"machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_y": { "default_value": 200 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 3000 }, "machine_acceleration": { "default_value": 3000 },
"gantry_height": { "default_value": 75 }, "gantry_height": { "value": "75" },
"machine_extruder_count": { "default_value": 1 }, "machine_extruder_count": { "default_value": 1 },
"machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F1000 Z3\nG1 F4000 X0\nG1 F4000 Y0\nG1 F1000 Z0.2\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F1000 Z3\nG1 F4000 X0\nG1 F4000 Y0\nG1 F1000 Z0.2\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." },
"machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },

2
resources/definitions/winbo_superhelper105.def.json
View file

@ -37,7 +37,7 @@
"machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_y": { "default_value": 200 },
"machine_max_feedrate_z": { "default_value": 40 }, "machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 2000 }, "machine_acceleration": { "default_value": 2000 },
"gantry_height": { "default_value": 200 }, "gantry_height": { "value": "200" },
"machine_extruder_count": { "default_value": 1 }, "machine_extruder_count": { "default_value": 1 },
"machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." },
"machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },

2
resources/definitions/z-bolt_classic.def.json
View file

@ -41,7 +41,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/z-bolt_plus.def.json
View file

@ -41,7 +41,7 @@
] ]
}, },
"gantry_height": { "gantry_height": {
"default_value": 55 "value": "55"
}, },
"machine_use_extruder_offset_to_offset_coords": { "machine_use_extruder_offset_to_offset_coords": {
"default_value": true "default_value": true

2
resources/definitions/zyyx_agile.def.json
View file

@ -33,7 +33,7 @@
"machine_center_is_zero": { "default_value": true }, "machine_center_is_zero": { "default_value": true },
"machine_gcode_flavor": { "default_value": "Makerbot" }, "machine_gcode_flavor": { "default_value": "Makerbot" },
"machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] },
"gantry_height": { "default_value": 10 }, "gantry_height": { "value": "10" },
"machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_x": { "default_value": 88.888889 },
"machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 },
"machine_steps_per_mm_z": { "default_value": 400 }, "machine_steps_per_mm_z": { "default_value": 400 },

4
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -14,8 +14,6 @@ import Cura 1.0 as Cura
// //
Item Item
{ {
UM.I18nCatalog { id: catalog; name: "cura" }
id: base id: base
height: childrenRect.height height: childrenRect.height
@ -85,7 +83,7 @@ Item
{ {
id: machineList id: machineList
cacheBuffer: 0 // Workaround for https://bugreports.qt.io/browse/QTBUG-49224 cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
model: UM.DefinitionContainersModel model: UM.DefinitionContainersModel
{ {

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -72,7 +72,7 @@ Item
section.criteria: ViewSection.FullString section.criteria: ViewSection.FullString
section.delegate: sectionHeading section.delegate: sectionHeading
cacheBuffer: 0 // Workaround for https://bugreports.qt.io/browse/QTBUG-49224 cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
Component.onCompleted: Component.onCompleted:
{ {