From acf79aa31d88db820b8bb1e4148299a33a2512e5 Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Thu, 11 Feb 2021 11:45:07 +0100
Subject: [PATCH 01/13] Definitions for INAT Proton X printers

---
 resources/definitions/inat_base.def.json      | 477 ++++++++++++++++++
 .../definitions/inat_proton_x_rail.def.json   |  41 ++
 .../definitions/inat_proton_x_rod.def.json    |  41 ++
 resources/extruders/inat_extruder_0.def.json  |  15 +
 resources/meshes/inat_proton_x_buildplate.stl | Bin 0 -> 20284 bytes
 .../inat_base_advanced_materials.inst.cfg     |  17 +
 .../quality/inat/inat_base_draft.inst.cfg     |  16 +
 .../quality/inat/inat_base_fine.inst.cfg      |  14 +
 .../quality/inat/inat_base_standard.inst.cfg  |  15 +
 .../quality/inat/inat_base_strong.inst.cfg    |  22 +
 .../inat/inat_base_tree_support.inst.cfg      |  17 +
 11 files changed, 675 insertions(+)
 create mode 100644 resources/definitions/inat_base.def.json
 create mode 100644 resources/definitions/inat_proton_x_rail.def.json
 create mode 100644 resources/definitions/inat_proton_x_rod.def.json
 create mode 100644 resources/extruders/inat_extruder_0.def.json
 create mode 100644 resources/meshes/inat_proton_x_buildplate.stl
 create mode 100644 resources/quality/inat/inat_base_advanced_materials.inst.cfg
 create mode 100644 resources/quality/inat/inat_base_draft.inst.cfg
 create mode 100644 resources/quality/inat/inat_base_fine.inst.cfg
 create mode 100644 resources/quality/inat/inat_base_standard.inst.cfg
 create mode 100644 resources/quality/inat/inat_base_strong.inst.cfg
 create mode 100644 resources/quality/inat/inat_base_tree_support.inst.cfg

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
new file mode 100644
index 0000000000..ffc3d7a43e
--- /dev/null
+++ b/resources/definitions/inat_base.def.json
@@ -0,0 +1,477 @@
+{
+    "name": "INAT Base description",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "INAT s.r.o.",
+        "manufacturer": "INAT s.r.o.",
+        "file_formats": "text/x-gcode",
+        "visible": false,
+        "has_materials": true,
+        "has_variants": false,
+        "variants_name": "Extruder:",
+        "preferred_variant_name": "0.4mm",
+        "has_machine_quality": true,
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "machine_extruder_trains": {
+            "0": "inat_extruder_0"
+        },
+        "first_start_actions": [
+            "MachineSettingsAction"
+        ]
+    },
+    "overrides": {
+        "machine_start_gcode": {
+            "default_value": "G28 ;Home\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "M400\nM104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F2000\nM84\n"
+        },
+        "material_diameter": {
+            "value": 1.75
+        },
+        "machine_width": {
+            "value": 304
+        },
+        "machine_depth": {
+            "value": 304
+        },
+        "machine_shape": {
+            "value": "rectangular"
+        },
+        "machine_height": {
+            "value": 430
+        },
+        "machine_heated_bed": {
+            "value": true
+        },
+        "machine_heated_build_volume": {
+            "value": false
+        },
+        "machine_gcode_flavor": {
+            "value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_head_with_fans_polygon": {
+            "value": [
+                [
+                    -20,
+                    10
+                ],
+                [
+                    10,
+                    10
+                ],
+                [
+                    10,
+                    -10
+                ],
+                [
+                    -20,
+                    -10
+                ]
+            ]
+        },
+        "gantry_height": {
+            "value": 99999999999
+        },
+        "machine_nozzle_size": {
+            "value": 0.4
+        },
+        "machine_max_feedrate_x": {
+            "value": 200
+        },
+        "machine_max_feedrate_y": {
+            "value": 200
+        },
+        "machine_max_feedrate_z": {
+            "value": 10
+        },
+        "machine_max_feedrate_e": {
+            "value": 100
+        },
+        "machine_max_acceleration_x": {
+            "value": 500
+        },
+        "machine_max_acceleration_y": {
+            "value": 500
+        },
+        "machine_max_acceleration_z": {
+            "value": 200
+        },
+        "machine_max_acceleration_e": {
+            "value": 2000
+        },
+        "machine_acceleration": {
+            "value": 500
+        },
+        "machine_max_jerk_xy": {
+            "value": 8
+        },
+        "machine_max_jerk_z": {
+            "value": 2.0
+        },
+        "machine_max_jerk_e": {
+            "value": 5.0
+        },
+        "layer_height": {
+            "value": 0.2
+        },
+        "layer_height_0": {
+            "value": "machine_nozzle_size / 2.0"
+        },
+        "line_width": {
+            "value": "1.05 * machine_nozzle_size",
+            "minimum_value_warning": "0.8 * machine_nozzle_size",
+            "maximum_value_warning": "1.6 * machine_nozzle_size"
+        },
+        "wall_thickness": {
+            "value": "3*wall_line_width"
+        },
+        "roofing_layer_count": {
+            "value": 2
+        },
+        "top_bottom_thickness": {
+            "value": 1.0
+        },
+        "top_bottom_pattern": {
+            "value": "'zigzag'"
+        },
+        "optimize_wall_printing_order": {
+            "value": true
+        },
+        "xy_offset_layer_0": {
+            "value": "-0.5*line_width"
+        },
+        "skin_outline_count": {
+            "value": 2
+        },
+        "infill_sparse_density": {
+            "value": 30
+        },
+        "infill_pattern": {
+            "value": "'zigzag' if infill_sparse_density > 50 else 'cubic'"
+        },
+        "infill_sparse_thickness": {
+            "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else 2*layer_height"
+        },
+        "expand_skins_expand_distance": {
+            "value": "4"
+        },
+        "default_material_print_temperature": {
+            "maximum_value_warning": "450",
+            "maximum_value": "485"
+        },
+        "material_print_temperature": {
+            "maximum_value_warning": "450",
+            "maximum_value": "485"
+        },
+        "material_print_temperature_layer_0": {
+            "value": "material_print_temperature",
+            "maximum_value_warning": "450",
+            "maximum_value": "485"
+        },
+        "material_initial_print_temperature": {
+            "value": "material_print_temperature",
+            "maximum_value_warning": "450",
+            "maximum_value": "485"
+        },
+        "material_final_print_temperature": {
+            "value": "material_print_temperature",
+            "maximum_value_warning": "450",
+            "maximum_value": "485"
+        },
+        "default_material_bed_temperature": {
+            "maximum_value_warning": "140",
+            "maximum_value": "140"
+        },
+        "material_bed_temperature": {
+            "maximum_value_warning": "140",
+            "maximum_value": "140"
+        },
+        "material_bed_temperature_layer_0": {
+            "maximum_value_warning": "140",
+            "maximum_value": "140"
+        },
+        "speed_infill": {
+            "value": "speed_print"
+        },
+        "speed_wall": {
+            "value": "speed_print"
+        },
+        "speed_wall_0": {
+            "value": "0.5 * speed_wall"
+        },
+        "speed_wall_x": {
+            "value": "speed_wall"
+        },
+        "speed_roofing": {
+            "value": "speed_wall_0"
+        },
+        "speed_topbottom": {
+            "value": "speed_print"
+        },
+        "speed_travel": {
+            "value": "150"
+        },
+        "speed_layer_0": {
+            "value": "30"
+        },
+        "speed_travel_layer_0": {
+            "value": "0.5 * speed_travel"
+        },
+        "speed_z_hop": {
+            "value": 10
+        },
+        "acceleration_print": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500",
+            "value": 500
+        },
+        "acceleration_infill": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_wall": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_wall_0": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_wall_x": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_roofing": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_topbottom": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_support": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_support_infill": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_support_interface": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_support_roof": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_support_bottom": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_prime_tower": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_travel": {
+            "value": "acceleration_print",
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_layer_0": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_print_layer_0": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_travel_layer_0": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "acceleration_skirt_brim": {
+            "minimum_value_warning": "100",
+            "maximum_value_warning": "1500"
+        },
+        "jerk_print": {
+            "maximum_value_warning": "20",
+            "value": 8
+        },
+        "jerk_infill": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_wall": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_wall_0": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_wall_x": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_roofing": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_topbottom": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_support": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_support_infill": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_support_interface": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_support_roof": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_support_bottom": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_prime_tower": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_travel": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_layer_0": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_print_layer_0": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_travel_layer_0": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "jerk_skirt_brim": {
+            "maximum_value_warning": "20",
+            "value": "jerk_print"
+        },
+        "retraction_amount": {
+            "value": 1.8,
+            "maximum_value_warning": "2.0"
+        },
+        "retraction_speed": {
+            "value": 45
+        },
+        "retraction_combing": {
+            "value": "infill"
+        },
+        "retraction_hop_enabled": {
+            "value": true
+        },
+        "retraction_hop": {
+            "value": "3*layer_height"
+        },
+        "cool_fan_speed_min": {
+            "value": "0.5*cool_fan_speed"
+        },
+        "cool_min_layer_time_fan_speed_max": {
+            "value": 10
+        },
+        "support_angle": {
+            "value": 60
+        },
+        "support_wall_count": {
+            "value": "1 if (support_structure == 'tree') else 0"
+        },
+        "support_infill_rate": {
+            "value": 10
+        },
+        "support_infill_angles": {
+            "value": "[45]"
+        },
+        "support_z_distance": {
+            "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else (2*layer_height)"
+        },
+        "support_join_distance": {
+            "value": 5.0
+        },
+        "support_offset": {
+            "value": 3.0
+        },
+        "support_infill_sparse_thickness": {
+            "value": "infill_sparse_thickness"
+        },
+        "support_interface_enable": {
+            "value": true
+        },
+        "support_interface_height": {
+            "value": 1.0
+        },
+        "support_interface_density": {
+            "value": 80
+        },
+        "support_interface_pattern": {
+            "value": "'grid'"
+        },
+        "support_interface_offset": {
+            "value": "support_offset"
+        },
+        "support_fan_enable": {
+            "value": true
+        },
+        "support_use_towers": {
+            "value": false
+        },
+        "support_tree_angle": {
+            "value": 60        
+        },
+        "adhesion_type": {
+            "value": "'skirt'"
+        },
+        "skirt_line_count": {
+            "value": 5
+        },
+        "skirt_brim_minimal_length": {
+            "value": 500
+        },
+        "skirt_gap": {
+            "value": 10
+        },
+        "brim_outside_only": {
+            "value": false
+        },
+        "raft_margin": {
+            "value": 10
+        },
+        "raft_airgap": {
+            "value": "0.5 * layer_height"
+        },
+        "raft_interface_thickness": {
+            "value": "0.8*machine_nozzle_size",
+            "maximum_value_warning": "0.8 * machine_nozzle_size"
+        },
+        "raft_interface_line_width": {
+            "value": "line_width"
+        },
+        "raft_base_line_width": {
+            "value": "raft_interface_line_width"
+        },
+        "raft_base_speed": {
+            "value": "speed_layer_0"
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json
new file mode 100644
index 0000000000..b9df88ff4d
--- /dev/null
+++ b/resources/definitions/inat_proton_x_rail.def.json
@@ -0,0 +1,41 @@
+{
+
+    "name": "Proton X Rail",
+    "version": 2,
+    "inherits": "inat_base",
+    "metadata": {
+        "visible": true,
+        "quality_definition": "inat_base",
+        "platform": "inat_proton_x_buildplate.stl",
+        "platform_offset": [ 0, 0, 0]
+    },
+    "overrides": {
+        "machine_name": { "value": "Proton X" },
+        "machine_width": { "value": 304 },
+        "machine_depth": { "value": 304 },
+        "machine_height": { "value": 650 },
+        "machine_head_with_fans_polygon": {
+            "value": [
+                [
+                    -86,
+                    66
+                ],
+                [
+                    44,
+                    66
+                ],
+                [
+                    44,
+                    -96
+                ],
+                [
+                    -86,
+                    -96
+                ]
+            ]
+        },
+
+        "gantry_height": { "value": 34 }
+
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json
new file mode 100644
index 0000000000..a5a7143677
--- /dev/null
+++ b/resources/definitions/inat_proton_x_rod.def.json
@@ -0,0 +1,41 @@
+{
+
+    "name": "Proton X Rod",
+    "version": 2,
+    "inherits": "inat_base",
+    "metadata": {
+        "visible": true,
+        "quality_definition": "inat_base",
+        "platform": "inat_proton_x_buildplate.stl",
+        "platform_offset": [ 0, 0, 0]
+    },
+    "overrides": {
+        "machine_name": { "value": "Proton X" },
+        "machine_width": { "value": 304 },
+        "machine_depth": { "value": 304 },
+        "machine_height": { "value": 650 },
+        "machine_head_with_fans_polygon": {
+            "value": [
+                [
+                    -86,
+                    66
+                ],
+                [
+                    44,
+                    66
+                ],
+                [
+                    44,
+                    -96
+                ],
+                [
+                    -86,
+                    -96
+                ]
+            ]
+        },
+
+        "gantry_height": { "value": 34 }
+
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/inat_extruder_0.def.json b/resources/extruders/inat_extruder_0.def.json
new file mode 100644
index 0000000000..100b8c0bca
--- /dev/null
+++ b/resources/extruders/inat_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "inat_base",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/meshes/inat_proton_x_buildplate.stl b/resources/meshes/inat_proton_x_buildplate.stl
new file mode 100644
index 0000000000000000000000000000000000000000..61c856cbc0af7d85bcec5e70f0280621ed221fe8
GIT binary patch
literal 20284
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
YOjA_wUMdsOzuWS5UuhN4h)^E?3zg1F<p2Nx

literal 0
HcmV?d00001

diff --git a/resources/quality/inat/inat_base_advanced_materials.inst.cfg b/resources/quality/inat/inat_base_advanced_materials.inst.cfg
new file mode 100644
index 0000000000..05cb1ed9fd
--- /dev/null
+++ b/resources/quality/inat/inat_base_advanced_materials.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Advanced materials
+definition = inat_base
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = normal_advanced
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.2
+adhesion_type = brim
+speed_layer_0 = 20
+speed_print = 60
\ No newline at end of file
diff --git a/resources/quality/inat/inat_base_draft.inst.cfg b/resources/quality/inat/inat_base_draft.inst.cfg
new file mode 100644
index 0000000000..a04cc3f0a3
--- /dev/null
+++ b/resources/quality/inat/inat_base_draft.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+version = 4
+name = Draft
+definition = inat_base
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = draft
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.32
+infill_sparse_density = 15
+speed_print = 80
diff --git a/resources/quality/inat/inat_base_fine.inst.cfg b/resources/quality/inat/inat_base_fine.inst.cfg
new file mode 100644
index 0000000000..0b6e1e559b
--- /dev/null
+++ b/resources/quality/inat/inat_base_fine.inst.cfg
@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Fine
+definition = inat_base
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = fine
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.12
\ No newline at end of file
diff --git a/resources/quality/inat/inat_base_standard.inst.cfg b/resources/quality/inat/inat_base_standard.inst.cfg
new file mode 100644
index 0000000000..f9ab645030
--- /dev/null
+++ b/resources/quality/inat/inat_base_standard.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Standard
+definition = inat_base
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = standard
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.2
+speed_print = 80
diff --git a/resources/quality/inat/inat_base_strong.inst.cfg b/resources/quality/inat/inat_base_strong.inst.cfg
new file mode 100644
index 0000000000..07b583cff1
--- /dev/null
+++ b/resources/quality/inat/inat_base_strong.inst.cfg
@@ -0,0 +1,22 @@
+[general]
+version = 4
+name = Strong
+definition = inat_base
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = strong
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.2
+speed_print = 50
+speed_layer_0 = 20
+wall_thickness = =8*wall_line_width
+top_bottom_thickness = 2.0
+alternate_extra_perimeter = True
+infill_sparse_density = 80
+cool_fan_enabled = False
+adhesion_type = brim
\ No newline at end of file
diff --git a/resources/quality/inat/inat_base_tree_support.inst.cfg b/resources/quality/inat/inat_base_tree_support.inst.cfg
new file mode 100644
index 0000000000..ad7b2a334e
--- /dev/null
+++ b/resources/quality/inat/inat_base_tree_support.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Tree supports
+definition = inat_base
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = normal_tree_supp
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.2
+support_structure = tree
+support_type = buildplate
+support_enable = True

From d925c28eb8ce3bb8dce6f752f800c207546aad34 Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Mon, 15 Feb 2021 17:27:40 +0100
Subject: [PATCH 02/13] Fix value/default_value errors

---
 resources/definitions/inat_base.def.json      | 45 +++++++------------
 .../definitions/inat_proton_x_rail.def.json   | 40 +++++++----------
 .../definitions/inat_proton_x_rod.def.json    | 31 ++-----------
 .../quality/inat/inat_base_standard.inst.cfg  |  1 -
 .../quality/inat/inat_base_strong.inst.cfg    |  1 -
 .../inat/inat_base_tree_support.inst.cfg      |  1 -
 6 files changed, 36 insertions(+), 83 deletions(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index ffc3d7a43e..85311e72b3 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -26,57 +26,46 @@
             "default_value": "G28 ;Home\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
         },
         "machine_end_gcode": {
-            "default_value": "M400\nM104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F2000\nM84\n"
+            "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F2000\nM84\n"
         },
         "material_diameter": {
-            "value": 1.75
-        },
-        "machine_width": {
-            "value": 304
-        },
-        "machine_depth": {
-            "value": 304
+            "default_value": 1.75
         },
         "machine_shape": {
-            "value": "rectangular"
-        },
-        "machine_height": {
-            "value": 430
+            "default_value": "rectangular"
         },
         "machine_heated_bed": {
-            "value": true
+            "default_value": true
         },
         "machine_heated_build_volume": {
-            "value": false
+            "default_value": false
         },
         "machine_gcode_flavor": {
-            "value": "RepRap (Marlin/Sprinter)"
+            "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_head_with_fans_polygon": {
-            "value": [
+            "default_value": [
                 [
-                    -20,
-                    10
+                    -86,
+                    66
                 ],
                 [
-                    10,
-                    10
+                    44,
+                    66
                 ],
                 [
-                    10,
-                    -10
+                    44,
+                    -96
                 ],
                 [
-                    -20,
-                    -10
+                    -86,
+                    -96
                 ]
             ]
         },
-        "gantry_height": {
-            "value": 99999999999
-        },
+        "gantry_height": { "default_value": 34 },
         "machine_nozzle_size": {
-            "value": 0.4
+            "default_value": 0.4
         },
         "machine_max_feedrate_x": {
             "value": 200
diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json
index b9df88ff4d..5af4957538 100644
--- a/resources/definitions/inat_proton_x_rail.def.json
+++ b/resources/definitions/inat_proton_x_rail.def.json
@@ -10,32 +10,22 @@
         "platform_offset": [ 0, 0, 0]
     },
     "overrides": {
-        "machine_name": { "value": "Proton X" },
-        "machine_width": { "value": 304 },
-        "machine_depth": { "value": 304 },
-        "machine_height": { "value": 650 },
-        "machine_head_with_fans_polygon": {
-            "value": [
-                [
-                    -86,
-                    66
-                ],
-                [
-                    44,
-                    66
-                ],
-                [
-                    44,
-                    -96
-                ],
-                [
-                    -86,
-                    -96
-                ]
-            ]
+        "machine_name": { "default_value": "Proton X Rail" },
+        "machine_width": { "default_value": 304 },
+        "machine_depth": { "default_value": 304 },
+        "machine_height": { "default_value": 650 },
+        "machine_max_acceleration_x": {
+            "value": 500
         },
-
-        "gantry_height": { "value": 34 }
+        "machine_max_acceleration_y": {
+            "value": 800
+        },
+        "machine_max_acceleration_z": {
+            "value": 200
+        },
+        "machine_max_jerk_xy": {
+            "value": 10
+        }
 
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json
index a5a7143677..bef1a6cf2f 100644
--- a/resources/definitions/inat_proton_x_rod.def.json
+++ b/resources/definitions/inat_proton_x_rod.def.json
@@ -10,32 +10,9 @@
         "platform_offset": [ 0, 0, 0]
     },
     "overrides": {
-        "machine_name": { "value": "Proton X" },
-        "machine_width": { "value": 304 },
-        "machine_depth": { "value": 304 },
-        "machine_height": { "value": 650 },
-        "machine_head_with_fans_polygon": {
-            "value": [
-                [
-                    -86,
-                    66
-                ],
-                [
-                    44,
-                    66
-                ],
-                [
-                    44,
-                    -96
-                ],
-                [
-                    -86,
-                    -96
-                ]
-            ]
-        },
-
-        "gantry_height": { "value": 34 }
-
+        "machine_name": { "default_value": "Proton X Rod" },
+        "machine_width": { "default_value": 304 },
+        "machine_depth": { "default_value": 304 },
+        "machine_height": { "default_value": 650 }
     }
 }
\ No newline at end of file
diff --git a/resources/quality/inat/inat_base_standard.inst.cfg b/resources/quality/inat/inat_base_standard.inst.cfg
index f9ab645030..3ebf52796b 100644
--- a/resources/quality/inat/inat_base_standard.inst.cfg
+++ b/resources/quality/inat/inat_base_standard.inst.cfg
@@ -11,5 +11,4 @@ weight = 0
 global_quality = True
 
 [values]
-layer_height = 0.2
 speed_print = 80
diff --git a/resources/quality/inat/inat_base_strong.inst.cfg b/resources/quality/inat/inat_base_strong.inst.cfg
index 07b583cff1..4032d7751a 100644
--- a/resources/quality/inat/inat_base_strong.inst.cfg
+++ b/resources/quality/inat/inat_base_strong.inst.cfg
@@ -11,7 +11,6 @@ weight = -3
 global_quality = True
 
 [values]
-layer_height = 0.2
 speed_print = 50
 speed_layer_0 = 20
 wall_thickness = =8*wall_line_width
diff --git a/resources/quality/inat/inat_base_tree_support.inst.cfg b/resources/quality/inat/inat_base_tree_support.inst.cfg
index ad7b2a334e..09794b9b72 100644
--- a/resources/quality/inat/inat_base_tree_support.inst.cfg
+++ b/resources/quality/inat/inat_base_tree_support.inst.cfg
@@ -11,7 +11,6 @@ weight = -2
 global_quality = True
 
 [values]
-layer_height = 0.2
 support_structure = tree
 support_type = buildplate
 support_enable = True

From 27af35591a038aa4eeadc4876aa22445051d190d Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Tue, 16 Feb 2021 11:17:21 +0100
Subject: [PATCH 03/13] fix gantry_height

---
 resources/definitions/inat_base.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index 85311e72b3..8dce045452 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -63,7 +63,7 @@
                 ]
             ]
         },
-        "gantry_height": { "default_value": 34 },
+        "gantry_height": { "value": 34 },
         "machine_nozzle_size": {
             "default_value": 0.4
         },

From 5c66c018a7bfbd7a293330008ef5d0def35e6bb2 Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Wed, 17 Feb 2021 14:34:29 +0100
Subject: [PATCH 04/13] Adjsut start/end gcode

---
 resources/definitions/inat_base.def.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index 8dce045452..41923b77e8 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -23,10 +23,10 @@
     },
     "overrides": {
         "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
+            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 S40 ; Wait for probe temperature to settle\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
         },
         "machine_end_gcode": {
-            "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F2000\nM84\n"
+            "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F3000\nM84\n"
         },
         "material_diameter": {
             "default_value": 1.75

From c6f46325ca54f892e39ae97b72a45148701c692b Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Mon, 22 Feb 2021 11:18:36 +0100
Subject: [PATCH 05/13] Fix mesh position

---
 resources/definitions/inat_proton_x_rail.def.json | 2 +-
 resources/definitions/inat_proton_x_rod.def.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json
index 5af4957538..dddf6754e3 100644
--- a/resources/definitions/inat_proton_x_rail.def.json
+++ b/resources/definitions/inat_proton_x_rail.def.json
@@ -7,7 +7,7 @@
         "visible": true,
         "quality_definition": "inat_base",
         "platform": "inat_proton_x_buildplate.stl",
-        "platform_offset": [ 0, 0, 0]
+        "platform_offset": [ 0, -0.8, 0]
     },
     "overrides": {
         "machine_name": { "default_value": "Proton X Rail" },
diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json
index bef1a6cf2f..1009c676bd 100644
--- a/resources/definitions/inat_proton_x_rod.def.json
+++ b/resources/definitions/inat_proton_x_rod.def.json
@@ -7,7 +7,7 @@
         "visible": true,
         "quality_definition": "inat_base",
         "platform": "inat_proton_x_buildplate.stl",
-        "platform_offset": [ 0, 0, 0]
+        "platform_offset": [ 0, -0.8, 0]
     },
     "overrides": {
         "machine_name": { "default_value": "Proton X Rod" },

From f2770c3bcc1267db0744a11f624eb6886099aaa9 Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Mon, 22 Feb 2021 11:19:09 +0100
Subject: [PATCH 06/13] Add minimal wall_thickness for small nozzles

---
 resources/definitions/inat_base.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index 41923b77e8..ef30b94fa5 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -115,7 +115,7 @@
             "maximum_value_warning": "1.6 * machine_nozzle_size"
         },
         "wall_thickness": {
-            "value": "3*wall_line_width"
+            "value": "max(3*wall_line_width, 1)"
         },
         "roofing_layer_count": {
             "value": 2

From 2e798c6edfba4f1fd8b48642172347393e7de03d Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Mon, 22 Feb 2021 11:40:31 +0100
Subject: [PATCH 07/13] Update start gcode in base

Increase probe temperature
---
 resources/definitions/inat_base.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index ef30b94fa5..31a3ee54c6 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -23,7 +23,7 @@
     },
     "overrides": {
         "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 S40 ; Wait for probe temperature to settle\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
+            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 S50 ; Wait for probe temperature to settle\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
         },
         "machine_end_gcode": {
             "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F3000\nM84\n"

From c148475b5afa2cf4fa4dc0d11052e4df0a3c177f Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Mon, 22 Feb 2021 14:12:01 +0100
Subject: [PATCH 08/13] Adjust brim settings for advanced materials profile

---
 resources/quality/inat/inat_base_advanced_materials.inst.cfg | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/quality/inat/inat_base_advanced_materials.inst.cfg b/resources/quality/inat/inat_base_advanced_materials.inst.cfg
index 05cb1ed9fd..21731f19d9 100644
--- a/resources/quality/inat/inat_base_advanced_materials.inst.cfg
+++ b/resources/quality/inat/inat_base_advanced_materials.inst.cfg
@@ -14,4 +14,7 @@ global_quality = True
 layer_height = 0.2
 adhesion_type = brim
 speed_layer_0 = 20
-speed_print = 60
\ No newline at end of file
+speed_print = 60
+speed_travel = 100
+xy_offset_layer_0 = 0
+brim_width = =30*skirt_brim_line_width*initial_layer_line_width_factor/100.0

From 145311d615f9382bb3ae8caed9ee01bba64795c9 Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Wed, 24 Feb 2021 19:06:46 +0100
Subject: [PATCH 09/13] Minor changes to start/end gcode

---
 resources/definitions/inat_base.def.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index 31a3ee54c6..8426234429 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -23,10 +23,10 @@
     },
     "overrides": {
         "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 S50 ; Wait for probe temperature to settle\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
+            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
         },
         "machine_end_gcode": {
-            "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F3000\nM84\n"
+            "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 R5 X\nG0 Y300 F3000\nM84\n"
         },
         "material_diameter": {
             "default_value": 1.75

From ad803c22fd95db04e3cc9a68193937fb07aeec36 Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Fri, 26 Mar 2021 11:20:03 +0100
Subject: [PATCH 10/13] Fix printer height

---
 resources/definitions/inat_proton_x_rail.def.json | 2 +-
 resources/definitions/inat_proton_x_rod.def.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json
index dddf6754e3..ec9906b245 100644
--- a/resources/definitions/inat_proton_x_rail.def.json
+++ b/resources/definitions/inat_proton_x_rail.def.json
@@ -13,7 +13,7 @@
         "machine_name": { "default_value": "Proton X Rail" },
         "machine_width": { "default_value": 304 },
         "machine_depth": { "default_value": 304 },
-        "machine_height": { "default_value": 650 },
+        "machine_height": { "default_value": 675 },
         "machine_max_acceleration_x": {
             "value": 500
         },
diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json
index 1009c676bd..a1c87470a2 100644
--- a/resources/definitions/inat_proton_x_rod.def.json
+++ b/resources/definitions/inat_proton_x_rod.def.json
@@ -13,6 +13,6 @@
         "machine_name": { "default_value": "Proton X Rod" },
         "machine_width": { "default_value": 304 },
         "machine_depth": { "default_value": 304 },
-        "machine_height": { "default_value": 650 }
+        "machine_height": { "default_value": 675 }
     }
 }
\ No newline at end of file

From 5872065dc8a82392e0b6af173a7b7475b86a997b Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Fri, 26 Mar 2021 11:49:35 +0100
Subject: [PATCH 11/13] fix temperatures

---
 resources/definitions/inat_base.def.json | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index 8426234429..dc8e31be35 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -23,7 +23,7 @@
     },
     "overrides": {
         "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
+            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG28 Z\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n"
         },
         "machine_end_gcode": {
             "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 R5 X\nG0 Y300 F3000\nM84\n"
@@ -148,39 +148,39 @@
             "value": "4"
         },
         "default_material_print_temperature": {
-            "maximum_value_warning": "450",
-            "maximum_value": "485"
+            "maximum_value_warning": "470",
+            "maximum_value": "470"
         },
         "material_print_temperature": {
-            "maximum_value_warning": "450",
-            "maximum_value": "485"
+            "maximum_value_warning": "470",
+            "maximum_value": "470"
         },
         "material_print_temperature_layer_0": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "450",
