From d5d37ccf0fdcc056f46611f6ed9ea719b66eceae Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 9 May 2019 15:04:14 +0200 Subject: [PATCH 1/6] Check if auto slicing needs to be done slightly more frequent Otherwise it might get stuck in some cases if you loaded a object after loading a gcode CURA-6422 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index f57aee190f..bdccfca15e 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -517,9 +517,6 @@ class CuraEngineBackend(QObject, Backend): self._build_plates_to_be_sliced.append(build_plate_number) self.printDurationMessage.emit(source_build_plate_number, {}, []) 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._invokeSlice() @@ -563,10 +560,10 @@ class CuraEngineBackend(QObject, Backend): ## Convenient function: mark everything to slice, emit state and clear layer data def needsSlicing(self) -> None: + self.determineAutoSlicing() self.stopSlicing() self.markSliceAll() 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() From e26e825d8318c70e4755a25f9b21b5f91293eca8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 13 May 2019 09:30:32 +0200 Subject: [PATCH 2/6] Overwrite gantry height value instead of default_value Because the default in fdmprinter has a formula in the value, the default_value properties wouldn't get used any more. --- resources/definitions/101Hero.def.json | 2 +- resources/definitions/3dator.def.json | 2 +- .../definitions/Mark2_for_Ultimaker2.def.json | 2 +- resources/definitions/alfawise_u20.def.json | 2 +- resources/definitions/alfawise_u30.def.json | 2 +- resources/definitions/alya3dp.def.json | 2 +- resources/definitions/alyanx3dp.def.json | 2 +- resources/definitions/anycubic_4max.def.json | 2 +- .../definitions/anycubic_chiron.def.json | 2 +- .../definitions/anycubic_i3_mega.def.json | 2 +- resources/definitions/bibo2_dual.def.json | 2 +- .../builder_premium_large.def.json | 2 +- .../builder_premium_medium.def.json | 2 +- .../builder_premium_small.def.json | 2 +- resources/definitions/cartesio.def.json | 2 +- .../cocoon_create_modelmaker.def.json | 2 +- resources/definitions/creality_cr-x.def.json | 2 +- resources/definitions/creality_cr10.def.json | 2 +- .../definitions/creality_ender3.def.json | 2 +- resources/definitions/creatable_d3.def.json | 4 +- .../definitions/dagoma_discoeasy200.def.json | 2 +- resources/definitions/dagoma_magis.def.json | 2 +- resources/definitions/dagoma_neva.def.json | 2 +- resources/definitions/fabtotum.def.json | 2 +- .../definitions/folgertech_FT-5.def.json | 2 +- resources/definitions/gmax15plus.def.json | 2 +- .../definitions/gmax15plus_dual.def.json | 2 +- resources/definitions/grr_neo.def.json | 2 +- resources/definitions/hms434.def.json | 2 +- .../definitions/innovo_inventor.def.json | 2 +- resources/definitions/jgaurora_a1.def.json | 2 +- resources/definitions/jgaurora_a5.def.json | 2 +- .../jgaurora_jgmaker_magic.def.json | 2 +- .../definitions/jgaurora_z_603s.def.json | 2 +- resources/definitions/kemiq_q2_beta.def.json | 2 +- resources/definitions/kemiq_q2_gama.def.json | 2 +- resources/definitions/kupido.def.json | 2 +- resources/definitions/makeR_pegasus.def.json | 2 +- .../makeR_prusa_tairona_i3.def.json | 2 +- resources/definitions/makeit_pro_l.def.json | 2 +- resources/definitions/makeit_pro_m.def.json | 2 +- resources/definitions/maker_starter.def.json | 2 +- resources/definitions/malyan_m180.def.json | 2 +- .../mankati_fullscale_xt_plus.def.json | 2 +- resources/definitions/mendel90.def.json | 2 +- resources/definitions/nwa3d_a5.def.json | 50 +++++++++---------- resources/definitions/printrbot_play.def.json | 2 +- .../definitions/printrbot_simple.def.json | 1 - .../printrbot_simple_extended.def.json | 2 +- .../printrbot_simple_makers_kit.def.json | 2 +- resources/definitions/prusa_i3.def.json | 2 +- resources/definitions/prusa_i3_mk2.def.json | 2 +- resources/definitions/prusa_i3_xl.def.json | 2 +- .../definitions/raise3D_N2_dual.def.json | 2 +- .../definitions/raise3D_N2_plus_dual.def.json | 2 +- .../raise3D_N2_plus_single.def.json | 2 +- .../definitions/raise3D_N2_single.def.json | 2 +- resources/definitions/rigid3d_zero2.def.json | 2 +- resources/definitions/rigidbot.def.json | 2 +- resources/definitions/rigidbot_big.def.json | 2 +- ...tur3d_discov3ry1_complete_um2plus.def.json | 2 +- resources/definitions/tam.def.json | 4 +- .../definitions/tevo_blackwidow.def.json | 2 +- resources/definitions/tevo_tarantula.def.json | 2 +- resources/definitions/tevo_tornado.def.json | 2 +- resources/definitions/tizyx_evy.def.json | 2 +- resources/definitions/tizyx_evy_dual.def.json | 2 +- resources/definitions/tizyx_k25.def.json | 2 +- .../definitions/ubuild-3d_mr_bot_280.def.json | 2 +- resources/definitions/ultimaker2.def.json | 2 +- .../definitions/ultimaker2_plus.def.json | 2 +- resources/definitions/ultimaker3.def.json | 2 +- .../definitions/ultimaker_original.def.json | 2 +- .../ultimaker_original_dual.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- resources/definitions/uniqbot_one.def.json | 2 +- .../definitions/vertex_delta_k8800.def.json | 2 +- resources/definitions/vertex_k8400.def.json | 2 +- .../definitions/vertex_k8400_dual.def.json | 2 +- resources/definitions/wanhao_d6.def.json | 2 +- resources/definitions/winbo_dragonl4.def.json | 2 +- resources/definitions/winbo_mini2.def.json | 2 +- .../definitions/winbo_superhelper105.def.json | 2 +- resources/definitions/z-bolt_classic.def.json | 2 +- resources/definitions/z-bolt_plus.def.json | 2 +- resources/definitions/zyyx_agile.def.json | 2 +- 86 files changed, 111 insertions(+), 112 deletions(-) diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index d77f01fd82..a77ea5ed97 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -38,7 +38,7 @@ "speed_wall": { "value": "speed_print * 0.7" }, "speed_topbottom": { "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_amount": { "default_value" : 2.5 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index e91c46920b..901ea87510 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -45,7 +45,7 @@ ] }, "gantry_height": { - "default_value": 30 + "value": "30" }, "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" }, diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 0379d3967c..5a6e13d27e 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -37,7 +37,7 @@ "default_value": 203 }, "gantry_height": { - "default_value": 52 + "value": "52" }, "machine_center_is_zero": { "default_value": false diff --git a/resources/definitions/alfawise_u20.def.json b/resources/definitions/alfawise_u20.def.json index 8a6badeca6..748bf8797a 100644 --- a/resources/definitions/alfawise_u20.def.json +++ b/resources/definitions/alfawise_u20.def.json @@ -39,7 +39,7 @@ "default_value": false }, "gantry_height": { - "default_value": 10 + "value": "10" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/alfawise_u30.def.json b/resources/definitions/alfawise_u30.def.json index bba1c056af..44caf61d1a 100644 --- a/resources/definitions/alfawise_u30.def.json +++ b/resources/definitions/alfawise_u30.def.json @@ -36,7 +36,7 @@ "retraction_enable": { "default_value": true }, "retraction_amount": { "default_value": 5 }, "retraction_speed": { "default_value": 45 }, - "gantry_height": { "default_value": 25 }, + "gantry_height": { "value": "25" }, "machine_width": { "default_value": 220 }, "machine_height": { "default_value": 250 }, "machine_depth": { "default_value": 220 }, diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 7187048da0..8de7c79641 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -30,7 +30,7 @@ "machine_height": { "default_value": 133 }, "machine_depth": { "default_value": 100 }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55"}, "retraction_amount": { "default_value": 1.5 }, "support_enable": { "default_value": true}, "machine_head_with_fans_polygon": { diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 085acc20c1..07e0a090a9 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -30,7 +30,7 @@ "machine_height": { "default_value": 170 }, "machine_depth": { "default_value": 160 }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55"}, "retraction_amount": { "default_value": 1.5 }, "support_enable": { "default_value": true}, "machine_head_with_fans_polygon": { diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json index 58cbaa3b22..05fffcb206 100644 --- a/resources/definitions/anycubic_4max.def.json +++ b/resources/definitions/anycubic_4max.def.json @@ -50,7 +50,7 @@ "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "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" }, "acceleration_enabled": { "value": "True" }, diff --git a/resources/definitions/anycubic_chiron.def.json b/resources/definitions/anycubic_chiron.def.json index 83c2056d76..1b18a936a7 100644 --- a/resources/definitions/anycubic_chiron.def.json +++ b/resources/definitions/anycubic_chiron.def.json @@ -52,7 +52,7 @@ }, "gantry_height": { - "default_value": 35 + "value": "35" }, "machine_head_with_fans_polygon": { diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index 6e81085fdd..cc9832cf09 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -46,7 +46,7 @@ }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index 1ae16a49b1..d897a76133 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -64,7 +64,7 @@ ] }, "gantry_height": { - "default_value": 12 + "value": "12" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index 2e0cd4f839..3ceae8d63f 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -93,7 +93,7 @@ "machine_nozzle_heat_up_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]] }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index 58e7c18ed8..5f608ba2a8 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -93,7 +93,7 @@ "machine_nozzle_heat_up_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]] }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 89e172592c..a19773ec05 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -92,7 +92,7 @@ "machine_nozzle_heat_up_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]] }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 9c7a95cceb..1d83363684 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -35,7 +35,7 @@ "machine_extruder_count": { "default_value": 2 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 35 }, + "gantry_height": { "value": "35" }, "machine_height": { "default_value": 400 }, "machine_depth": { "default_value": 270 }, "machine_width": { "default_value": 430 }, diff --git a/resources/definitions/cocoon_create_modelmaker.def.json b/resources/definitions/cocoon_create_modelmaker.def.json index 22aa75d09e..83d1f41a99 100644 --- a/resources/definitions/cocoon_create_modelmaker.def.json +++ b/resources/definitions/cocoon_create_modelmaker.def.json @@ -39,7 +39,7 @@ "default_value": false }, "gantry_height": { - "default_value": 10 + "value": "10" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/creality_cr-x.def.json b/resources/definitions/creality_cr-x.def.json index 94ac20cbb5..0117c4fffe 100644 --- a/resources/definitions/creality_cr-x.def.json +++ b/resources/definitions/creality_cr-x.def.json @@ -30,7 +30,7 @@ "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 70}, "adhesion_type": { "default_value": "skirt" }, - "gantry_height": { "default_value": 30 }, + "gantry_height": { "value": "30" }, "speed_print": { "default_value": 60 }, "speed_travel": { "default_value": 120 }, "machine_max_acceleration_x": { "default_value": 500 }, diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index fb63867163..d0bca54b73 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -71,7 +71,7 @@ "default_value": true }, "gantry_height": { - "default_value": 30 + "value": "30" }, "acceleration_enabled": { "default_value": true diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 1af70fab63..827fbbf54f 100755 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -31,7 +31,7 @@ "default_value": true }, "gantry_height": { - "default_value": 30 + "value": "30" }, "machine_head_polygon": { "default_value": [ diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index 3fb1205ead..1491089e24 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -24,8 +24,8 @@ "machine_depth": { "default_value": 250 }, "machine_heated_bed": { "default_value": true }, "machine_shape": { "default_value": "elliptic" }, - "machine_max_feedrate_z": { "default_value": 300 }, - "gantry_height": {"default_value": 43}, + "machine_max_feedrate_z": { "default_value": 300 }, + "gantry_height": {"value": "43"}, "layer_height": { "default_value": 0.1 }, "relative_extrusion": { "default_value": false }, "retraction_combing": { "default_value": "off" }, diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 89d94ff6b7..17e285a422 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -38,7 +38,7 @@ ] }, "gantry_height": { - "default_value": 10 + "value": "10" }, "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" diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json index 75e6e449cd..9d2f7170c6 100644 --- a/resources/definitions/dagoma_magis.def.json +++ b/resources/definitions/dagoma_magis.def.json @@ -38,7 +38,7 @@ ] }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_shape": { "default_value": "elliptic" diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 67c8795678..ea6046b613 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -38,7 +38,7 @@ ] }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_shape": { "default_value": "elliptic" diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 10c8f68844..959a5bdaec 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -28,7 +28,7 @@ "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)" }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "machine_width": { "default_value": 214 }, "machine_height": { "default_value": 241.5 }, "machine_depth": { "default_value": 234 }, diff --git a/resources/definitions/folgertech_FT-5.def.json b/resources/definitions/folgertech_FT-5.def.json index d3d00a9b25..7ede40a025 100644 --- a/resources/definitions/folgertech_FT-5.def.json +++ b/resources/definitions/folgertech_FT-5.def.json @@ -18,7 +18,7 @@ "machine_width": { "default_value": 300 }, "machine_height": { "default_value": 400 }, "machine_depth": { "default_value": 300 }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "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..." diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index 069b8be999..eb576f0e19 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -37,7 +37,7 @@ "retraction_amount": { "default_value": 1 }, "retraction_speed": { "default_value": 70}, "adhesion_type": { "default_value": "skirt" }, - "gantry_height": { "default_value": 50 }, + "gantry_height": { "value": "50" }, "speed_print": { "default_value": 50 }, "speed_travel": { "default_value": 70 }, "machine_max_acceleration_x": { "default_value": 600 }, diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index 0264ef5977..40a3dde303 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -35,7 +35,7 @@ "retraction_amount": { "default_value": 1 }, "retraction_speed": { "default_value": 70}, "adhesion_type": { "default_value": "skirt" }, - "gantry_height": { "default_value": 50 }, + "gantry_height": { "value": "50" }, "speed_print": { "default_value": 50 }, "speed_travel": { "default_value": 70 }, "machine_max_acceleration_x": { "default_value": 600 }, diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json index 67d6a92023..b3a558825a 100644 --- a/resources/definitions/grr_neo.def.json +++ b/resources/definitions/grr_neo.def.json @@ -37,7 +37,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 163f3fbec2..70dee4989e 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -43,7 +43,7 @@ "material_diameter": {"default_value": 1.75 }, "machine_heated_bed": {"default_value": true }, "machine_center_is_zero": {"default_value": false }, - "gantry_height": {"default_value": 35 }, + "gantry_height": {"value": "35" }, "machine_height": {"default_value": 400 }, "machine_depth": {"default_value": 325 }, "machine_width": {"default_value": 450 }, diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 91a6d8365b..72a9ec3edb 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -41,7 +41,7 @@ ] }, "gantry_height": { - "default_value": 82.3 + "value": "82.3" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json index b9a921c311..3c9f9c61e9 100644 --- a/resources/definitions/jgaurora_a1.def.json +++ b/resources/definitions/jgaurora_a1.def.json @@ -39,7 +39,7 @@ "default_value": false }, "gantry_height": { - "default_value": 10 + "value": "10" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/jgaurora_a5.def.json b/resources/definitions/jgaurora_a5.def.json index d84a8440e6..e02fca881b 100644 --- a/resources/definitions/jgaurora_a5.def.json +++ b/resources/definitions/jgaurora_a5.def.json @@ -41,7 +41,7 @@ "default_value": false }, "gantry_height": { - "default_value": 10 + "value": "10" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/jgaurora_jgmaker_magic.def.json b/resources/definitions/jgaurora_jgmaker_magic.def.json index 4036ec51bf..703305151a 100644 --- a/resources/definitions/jgaurora_jgmaker_magic.def.json +++ b/resources/definitions/jgaurora_jgmaker_magic.def.json @@ -39,7 +39,7 @@ "default_value": false }, "gantry_height": { - "default_value": 10 + "value": "10" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index 3a78585240..cf92f2fc71 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -39,7 +39,7 @@ "default_value": false }, "gantry_height": { - "default_value": 10 + "value": "10" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 387818565e..f0ae009419 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -41,7 +41,7 @@ "default_value": 2 }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index fd6f2d54aa..07ff6dcbf7 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -42,7 +42,7 @@ "default_value": 2 }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 191e02ba34..a81a40542b 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -29,7 +29,7 @@ "machine_height": { "default_value": 190 }, "machine_depth": { "default_value": 195 }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "retraction_amount": { "default_value": 1 }, "support_enable": { "default_value": true}, "machine_head_with_fans_polygon": { diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index ac09aa01ac..6b19544612 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -41,7 +41,7 @@ ] }, "gantry_height": { - "default_value": -25 + "value": "25" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index 0e59874978..c7e7f4079d 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -41,7 +41,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index d40d63f97b..92f98241da 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -39,7 +39,7 @@ ] }, "gantry_height": { - "default_value": 330 + "value": "330" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 1f0381df86..1b3ae8098c 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -39,7 +39,7 @@ ] }, "gantry_height": { - "default_value": 200 + "value": "200" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 4f94ca905d..560e53ccb9 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -33,7 +33,7 @@ "default_value": false }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/malyan_m180.def.json b/resources/definitions/malyan_m180.def.json index 53864dabae..cd3a068134 100644 --- a/resources/definitions/malyan_m180.def.json +++ b/resources/definitions/malyan_m180.def.json @@ -53,7 +53,7 @@ "default_value": 92 }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index 507e5209b2..104be7091b 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -28,7 +28,7 @@ [ 3, 3 ] ] }, - "gantry_height": { "default_value": 0 }, + "gantry_height": { "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 85d82ae176..39cb4de8d3 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -68,7 +68,7 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_head_with_fans_polygon": { diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 3deb0027fd..2829b06927 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -15,50 +15,50 @@ "preferred_quality_type": "normal", "has_machine_quality": true, "preferred_material": "generic_pla", - "machine_extruder_trains": + "machine_extruder_trains": { "0": "nwa3d_a5_extruder_0" } }, - + "overrides": { - "machine_name": { - "default_value": "NWA3D A5" + "machine_name": { + "default_value": "NWA3D A5" }, - "machine_width": { - "default_value": 125 + "machine_width": { + "default_value": 125 }, - "machine_height": { - "default_value": 100 + "machine_height": { + "default_value": 100 }, - "machine_depth": { - "default_value": 150 + "machine_depth": { + "default_value": 150 }, - "machine_head_polygon": { + "machine_head_polygon": { "default_value": [ - [-30, 34], - [-30, -32], - [30, -32], + [-30, 34], + [-30, -32], + [30, -32], [30, 34] - ] + ] }, - "gantry_height": { - "default_value": 30 + "gantry_height": { + "value": "30" }, - "machine_heated_bed": { - "default_value": false + "machine_heated_bed": { + "default_value": false }, "material_diameter": { "default_value": 1.75 }, - "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" + "machine_gcode_flavor": { + "default_value": "RepRap (RepRap)" }, - "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" + "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" }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" } } } diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index e3a18a4eee..b8879e825c 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -27,7 +27,7 @@ "retraction_speed": { "default_value": 45}, "adhesion_type": { "default_value": "skirt" }, "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_travel": { "default_value": 55 }, "machine_max_feedrate_x": {"default_value": 125}, diff --git a/resources/definitions/printrbot_simple.def.json b/resources/definitions/printrbot_simple.def.json index fb65b77fa5..4d1f368b6d 100644 --- a/resources/definitions/printrbot_simple.def.json +++ b/resources/definitions/printrbot_simple.def.json @@ -30,7 +30,6 @@ [55, -99999] ] }, - "gantry_height": { "default_value": 99999 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { diff --git a/resources/definitions/printrbot_simple_extended.def.json b/resources/definitions/printrbot_simple_extended.def.json index 1e004a8ca3..c4cab54386 100644 --- a/resources/definitions/printrbot_simple_extended.def.json +++ b/resources/definitions/printrbot_simple_extended.def.json @@ -30,7 +30,7 @@ [ -49, -20 ] ] }, - "gantry_height": { "default_value": 99999 }, + "gantry_height": { "value": "99999" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { diff --git a/resources/definitions/printrbot_simple_makers_kit.def.json b/resources/definitions/printrbot_simple_makers_kit.def.json index ad6ecee21e..1223f2a4d9 100644 --- a/resources/definitions/printrbot_simple_makers_kit.def.json +++ b/resources/definitions/printrbot_simple_makers_kit.def.json @@ -27,7 +27,7 @@ [60, -10] ] }, - "gantry_height": { "default_value": 1000 }, + "gantry_height": { "value": "1000" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 1f0eb37aec..dd6c87c046 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -48,7 +48,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index 5c5583b56f..29407b0afd 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -31,7 +31,7 @@ "retraction_prime_speed": { "default_value": 35 }, "adhesion_type": { "default_value": "skirt" }, "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_e": { "default_value": 120 }, "machine_max_acceleration_z": { "default_value": 500 }, diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index 9931be5c72..aa5fcf6df9 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -40,7 +40,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index f4600bc027..1994cc2bcb 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -58,7 +58,7 @@ "default_value": "skirt" }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index 010c8cfa73..23ad1fbd09 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -58,7 +58,7 @@ "default_value": "skirt" }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index dd2162f5a9..f8a1a7e0fb 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -57,7 +57,7 @@ "default_value": "skirt" }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index e549b97b3b..c69823466b 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -57,7 +57,7 @@ "default_value": "skirt" }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index 09390ed8b5..f24c869636 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -81,7 +81,7 @@ "default_value": false }, "gantry_height": { - "default_value": 25 + "value": "25" }, "machine_gcode_flavor": { "default_value": "RepRap" diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index 5eb346c7ca..c04cd7c5e6 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -29,7 +29,7 @@ "default_value": true }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index 581b6144a0..c97c6df9f3 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -29,7 +29,7 @@ "default_value": true }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 2875b949be..2d54555c15 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -77,7 +77,7 @@ "default_value": true }, "gantry_height": { - "default_value": 52 + "value": "52" }, "machine_nozzle_head_distance": { "default_value": 5 diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 0ed8d657a2..2a23688eb8 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -32,8 +32,8 @@ "machine_heated_bed": { "default_value": true }, "machine_head_with_fans_polygon": { "default_value": [ [ -35, 65 ], [ -35, -55 ], [ 55, 65 ], [ 55, -55 ] ] }, - "gantry_height": { "default_value": 35 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "gantry_height": { "value": "35" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_center_is_zero": { "default_value": false }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json index 25e7a2620d..9e450067fb 100644 --- a/resources/definitions/tevo_blackwidow.def.json +++ b/resources/definitions/tevo_blackwidow.def.json @@ -44,7 +44,7 @@ }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index ec4ae667d5..038cc3a318 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -33,7 +33,7 @@ [18, -18] ] }, - "gantry_height": { "default_value": 55 }, + "gantry_height": { "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_acceleration": { "default_value": 2650 }, "machine_max_jerk_xy": { "default_value": 15.0 }, diff --git a/resources/definitions/tevo_tornado.def.json b/resources/definitions/tevo_tornado.def.json index 9110e4ba4d..871856e004 100644 --- a/resources/definitions/tevo_tornado.def.json +++ b/resources/definitions/tevo_tornado.def.json @@ -70,7 +70,7 @@ "default_value": true }, "gantry_height": { - "default_value": 30 + "value": "30" }, "acceleration_enabled": { "default_value": false diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index a0bf5d76be..c90433d85a 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -32,7 +32,7 @@ "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 500 }, + "gantry_height": { "value": "500" }, "machine_height": { "default_value": 255 }, "machine_depth": { "default_value": 255 }, "machine_width": { "default_value": 255 }, diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 2e5ed8b126..aaa2756181 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -33,7 +33,7 @@ "machine_extruder_count": { "default_value": 2 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 500 }, + "gantry_height": { "value": "500" }, "machine_height": { "default_value": 255 }, "machine_depth": { "default_value": 255 }, "machine_width": { "default_value": 255 }, diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index c076b214c7..28b4857d89 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -30,7 +30,7 @@ "machine_height": { "default_value": 255 }, "machine_depth": { "default_value": 255 }, "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "default_value": 500 }, + "gantry_height": { "value": "500" }, "machine_head_with_fans_polygon": { "default_value": [ [25, 49], diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 7eb65c3e78..060752387b 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -34,7 +34,7 @@ "machine_nozzle_heat_up_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]] }, - "gantry_height": { "default_value": 275 }, + "gantry_height": { "value": "275" }, "machine_max_feedrate_z": { "default_value": 15 }, "machine_max_feedrate_e": { "default_value": 60 }, "machine_max_acceleration_z": { "default_value": 1000 }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 88731bc297..285f5bed08 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -55,7 +55,7 @@ "default_value": false }, "gantry_height": { - "default_value": 48 + "value": "48" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index dd97e944d6..f95d29c684 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -51,7 +51,7 @@ "default_value": true }, "gantry_height": { - "default_value": 52 + "value": "52" }, "machine_nozzle_head_distance": { "default_value": 5 diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 3535661245..d2cd0376d3 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -63,7 +63,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "default_value": 60 }, + "gantry_height": { "value": "60" }, "machine_disallowed_areas": { "default_value": [ [[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]], diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index b0637625af..71130312e7 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -46,7 +46,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index cbc98f31a3..fd9b91e238 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -48,7 +48,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 41808c134f..baa09b7392 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -62,7 +62,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "default_value": 60 }, + "gantry_height": { "value": "60" }, "machine_extruder_count": { "default_value": 2 }, "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, diff --git a/resources/definitions/uniqbot_one.def.json b/resources/definitions/uniqbot_one.def.json index 5a33500b75..ec8336ae50 100644 --- a/resources/definitions/uniqbot_one.def.json +++ b/resources/definitions/uniqbot_one.def.json @@ -30,7 +30,7 @@ "default_value": false }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json index df24bd84fb..51c745a841 100644 --- a/resources/definitions/vertex_delta_k8800.def.json +++ b/resources/definitions/vertex_delta_k8800.def.json @@ -31,7 +31,7 @@ "default_value": "elliptic" }, "gantry_height": { - "default_value": 0 + "value": "0" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index a3a3777547..b43751cadc 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -58,7 +58,7 @@ ] }, "gantry_height": { - "default_value": 18 + "value": "18" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index c7706135bd..145cb7abec 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -59,7 +59,7 @@ ] }, "gantry_height": { - "default_value": 18 + "value": "18" }, "machine_extruder_count": { "default_value": 2 diff --git a/resources/definitions/wanhao_d6.def.json b/resources/definitions/wanhao_d6.def.json index c8a690d02c..eaaae54826 100644 --- a/resources/definitions/wanhao_d6.def.json +++ b/resources/definitions/wanhao_d6.def.json @@ -36,7 +36,7 @@ "default_value": true }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 132303f525..bf52a785e9 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -37,7 +37,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 2000 }, - "gantry_height": { "default_value": 80 }, + "gantry_height": { "value": "80" }, "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_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index 81bb737cff..f1c94ca07e 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -37,7 +37,7 @@ "machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "default_value": 75 }, + "gantry_height": { "value": "75" }, "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_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 2e89276dcd..ac78467a2a 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -37,7 +37,7 @@ "machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 2000 }, - "gantry_height": { "default_value": 200 }, + "gantry_height": { "value": "200" }, "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_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, diff --git a/resources/definitions/z-bolt_classic.def.json b/resources/definitions/z-bolt_classic.def.json index d294de473a..f9212c9597 100644 --- a/resources/definitions/z-bolt_classic.def.json +++ b/resources/definitions/z-bolt_classic.def.json @@ -41,7 +41,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/z-bolt_plus.def.json b/resources/definitions/z-bolt_plus.def.json index 57331df4c6..dace8ea300 100644 --- a/resources/definitions/z-bolt_plus.def.json +++ b/resources/definitions/z-bolt_plus.def.json @@ -41,7 +41,7 @@ ] }, "gantry_height": { - "default_value": 55 + "value": "55" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index 17265bf6f6..a4b3c3ee8b 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -33,7 +33,7 @@ "machine_center_is_zero": { "default_value": true }, "machine_gcode_flavor": { "default_value": "Makerbot" }, "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_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, From 233013c9469ca0fc7a507f73707ed6ec1ab58267 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 13 May 2019 13:23:10 +0200 Subject: [PATCH 3/6] Cache a lot of items in the list so there are no glitches --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 4 ++-- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index cb0bad67ea..1be17adf7f 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -14,7 +14,7 @@ import Cura 1.0 as Cura // Item { - UM.I18nCatalog { id: catalog; name: "cura" } +// UM.I18nCatalog { id: catalog; name: "cura" } id: base height: childrenRect.height @@ -85,7 +85,7 @@ Item { 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 { diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 6d8f75c3f5..95eff0465a 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -72,7 +72,7 @@ Item section.criteria: ViewSection.FullString 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: { From cac4b8b7f1935e45a87117ac978de4b6f3e59cdb Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 13 May 2019 13:34:13 +0200 Subject: [PATCH 4/6] Remove useless comment line --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 1be17adf7f..3dd9e86ee9 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -14,8 +14,6 @@ import Cura 1.0 as Cura // Item { -// UM.I18nCatalog { id: catalog; name: "cura" } - id: base height: childrenRect.height From 36ddf2f018e18d9673922542bda646ed7bbf6ac9 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 13 May 2019 13:49:00 +0200 Subject: [PATCH 5/6] Do not allow the use of "weight" for third party printers Otherwise external contributors can manipulate the order in which they appear in the list --- resources/definitions/Mark2_for_Ultimaker2.def.json | 1 - .../definitions/structur3d_discov3ry1_complete_um2plus.def.json | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 5a6e13d27e..0fab42cab0 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -13,7 +13,6 @@ "has_machine_materials": false, "has_machine_quality": false, "has_variant_materials": false, - "weight": 2, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 2d54555c15..b4f91d68d1 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -6,7 +6,6 @@ "author": "Andrew Finkle, CTO", "manufacturer": "Structur3d.io", "visible": true, - "weight": 1, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2Plusbackplate.png", From 2e93948c846f595fb2d370af8e7207e7ddb33b41 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 13 May 2019 17:10:51 +0200 Subject: [PATCH 6/6] Take minimum of all build volume temperature values According to the Materials and Processing team here, this is better because it guarantees that the coldest of your materials won't sag. Contributes to issue CURA-6514. --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9691819e48..5efe3d0a5d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2062,8 +2062,8 @@ "description": "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted.", "unit": "°C", "type": "float", - "default_value": 0, - "resolve": "max(extruderValues('build_volume_temperature'))", + "default_value": 35, + "resolve": "min(extruderValues('build_volume_temperature'))", "minimum_value": "-273.15", "minimum_value_warning": "0", "maximum_value_warning": "285",