From 51ba3ea61eeed16692c2da4eab9174b54cd609cf Mon Sep 17 00:00:00 2001
From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com>
Date: Fri, 21 Jul 2023 10:36:48 +0200
Subject: [PATCH 1/2] Fix printer definitions

---
 resources/definitions/Geeetech_Base_Dual_Extruder.def.json   | 2 +-
 resources/definitions/Geeetech_Base_Multi_Extruder.def.json  | 2 +-
 resources/definitions/Geeetech_Base_Single_Extruder.def.json | 2 +-
 resources/definitions/SV02.def.json                          | 2 +-
 resources/definitions/flyingbear_base.def.json               | 2 +-
 resources/definitions/lotmaxx_sc10.def.json                  | 2 +-
 resources/definitions/mixware_hyper_s.def.json               | 2 +-
 resources/definitions/modix_v3_base.def.json                 | 2 +-
 resources/definitions/modix_v4_base.def.json                 | 2 +-
 resources/definitions/uni_base.def.json                      | 2 +-
 resources/definitions/weedo_base.def.json                    | 2 +-
 resources/definitions/zav_base.def.json                      | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json
index c8ab3ca623..325e88e7fa 100644
--- a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json
+++ b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json
@@ -130,7 +130,7 @@
         "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 3" },
-        "support_interface_pattern": { "value": "zigzag" },
+        "support_interface_pattern": { "value": "'zigzag'" },
         "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
diff --git a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json
index 36783200dd..31ba03f5f7 100644
--- a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json
+++ b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json
@@ -131,7 +131,7 @@
         "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 3" },
-        "support_interface_pattern": { "value": "zigzag" },
+        "support_interface_pattern": { "value": "'zigzag'" },
         "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
diff --git a/resources/definitions/Geeetech_Base_Single_Extruder.def.json b/resources/definitions/Geeetech_Base_Single_Extruder.def.json
index b901668859..7a96ee4b91 100644
--- a/resources/definitions/Geeetech_Base_Single_Extruder.def.json
+++ b/resources/definitions/Geeetech_Base_Single_Extruder.def.json
@@ -118,7 +118,7 @@
         "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 3" },
-        "support_interface_pattern": { "value": "zigzag" },
+        "support_interface_pattern": { "value": "'zigzag'" },
         "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json
index 95b165075b..a38812830b 100644
--- a/resources/definitions/SV02.def.json
+++ b/resources/definitions/SV02.def.json
@@ -59,7 +59,7 @@
         "machine_width": { "default_value": 280 },
         "material_diameter": { "default_value": 1.75 },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "prime_tower_min_volume": { "value": "((reveOrValue('layer_height'))/2" },
+        "prime_tower_min_volume": { "value": "resolveOrValue('layer_height')/2" },
         "prime_tower_position_x": { "value": "240" },
         "prime_tower_position_y": { "value": "190" },
         "prime_tower_size": { "value": "30" },
diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json
index 70ae7e8f96..d5ec8b0ecc 100644
--- a/resources/definitions/flyingbear_base.def.json
+++ b/resources/definitions/flyingbear_base.def.json
@@ -44,7 +44,7 @@
         "infill_sparse_density": { "value": 20 },
         "infill_wipe_dist": { "value": 0.0 },
         "layer_height_0": { "value": 0.2 },
