diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index e5411027e3..d19382a591 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -88,7 +88,7 @@ "adhesion_type": { "default_value": "skirt" }, "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]] }, + "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index 1817dfe7db..e5b8f1785c 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -88,7 +88,7 @@ "adhesion_type": { "default_value": "skirt" }, "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]] }, + "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index f126da7752..4bcbd7d526 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -87,7 +87,7 @@ "adhesion_type": { "default_value": "skirt" }, "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]] }, + "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, "gantry_height": { "value": "55" }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index 0a08c56cc6..85e0f0a435 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 400 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10max.def.json b/resources/definitions/creality_cr10max.def.json index cc7dfa6faf..a7e40d5bfc 100644 --- a/resources/definitions/creality_cr10max.def.json +++ b/resources/definitions/creality_cr10max.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 450 }, "machine_depth": { "default_value": 450 }, "machine_height": { "default_value": 470 }, - "machine_head_polygon": { "default_value": [ - [-44, 34], - [-44, -34], - [18, -34], - [18, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-44, 34], [-44, -34], diff --git a/resources/definitions/creality_cr10mini.def.json b/resources/definitions/creality_cr10mini.def.json index bdc0d4406e..621be5f0f3 100644 --- a/resources/definitions/creality_cr10mini.def.json +++ b/resources/definitions/creality_cr10mini.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10s4.def.json b/resources/definitions/creality_cr10s4.def.json index 593a526fc3..ccecd41a1d 100644 --- a/resources/definitions/creality_cr10s4.def.json +++ b/resources/definitions/creality_cr10s4.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 400 }, "machine_depth": { "default_value": 400 }, "machine_height": { "default_value": 400 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10s5.def.json b/resources/definitions/creality_cr10s5.def.json index 91469deb7f..105e1d0458 100644 --- a/resources/definitions/creality_cr10s5.def.json +++ b/resources/definitions/creality_cr10s5.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 500 }, "machine_depth": { "default_value": 500 }, "machine_height": { "default_value": 500 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_cr10spro.def.json b/resources/definitions/creality_cr10spro.def.json index 86897e711a..28c8dda0a5 100644 --- a/resources/definitions/creality_cr10spro.def.json +++ b/resources/definitions/creality_cr10spro.def.json @@ -5,13 +5,6 @@ "overrides": { "machine_name": { "default_value": "Creality CR-10S Pro" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}, - "machine_head_polygon": { "default_value": [ - [-44, 34], - [-44, -34], - [18, -34], - [18, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-44, 34], [-44, -34], diff --git a/resources/definitions/creality_cr20.def.json b/resources/definitions/creality_cr20.def.json index af027f2452..b18c2709e6 100644 --- a/resources/definitions/creality_cr20.def.json +++ b/resources/definitions/creality_cr20.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 250 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender2.def.json b/resources/definitions/creality_ender2.def.json index 55b2e88478..2a5e14c828 100644 --- a/resources/definitions/creality_ender2.def.json +++ b/resources/definitions/creality_ender2.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 150 }, "machine_depth": { "default_value": 150 }, "machine_height": { "default_value": 200 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 645be52bc8..691d590caa 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -12,13 +12,6 @@ "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 250 }, - "machine_head_polygon": { "default_value": [ - [-1, 1], - [-1, -1], - [1, -1], - [1, 1] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender4.def.json b/resources/definitions/creality_ender4.def.json index 6962be558e..9c13797c92 100644 --- a/resources/definitions/creality_ender4.def.json +++ b/resources/definitions/creality_ender4.def.json @@ -7,13 +7,6 @@ "machine_width": { "default_value": 452 }, "machine_depth": { "default_value": 468 }, "machine_height": { "default_value": 482 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json index c1511884ae..1b4be4d71f 100644 --- a/resources/definitions/creality_ender5.def.json +++ b/resources/definitions/creality_ender5.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/creality_ender5plus.def.json b/resources/definitions/creality_ender5plus.def.json index da4e2af635..48ebad61ea 100644 --- a/resources/definitions/creality_ender5plus.def.json +++ b/resources/definitions/creality_ender5plus.def.json @@ -8,13 +8,6 @@ "machine_width": { "default_value": 350 }, "machine_depth": { "default_value": 350 }, "machine_height": { "default_value": 400 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8511d9e969..6fe5206cae 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -411,7 +411,7 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, - "machine_head_polygon": + "machine_head_with_fans_polygon": { "label": "Machine Head Polygon", "description": "A 2D silhouette of the print head (fan caps excluded).", diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index a700f4e473..1f08d37445 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -59,14 +59,6 @@ "adhesion_type": { "default_value": "skirt" }, - "machine_head_polygon": { - "default_value": [ - [-75, 35], - [18, 35], - [18, -18], - [-75, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-75, 35], diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json index b3a558825a..774a3e614c 100644 --- a/resources/definitions/grr_neo.def.json +++ b/resources/definitions/grr_neo.def.json @@ -28,7 +28,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 13a8a7c59b..df839b0fe4 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": true }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-43.7, -19.2], [-43.7, 55], diff --git a/resources/definitions/key3d_tyro.def.json b/resources/definitions/key3d_tyro.def.json index e14f601d7d..0bfc78c115 100644 --- a/resources/definitions/key3d_tyro.def.json +++ b/resources/definitions/key3d_tyro.def.json @@ -32,7 +32,7 @@ "machine_depth": { "default_value": 150 }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index 6b19544612..63f76194a4 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index c7e7f4079d..3c57c0cbc8 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json index 6463ac2ca4..1cfd02fe7f 100644 --- a/resources/definitions/nwa3d_a31.def.json +++ b/resources/definitions/nwa3d_a31.def.json @@ -34,7 +34,7 @@ "machine_depth": { "default_value": 300 }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 4309e07184..1631860d47 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -32,7 +32,7 @@ "machine_depth": { "default_value": 150 }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 581de6fd98..267a7ba4e6 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -31,14 +31,6 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { - "default_value": [ - [-75, -18], - [-75, 35], - [18, 35], - [18, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index b9628b9430..dae1bdce4f 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -31,7 +31,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-75, -18], [-75, 35], diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index b262daa445..9bae80b0ac 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -16,7 +16,7 @@ }, "overrides": { - "machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, "prime_tower_size": { "default_value": 8.660254037844387 }, "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index a66559b393..ba90894f7d 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -21,7 +21,7 @@ "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, - "machine_head_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] }, "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 10 }, "prime_tower_size": { "default_value": 7.745966692414834 }, diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index b4d0252075..6e1a93fb40 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -21,7 +21,7 @@ "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, - "machine_head_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] }, "cool_min_layer_time": { "default_value": 10 }, "prime_tower_size": { "default_value": 7.745966692414834 }, "skirt_gap": { "default_value": 5.0 }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index f50df0c47d..d89c1aeaff 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -15,7 +15,7 @@ }, "overrides": { - "machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, "prime_tower_size": { "default_value": 8.660254037844387 }, "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 15 }, diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 64909630d2..54bd2c3dca 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -21,7 +21,7 @@ "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, - "machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, + "machine_head_with_fans_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, "support_pattern": { "default_value": "grid" }, "cool_min_layer_time": { "default_value": 10 }, "support_angle": { "default_value": 45 }, diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index 038cc3a318..f4bf2b901e 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -23,7 +23,7 @@ "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": + "machine_head_with_fans_polygon": { "default_value": [ diff --git a/resources/definitions/tevo_tornado.def.json b/resources/definitions/tevo_tornado.def.json index 67f25ec9d8..3b6c431feb 100644 --- a/resources/definitions/tevo_tornado.def.json +++ b/resources/definitions/tevo_tornado.def.json @@ -28,7 +28,7 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { + "machine_head_with_fans_polygon": { "default_value": [ [-30, 34], [-30, -32], diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index dad50cffe8..b2a6374f83 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -35,14 +35,6 @@ "machine_center_is_zero": { "default_value": false }, - "machine_head_polygon": { - "default_value": [ - [-60, -18], - [-60, 40], - [18, 40], - [18, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-60, -40], diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index f5c4921cfc..498d550429 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -36,14 +36,6 @@ "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "machine_head_polygon": { - "default_value": [ - [-60, -18], - [-60, 40], - [18, 40], - [18, -18] - ] - }, "machine_head_with_fans_polygon": { "default_value": [ [-60, -40],