-            "maximum_value": "485"
+            "maximum_value_warning": "470",
+            "maximum_value": "470"
         },
         "material_initial_print_temperature": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "450",
-            "maximum_value": "485"
+            "maximum_value_warning": "470",
+            "maximum_value": "470"
         },
         "material_final_print_temperature": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "450",
-            "maximum_value": "485"
+            "maximum_value_warning": "470",
+            "maximum_value": "470"
         },
         "default_material_bed_temperature": {
-            "maximum_value_warning": "140",
-            "maximum_value": "140"
+            "maximum_value_warning": "150",
+            "maximum_value": "150"
         },
         "material_bed_temperature": {
-            "maximum_value_warning": "140",
-            "maximum_value": "140"
+            "maximum_value_warning": "150",
+            "maximum_value": "150"
         },
         "material_bed_temperature_layer_0": {
-            "maximum_value_warning": "140",
-            "maximum_value": "140"
+            "maximum_value_warning": "150",
+            "maximum_value": "150"
         },
         "speed_infill": {
             "value": "speed_print"

From cc76002c03e36642b6564cbec54be04a8957e00e Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Fri, 26 Mar 2021 11:49:47 +0100
Subject: [PATCH 12/13] disable infill_before_walls

---
 resources/definitions/inat_base.def.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index dc8e31be35..4851c4d176 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -144,6 +144,9 @@
         "infill_sparse_thickness": {
             "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else 2*layer_height"
         },
+        "infill_before_walls": {
+            "value": false
+        },
         "expand_skins_expand_distance": {
             "value": "4"
         },

From d7c8d05be9f11f49e2cf8e78f95a1ebeaf0043ba Mon Sep 17 00:00:00 2001
From: MarkMan0 <pal.mark28@gmail.com>
Date: Fri, 26 Mar 2021 14:58:26 +0100
Subject: [PATCH 13/13] Change machine_start_gcode

---
 resources/definitions/inat_base.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index 4851c4d176..5299f5f46f 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -23,7 +23,7 @@
     },
     "overrides": {
         "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG28 Z\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n"
+            "default_value": "G28 ;Home\nG0 Z0.6 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG28 Z\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n"
         },
         "machine_end_gcode": {
             "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 R5 X\nG0 Y300 F3000\nM84\n"