-        "machine_buildplate_type": { "value": "glass" },
+        "machine_buildplate_type": { "value": "'glass'" },
         "machine_center_is_zero": { "default_value": false },
         "machine_end_gcode": { "default_value": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y{machine_depth} F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors" },
         "machine_heated_bed": { "default_value": true },
diff --git a/resources/definitions/lotmaxx_sc10.def.json b/resources/definitions/lotmaxx_sc10.def.json
index f2ef02c664..c3b47a2cdf 100644
--- a/resources/definitions/lotmaxx_sc10.def.json
+++ b/resources/definitions/lotmaxx_sc10.def.json
@@ -23,7 +23,7 @@
         "jerk_enabled": { "value": false },
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": "jerk_print" },
-        "jerk_travel_layer_0": { "value": " jerk_travel" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
         "machine_depth": { "default_value": 235 },
         "machine_end_gcode": { "default_value": "; SC-10 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z20 ; Move Z Axis up 20 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM84 ; Disable stepper motors\n; End of custom end GCode" },
         "machine_head_with_fans_polygon":
diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json
index 9268b99808..e3d67de8e0 100644
--- a/resources/definitions/mixware_hyper_s.def.json
+++ b/resources/definitions/mixware_hyper_s.def.json
@@ -78,7 +78,7 @@
             "minimum_value_warning": "0.01"
         },
         "retraction_amount": { "default_value": 2 },
-        "retraction_combing": { "value": "off" },
+        "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "default_value": 0.5 },
         "retraction_count_max": { "default_value": 100 },
         "retraction_extrusion_window":
diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json
index 911d674e68..80921d3254 100644
--- a/resources/definitions/modix_v3_base.def.json
+++ b/resources/definitions/modix_v3_base.def.json
@@ -82,6 +82,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
         "wall_thickness": { "value": "line_width * 2" },
-        "z_seam_corner": { "value": "z_seam_corner_weighted" }
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json
index 71b99c7cae..55d901db1c 100644
--- a/resources/definitions/modix_v4_base.def.json
+++ b/resources/definitions/modix_v4_base.def.json
@@ -82,6 +82,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
         "wall_thickness": { "value": "line_width * 2" },
-        "z_seam_corner": { "value": "z_seam_corner_weighted" }
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json
index c6405d213c..c79d2fcd87 100644
--- a/resources/definitions/uni_base.def.json
+++ b/resources/definitions/uni_base.def.json
@@ -50,7 +50,7 @@
         "initial_layer_line_width_factor": { "value": "100" },
         "layer_height_0": { "value": "layer_height" },
         "line_width": { "value": "machine_nozzle_size" },
-        "machine_buildplate_type": { "value": "glass" },
+        "machine_buildplate_type": { "value": "'glass'" },
         "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 220 },
         "machine_end_gcode": { "default_value": "G91\nG1 E-1 F600\nG1 Z+1 E-3 X-20 Y-20 F4800\nM104 S0\nM106 S0\nM140 S0\nM220 S100\nM221 S100\nG28\nG90\nM84\n;\n" },
diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json
index 0a43dae8cc..8ba06312fe 100644
--- a/resources/definitions/weedo_base.def.json
+++ b/resources/definitions/weedo_base.def.json
@@ -73,7 +73,7 @@
         "raft_surface_fan_speed": { "value": 100 },
         "raft_surface_speed": { "value": 40 },
         "retraction_amount": { "default_value": 1.5 },
-        "retraction_combing": { "value": "off" },
+        "retraction_combing": { "value": "'off'" },
         "retraction_speed": { "default_value": 28 },
         "skirt_brim_speed": { "value": 26.0 },
         "speed_layer_0": { "value": 26.0 },
diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json
index 03178f5eb9..c8ab0361a8 100644
--- a/resources/definitions/zav_base.def.json
+++ b/resources/definitions/zav_base.def.json
@@ -49,7 +49,7 @@
         "initial_layer_line_width_factor": { "value": "100" },
         "layer_height_0": { "value": "layer_height" },
         "line_width": { "value": "machine_nozzle_size" },
-        "machine_buildplate_type": { "value": "glass" },
+        "machine_buildplate_type": { "value": "'glass'" },
         "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 200 },
         "machine_end_gcode": { "default_value": ";---- Ending Script Start ----\nM104 S0                                        ;extruder heater off\nM140 S0                                        ;heated bed heater off (if you have it)\nG91                                               ;relative positioning\nG1 E-4 F300                                  ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F5000    ;move Z up a bit and retract filament even more\nG28 Z0                                          ;move bed down\nG28 X0 Y0                                     ;move X/Y to min endstops so the head is out of the way\nM84                                              ;steppers off\nG90                                              ;absolute positioning\nM107                                            ;switch off cooling fan\nM355 S0 P0                                  ;switch off case light\n;---- Ending Script End ----\n" },

From dff3f1a4060b47af9a410a66134d39c9538b1dbd Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 29 Nov 2023 13:46:32 +0100
Subject: [PATCH 2/2] Remove redundant overrides

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 resources/definitions/Geeetech_Base_Dual_Extruder.def.json   | 2 +-
 resources/definitions/Geeetech_Base_Multi_Extruder.def.json  | 2 +-
 resources/definitions/Geeetech_Base_Single_Extruder.def.json | 2 +-
 resources/definitions/flyingbear_base.def.json               | 2 +-
 resources/definitions/lotmaxx_sc10.def.json                  | 2 +-
 resources/definitions/uni_base.def.json                      | 4 ++--
 resources/definitions/zav_base.def.json                      | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json
index 325e88e7fa..113c198298 100644
--- a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json
+++ b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json
@@ -131,7 +131,7 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 3" },
         "support_interface_pattern": { "value": "'zigzag'" },
-        "support_interface_skip_height": { "value": 0.2 },
+        
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
diff --git a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json
index 31ba03f5f7..00a018eea7 100644
--- a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json
+++ b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json
@@ -132,7 +132,7 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 3" },
         "support_interface_pattern": { "value": "'zigzag'" },
-        "support_interface_skip_height": { "value": 0.2 },
+        
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
diff --git a/resources/definitions/Geeetech_Base_Single_Extruder.def.json b/resources/definitions/Geeetech_Base_Single_Extruder.def.json
index 7a96ee4b91..6192d5634a 100644
--- a/resources/definitions/Geeetech_Base_Single_Extruder.def.json
+++ b/resources/definitions/Geeetech_Base_Single_Extruder.def.json
@@ -119,7 +119,7 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 3" },
         "support_interface_pattern": { "value": "'zigzag'" },
-        "support_interface_skip_height": { "value": 0.2 },
+        
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json
index d5ec8b0ecc..9c6c03d433 100644
--- a/resources/definitions/flyingbear_base.def.json
+++ b/resources/definitions/flyingbear_base.def.json
@@ -41,7 +41,7 @@
         "infill_line_width": { "value": "line_width + 0.1" },
         "infill_overlap": { "value": 30 },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
-        "infill_sparse_density": { "value": 20 },
+        
         "infill_wipe_dist": { "value": 0.0 },
         "layer_height_0": { "value": 0.2 },
         "machine_buildplate_type": { "value": "'glass'" },
diff --git a/resources/definitions/lotmaxx_sc10.def.json b/resources/definitions/lotmaxx_sc10.def.json
index c3b47a2cdf..1b0c02b4ef 100644
--- a/resources/definitions/lotmaxx_sc10.def.json
+++ b/resources/definitions/lotmaxx_sc10.def.json
@@ -20,7 +20,7 @@
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_min_layer_time": { "value": 10 },
         "gantry_height": { "value": 40 },
-        "jerk_enabled": { "value": false },
+        
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json
index c79d2fcd87..92dcb7c9fe 100644
--- a/resources/definitions/uni_base.def.json
+++ b/resources/definitions/uni_base.def.json
@@ -47,9 +47,9 @@
         "infill_enable_travel_optimization": { "value": "True" },
         "infill_line_width": { "value": "round(line_width * 1.1, 2)" },
         "infill_pattern": { "value": "'gyroid'" },
-        "initial_layer_line_width_factor": { "value": "100" },
+        
         "layer_height_0": { "value": "layer_height" },
-        "line_width": { "value": "machine_nozzle_size" },
+        
         "machine_buildplate_type": { "value": "'glass'" },
         "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 220 },
diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json
index c8ab0361a8..0451b59d49 100644
--- a/resources/definitions/zav_base.def.json
+++ b/resources/definitions/zav_base.def.json
@@ -46,9 +46,9 @@
         "infill_enable_travel_optimization": { "value": "True" },
         "infill_line_width": { "value": "round(line_width * 1.1, 2)" },
         "infill_pattern": { "value": "'gyroid'" },
-        "initial_layer_line_width_factor": { "value": "100" },
+        
         "layer_height_0": { "value": "layer_height" },
-        "line_width": { "value": "machine_nozzle_size" },
+        
         "machine_buildplate_type": { "value": "'glass'" },
         "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 200 },