Merge branch 'master' into libArachne_rebased

2025-08-09 06:45:09 -06:00 · 2021-08-12 18:50:29 +02:00 · 2021-08-12 18:50:29 +02:00 · 4986861727
commit 4986861727
parent 9890d12c57 44ba8e3d1f
384 changed files with 16324 additions and 8810 deletions
--- a/resources/definitions/crazy3dprint_base.def.json
+++ b/resources/definitions/crazy3dprint_base.def.json
@ -0,0 +1,44 @@
+{
+    "version": 2,
+    "name": "Crazy3DPrint CZ-300",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": false,
+        "author": "XYZprinting Software",
+        "manufacturer": "Crazy3DPrint",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": ["MachineSettingsAction"],
+        "machine_extruder_trains":
+        {
+            "0": "crazy3dprint_cz300_extruder_0"
+        },
+        "has_materials": true,
+        "has_variants": true,
+        "has_machine_quality": true,
+        "preferred_variant_name": "0.4mm Nozzle",
+        "preferred_quality_type": "normal",
+        "preferred_material": "generic_pla",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides": {
+        "machine_heated_bed": {"default_value": true},
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_feedrate_e": { "value": 50 },
+        "machine_max_acceleration_x": { "value": 1500 },
+        "machine_max_acceleration_y": { "value": 1500 },
+        "machine_max_acceleration_z": { "value": 500 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_acceleration": { "value": 500 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_max_jerk_e": { "value": 5 }
+        },
+
+
+        "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
+        "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"},
+        "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18"
+        }
+    }
--- a/resources/definitions/crazy3dprint_cz_300.def.json
+++ b/resources/definitions/crazy3dprint_cz_300.def.json
@ -0,0 +1,65 @@
+{
+    "version": 2, 
+    "name": "Crazy3DPrint CZ-300",
+    "inherits": "crazy3dprint_base",
+    "metadata": {
+        "visible": true,
+        "author": "XYZprinting Software",
+        "manufacturer": "Crazy3DPrint",
+        "file_formats": "text/x-gcode",
+        "supports_usb_connection": true,
+        "preferred_quality_type": "normal",
+		"quality_definition": "crazy3dprint_base"
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "CZ-300" },
+        "machine_shape": { "default_value": "rectangular"},
+        "machine_heated_bed": { "default_value": true },
+        "machine_width": { "default_value": 300.00 },
+        "machine_depth": { "default_value": 300.00 },
+        "machine_height": { "default_value":300.00 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [ -20, -10 ],
+                [ -20, 10 ],
+                [ 10, 10 ],
+                [ 10, -10 ]
+            ]
+        },
+		"layer_height": {  "default_value": 0.2 },
+		"infill_sparse_density": {  "default_value": 15 },
+	    "infill_line_distance": {  "value": 2.6667 },
+		"infill_pattern": {  "value": "'lines'" },
+		"infill_overlap": {  "value": 8.0 },
+		"min_infill_area": {  "default_value": 2.0 },
+		"retract_at_layer_change": { "default_value": true },
+		"default_material_print_temperature": {  "default_value": 210 },
+		"material_print_temperature": { "value": 210 },
+		"material_final_print_temperature": {  "value": 210 },
+		"material_bed_temperature": { "value": 70 },
+        "material_bed_temperature_layer_0": {  "value": 70 },
+		"material_flow_layer_0": {"value": 140},
+		"retraction_amount": {  "default_value": 10 },
+		"retraction_speed": {  "default_value": 70 },
+        "speed_print": {  "default_value": 40 },
+        "speed_travel": { "value": 60 },
+        "cool_fan_enabled": { "default_value": true },
+		"cool_fan_speed_0": { "value": 100 },
+        "adhesion_type": { "default_value" : "skirt" },
+		"brim_line_count": { "value" : 5 },
+		"skirt_line_count": { "default_value" : 5 },
+		"initial_layer_line_width_factor": { "default_value" : 140 },
+		"top_bottom_pattern": { "default_value" : "concentric" },
+		"outer_inset_first": { "default_value": true },
+		"fill_outline_gaps": { "default_value": true },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_start_gcode": {
+            "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n"
+         },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ; turn off temperature\nM105 S0;  \nG28 X0  ; home X axis\nM84     ; disable motors\n"
+        }
+    }
+}
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -1580,6 +1580,16 @@
                    "limit_to_extruder": "top_bottom_extruder_nr",
                    "settable_per_mesh": true
                },
+                "skin_monotonic":
+                {
+                    "label": "Monotonic Top/Bottom Order",
+                    "description": "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_bottom_pattern != 'concentric' or top_bottom_pattern_0 != 'concentric')",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
+                    "settable_per_mesh": true
+                },
                "skin_angles":
                {
                    "label": "Top/Bottom Line Directions",
@ -1647,6 +1657,16 @@
                    "limit_to_extruder": "top_bottom_extruder_nr",
                    "settable_per_mesh": true
                },
+                "ironing_monotonic":
+                {
+                    "label": "Monotonic Ironing Order",
+                    "description": "Print ironing lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "ironing_enabled and ironing_pattern != 'concentric'",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
+                    "settable_per_mesh": true
+                },
                "ironing_line_spacing":
                {
                    "label": "Ironing Line Spacing",
@ -6447,6 +6467,17 @@
                    "settable_per_mesh": true,
                    "enabled": "roofing_layer_count > 0 and top_layers > 0"
                },
+                "roofing_monotonic":
+                {
+                    "label": "Monotonic Top Surface Order",
+                    "description": "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.",
+                    "type": "bool",
+                    "default_value": false,
+                    "value": "skin_monotonic",
+                    "enabled": "roofing_layer_count > 0 and top_layers > 0 and roofing_pattern != 'concentric'",
+                    "limit_to_extruder": "roofing_extruder_nr",
+                    "settable_per_mesh": true
+                },
                "roofing_angles":
                {
                    "label": "Top Surface Skin Line Directions",
--- a/resources/definitions/goofoo_base.def.json
+++ b/resources/definitions/goofoo_base.def.json
@ -0,0 +1,141 @@
+{
+    "name": "Goofoo Base Printer",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": false,
+        "author": "goofoo3d.com",
+        "manufacturer": "GooFoo",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": ["MachineSettingsAction"],
+
+        "machine_extruder_trains": {
+            "0": "goofoo_base_extruder"
+        },
+
+        "has_materials": true,
+        "preferred_material": "goofoo_pla",
+
+        "has_variants": true,
+        "variants_name": "Nozzle Size",
+        "preferred_variant_name": "0.4mm Nozzle",
+
+        "has_machine_quality": true,
+        "preferred_quality_type": "normal"
+        
+    },
+    "overrides": {
+
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
+
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_feedrate_e": { "value": 50 },
+
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_acceleration": { "value": 500 },
+
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_max_jerk_e": { "value": 5 },
+
+        "machine_heated_bed": { "default_value": true },
+
+        "material_diameter": { "default_value": 1.75 },
+
+        "acceleration_print": { "value": 500 },
+        "acceleration_travel": { "value": 500 },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+
+        "jerk_print": { "value": 8 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+
+        "acceleration_enabled": { "value": false },
+        "jerk_enabled": { "value": false },
+
+        "speed_print": { "value": 40.0 } ,
+        "speed_infill": { "value": "speed_print" },
+        "speed_wall": { "value": "speed_print" },
+        "speed_wall_0": { "value": "speed_wall" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_topbottom": { "value": "speed_print" },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_travel": { "value": "80" },
+        "speed_layer_0": { "value": 20.0 },
+        "speed_print_layer_0": { "value": "speed_layer_0" },
+        "speed_travel_layer_0": { "value": "60" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_z_hop": { "value": 5 },
+
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+
+        "line_width": { "value": "machine_nozzle_size" },
+
+        "optimize_wall_printing_order": { "value": "True" },
+
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_flow": { "value": 100 },
+        "travel_compensate_overlapping_walls_0_enabled": { "value": "False" },
+
+        "z_seam_type": { "value": "'back'" },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        
+        "infill_sparse_density": { "value": "20" },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "skin_overlap": { "value": 10.0 },
+        "infill_wipe_dist": { "value": 0.0 },
+        "wall_0_wipe_dist": { "value": 0.0 },
+
+        "fill_perimeter_gaps": { "value": "'everywhere'" },
+        "fill_outline_gaps": { "value": false },
+        "filter_out_tiny_gaps": { "value": false },
+
+        "retraction_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200
+        },
+        "retraction_retract_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200
+        },
+        "retraction_prime_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200
+        },
+        
+        "retraction_hop_enabled": { "value": "False" },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true },
+        
+        "retraction_enable": { "value": true },
+        "retraction_count_max": { "value": 100 },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_min_travel": { "value": 1.5 },
+
+        "cool_fan_full_at_height": { "value": "3 * layer_height" },
+        "cool_fan_enabled": { "value": true },
+        "cool_min_layer_time": { "value": 10 },
+
+        
+
+        
+        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
+        "wall_thickness": {"value": "line_width * 2" }
+
+    }
+}
--- a/resources/definitions/goofoo_e-one.def.json
+++ b/resources/definitions/goofoo_e-one.def.json
@ -0,0 +1,29 @@
+{
+    "name": "Goofoo E-one",
+    "version": 2,
+    "inherits": "goofoo_open",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo E-one" },
+        "machine_width": { "default_value": 300 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 400 }
+    },
+    "metadata": {
+        "visible": true,
+        "exclude_materials": [
+            "goofoo_bronze_pla",
+            "goofoo_peek",
+            "goofoo_tpe_83a",
+            "goofoo_tpu_87a",
+            "goofoo_tpu_95a",
+            "goofoo_pa_cf",
+            "goofoo_pc",
+            "goofoo_pa",
+            "goofoo_asa",
+            "goofoo_abs",
+            "goofoo_pva",
+            "goofoo_hips",
+            "goofoo_pva"
+        ]
+    }
+}
--- a/resources/definitions/goofoo_far.def.json
+++ b/resources/definitions/goofoo_far.def.json
@ -0,0 +1,15 @@
+{
+    "name": "Goofoo Far",
+    "version": 2,
+    "inherits": "goofoo_base",
+    "metadata": {
+        "quality_definition": "goofoo_far",
+        "visible": false,
+        "exclude_materials": [
+            "goofoo_bronze_pla",
+            "goofoo_tpe_83a",
+            "goofoo_tpu_87a",
+            "goofoo_tpu_95a"
+        ]
+    }
+}
--- a/resources/definitions/goofoo_gemini.def.json
+++ b/resources/definitions/goofoo_gemini.def.json
@ -0,0 +1,22 @@
+{
+    "name": "Goofoo Gemini",
+    "version": 2,
+    "inherits": "goofoo_far",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Gemini" },
+        "machine_width": { "default_value": 360 },
+        "machine_depth": { "default_value": 250 },
+        "machine_height": { "default_value": 200 },
+        "machine_head_with_fans_polygon":{"default_value":[[0, 0], [0, 0], [0, 0], [0, 0]]},
+        "machine_extruder_count": {
+            "default_value": 2
+        }
+    },
+    "metadata": {
+        "machine_extruder_trains": {
+            "0": "goofoo_gemini_1st",
+            "1": "goofoo_gemini_2st"
+        },
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_giant.def.json
+++ b/resources/definitions/goofoo_giant.def.json
@ -0,0 +1,15 @@
+{
+    "name": "Goofoo Giant",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Giant" },
+        "machine_width": { "default_value": 600 },
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 1000 }
+
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_max.def.json
+++ b/resources/definitions/goofoo_max.def.json
@ -0,0 +1,24 @@
+{
+    "name": "Goofoo Max",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Max" },
+        "machine_width": { "default_value": 600 },
+        "machine_depth": { "default_value": 580 },
+        "machine_height": { "default_value": 700 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [0, 0],
+                [0, 0],
+                [0, 0],
+                [0, 0]
+            ]
+        },
+
+        "gantry_height": { "value": 0 }
+
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_mido.def.json
+++ b/resources/definitions/goofoo_mido.def.json
@ -0,0 +1,15 @@
+{
+    "name": "Goofoo Mido",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Mido" },
+        "machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 200 }
+
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_miniplus.def.json
+++ b/resources/definitions/goofoo_miniplus.def.json
@ -0,0 +1,15 @@
+{
+    "name": "Goofoo Mini+",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Mini+" },
+        "machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 150 }
+
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_near.def.json
+++ b/resources/definitions/goofoo_near.def.json
@ -0,0 +1,9 @@
+{
+    "name": "Goofoo Near",
+    "version": 2,
+    "inherits": "goofoo_base",
+    "metadata": {
+        "quality_definition": "goofoo_near",
+        "visible": false
+    }
+}
--- a/resources/definitions/goofoo_nova.def.json
+++ b/resources/definitions/goofoo_nova.def.json
@ -0,0 +1,16 @@
+{
+    "name": "Goofoo Nova",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Nova" },
+        "machine_width": { "default_value": 280 },
+        "machine_depth": { "default_value": 280 },
+        "machine_height": { "default_value": 300 }
+
+    },
+    "metadata": {
+        "author": "goofoo",
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_open.def.json
+++ b/resources/definitions/goofoo_open.def.json
@ -0,0 +1,21 @@
+{
+    "name": "Goofoo Open",
+    "version": 2,
+    "inherits": "goofoo_base",
+    "metadata": {
+        "quality_definition": "goofoo_open",
+        "visible": false,
+        "exclude_materials": [
+            "goofoo_bronze_pla",
+            "goofoo_peek",
+            "goofoo_tpe_83a",
+            "goofoo_tpu_87a",
+            "goofoo_tpu_95a",
+            "goofoo_pa_cf",
+            "goofoo_pc",
+            "goofoo_pa",
+            "goofoo_asa",
+            "goofoo_abs"
+        ]
+    }
+}
--- a/resources/definitions/goofoo_plus.def.json
+++ b/resources/definitions/goofoo_plus.def.json
@ -0,0 +1,15 @@
+{
+    "name": "Goofoo Plus",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Plus" },
+        "machine_width": { "default_value": 360 },
+        "machine_depth": { "default_value": 360 },
+        "machine_height": { "default_value": 400 }
+
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_small.def.json
+++ b/resources/definitions/goofoo_small.def.json
@ -0,0 +1,23 @@
+{
+    "name": "Goofoo Small",
+    "version": 2,
+    "inherits": "goofoo_base",
+    "metadata": {
+        "quality_definition": "goofoo_small",
+        "visible": false,
+        "exclude_materials": [
+            "goofoo_bronze_pla",
+            "goofoo_peek",
+            "goofoo_tpe_83a",
+            "goofoo_tpu_87a",
+            "goofoo_tpu_95a",
+            "goofoo_pa_cf",
+            "goofoo_pc",
+            "goofoo_pa",
+            "goofoo_asa",
+            "goofoo_abs",
+            "goofoo_pva",
+            "goofoo_hips"
+        ]
+    }
+}
--- a/resources/definitions/goofoo_t-one.def.json
+++ b/resources/definitions/goofoo_t-one.def.json
@ -0,0 +1,36 @@
+{
+    "name": "Goofoo T-one",
+    "version": 2,
+    "inherits": "goofoo_far",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo T-one" },
+        "machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 150 },
+        "machine_extruder_count": {
+            "default_value": 2
+        }
+    },
+    "metadata": {
+        "machine_extruder_trains": {
+            "0": "goofoo_tone_1st",
+            "1": "goofoo_tone_2st"
+        },
+        "exclude_materials": [
+            "goofoo_bronze_pla",
+            "goofoo_peek",
+            "goofoo_tpe_83a",
+            "goofoo_tpu_87a",
+            "goofoo_tpu_95a",
+            "goofoo_pa_cf",
+            "goofoo_pc",
+            "goofoo_pa",
+            "goofoo_asa",
+            "goofoo_abs",
+            "goofoo_pva",
+            "goofoo_hips",
+            "goofoo_pva"
+        ],
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_tiny.def.json
+++ b/resources/definitions/goofoo_tiny.def.json
@ -0,0 +1,16 @@
+{
+    "name": "Goofoo Tiny",
+    "version": 2,
+    "inherits": "goofoo_small",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Tiny" },
+        "machine_width": { "default_value": 100 },
+        "machine_depth": { "default_value": 100 },
+        "machine_height": { "default_value": 100 },
+        "machine_heated_bed": { "default_value": false },
+        "raft_margin": { "default_value": 5 }
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/goofoo_tinyplus.def.json
+++ b/resources/definitions/goofoo_tinyplus.def.json
@ -0,0 +1,16 @@
+{
+    "name": "Goofoo Tiny+",
+    "version": 2,
+    "inherits": "goofoo_small",
+    "overrides": {
+        "machine_name": { "default_value": "Goofoo Tiny+" },
+        "machine_width": { "default_value": 120 },
+        "machine_depth": { "default_value": 120 },
+        "machine_height": { "default_value": 180 },
+        "raft_margin": { "default_value": 5 },
+        "machine_heated_bed": { "default_value": false }
+    },
+    "metadata": {
+        "visible": true
+    }
+}
--- a/resources/definitions/renkforce_basic3.def.json
+++ b/resources/definitions/renkforce_basic3.def.json
@ -0,0 +1,17 @@
+{
+    "name": "Renkforce Basic 3",
+    "version": 2,
+    "inherits": "goofoo_small",
+    "overrides": {
+        "machine_name": { "default_value": "Renkforce Basic 3" },
+        "machine_width": { "default_value": 120 },
+        "machine_depth": { "default_value": 120 },
+        "machine_height": { "default_value": 180 },
+        "machine_heated_bed": { "default_value": false }
+    },
+    "metadata": {
+        "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)",
+        "manufacturer": "Renkforce",
+        "visible": true
+    }
+}
--- a/resources/definitions/renkforce_pro3.def.json
+++ b/resources/definitions/renkforce_pro3.def.json
@ -0,0 +1,17 @@
+{
+    "name": "Renkforce Pro 3",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Renkforce Pro 3" },
+        "machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 150 }
+
+    },
+    "metadata": {
+        "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)",
+        "manufacturer": "Renkforce",
+        "visible": true
+    }
+}
--- a/resources/definitions/renkforce_pro6.def.json
+++ b/resources/definitions/renkforce_pro6.def.json
@ -0,0 +1,17 @@
+{
+    "name": "Renkforce Pro 6",
+    "version": 2,
+    "inherits": "goofoo_near",
+    "overrides": {
+        "machine_name": { "default_value": "Renkforce Pro 6" },
+        "machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 200 }
+
+    },
+    "metadata": {
+        "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)",
+        "manufacturer": "Renkforce",
+        "visible": true
+    }
+}
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -32,7 +32,7 @@
            [
                "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
            ],
-            "update_url": "https://ultimaker.com/firmware"
+            "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update"
        },
        "bom_numbers": [
            9066
--- a/resources/definitions/ultimaker3_extended.def.json
+++ b/resources/definitions/ultimaker3_extended.def.json
@ -29,7 +29,7 @@
            [
                "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
            ],
-            "update_url": "https://ultimaker.com/firmware"
+            "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update"
        },
        "bom_numbers": [
            9511
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@ -32,7 +32,7 @@
        "firmware_update_info": {
            "id": 213482,
            "check_urls": ["https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version"],
-            "update_url": "https://ultimaker.com/firmware"
+            "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update"
        },
        "bom_numbers": [
            213482
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@ -33,7 +33,7 @@
        "firmware_update_info": {
            "id": 9051,
            "check_urls": ["https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"],
-            "update_url": "https://ultimaker.com/firmware"
+            "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update"
        },
        "bom_numbers": [
            9051, 214475