Merge branch 'main' of https://github.com/Jeremie-C/CuraAdventurer

Ultimaker · Jan 31, 2024 · c93848f · c93848f
2 parents 00f8f87 + fb5da34
commit c93848f
Show file tree

Hide file tree

Showing 113 changed files with 1,914 additions and 0 deletions.
diff --git a/resources/definitions/flashforge_adventurer3.def.json b/resources/definitions/flashforge_adventurer3.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Adventurer 3",
+    "inherits": "flashforge_adventurer3c",
+    "metadata": 
+    {
+        "author": "Jeremie-C",
+        "visible": true,
+        "supports_network_connection": true
+    },
+    "overrides": 
+    {
+        "machine_name": {"default_value": "Adventurer 3"}
+    }
+}
diff --git a/resources/definitions/flashforge_adventurer3c.def.json b/resources/definitions/flashforge_adventurer3c.def.json
@@ -0,0 +1,24 @@
+{
+    "version": 2,
+    "name": "Adventurer 3C",
+    "inherits": "flashforge_adventurer_base",
+    "metadata": {
+        "author": "Jeremie-C",
+        "visible": true,
+        "quality_definition": "flashforge_adventurer3"
+    },
+    "overrides": 
+    {
+        "default_material_bed_temperature": {"maximum_value_warning": "100"},
+        "gantry_height": {"value": "150"},
+        "machine_center_is_zero": {"default_value": true},
+        "machine_depth": {"default_value": 150},
+        "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM132 X Y A B\nM652\nG91\nM18"},
+        "machine_head_with_fans_polygon": {"default_value": [[-20, 10], [-20, -10], [10, 10], [10, -10]]},
+        "machine_height": {"default_value": 150},
+        "machine_name": {"default_value": "Adventurer 3C"},
+        "machine_start_gcode": {"default_value": ";Start Gcode\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\n;End Start"},
+        "machine_width": {"default_value": 150},
+        "speed_print": {"maximum_value_warning": 100}
+    }
+}
diff --git a/resources/definitions/flashforge_adventurer4.def.json b/resources/definitions/flashforge_adventurer4.def.json
@@ -0,0 +1,25 @@
+{
+    "version": 2,
+    "name": "Adventurer 4",
+    "inherits": "flashforge_adventurer_base",
+    "metadata": 
+    {
+        "author": "Jeremie-C",
+        "visible": true,
+        "quality_definition": "flashforge_adventurer4",
+        "supports_network_connection": true
+    },
+    "overrides": 
+    {
+        "default_material_bed_temperature": {"maximum_value_warning": "110"},
+        "gantry_height": {"value": "250"},
+        "machine_depth": {"default_value": 200},
+        "machine_end_gcode": {"default_value": ";End Gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM132 X Y A B\nM652\nG91\nM18"},
+        "machine_head_with_fans_polygon": {"default_value": [[-20, 10], [-20, -10], [10, 10], [10, -10]]},
+        "machine_height": {"default_value": 250},
+        "machine_name": {"default_value": "Adventurer 4"},
+        "machine_start_gcode": {"default_value": ";Start Gcode\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\n;End Start"},
+        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_width": {"default_value": 220}
+    }
+}
diff --git a/resources/definitions/flashforge_adventurer4lite.def.json b/resources/definitions/flashforge_adventurer4lite.def.json
@@ -0,0 +1,14 @@
+{
+    "version": 2,
+    "name": "Adventurer 4 Lite",
+    "inherits": "flashforge_adventurer4",
+    "metadata": 
+    {
+        "author": "Jeremie-C",
+        "visible": true
+    },
+    "overrides": 
+    {
+        "machine_name": { "default_value": "Adventurer 4 Lite" }
+    }
+}
diff --git a/resources/definitions/flashforge_adventurer_base.def.json b/resources/definitions/flashforge_adventurer_base.def.json
@@ -0,0 +1,34 @@
+{
+    "version": 2,
+    "name": "Flashforge Adventurer Base",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "author": "Jeremie-C",
+        "manufacturer": "Flashforge",
+        "visible": false,
+        "file_formats": "application/gx;text/x-gcode",
+        "first_start_actions": ["MachineSettingsAction"],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": {"0": "flashforge_adventurer_extruder_0"},
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "normal",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "adhesion_type": {"default_value": "skirt"},
+        "default_material_print_temperature": {"maximum_value_warning": "265"},
+        "layer_height": 
+        {
+            "minimum_value_warning": "0.1",
+            "maximum_value_warning": "0.4"
+        },
+        "machine_center_is_zero": {"default_value": true},
+        "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
+        "machine_heated_bed": {"default_value": true}
+    }
+}
diff --git a/resources/extruders/flashforge_adventurer_extruder_0.def.json b/resources/extruders/flashforge_adventurer_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "flashforge_adventurer_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/quality/flashforge/abs/flashforge_adventurer3_abs_0.3_fine.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.3_fine.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Fine
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = fine
+setting_version = 22
+type = quality
+variant = 0.3mm Nozzle
+weight = 1
+
+[values]
+speed_print = 50
+speed_travel = 100
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.3_vfine.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.3_vfine.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Very Fine
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = veryfine
+setting_version = 22
+type = quality
+variant = 0.3mm Nozzle
+weight = 2
+
+[values]
+speed_print = 45
+speed_travel = 100
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_draft.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Draft
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = -3
+
+[values]
+speed_print = 70
+speed_travel = 90
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_fast.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_fast.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Fast
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = fast
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = -1
+
+[values]
+speed_print = 60
+speed_travel = 80
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_fine.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_fine.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Fine
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = fine
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = 1
+
+[values]
+speed_print = 40
+speed_travel = 70
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_normal.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_normal.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Standard
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = normal
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = 0
+
+[values]
+speed_print = 60
+speed_travel = 80
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_vfast.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_vfast.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Very Fast
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = veryfast
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = -2
+
+[values]
+speed_print = 60
+speed_travel = 90
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_vfine.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.4_vfine.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Very Fine
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = veryfine
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = 2
+
+[values]
+speed_print = 35
+speed_travel = 70
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.6_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.6_draft.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Draft
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 0.6mm Nozzle
+weight = -3
+
+[values]
+speed_print = 55
+speed_travel = 100
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.6_fast.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.6_fast.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Fast
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = fast
+setting_version = 22
+type = quality
+variant = 0.6mm Nozzle
+weight = -1
+
+[values]
+speed_print = 50
+speed_travel = 100
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.6_vfast.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer3_abs_0.6_vfast.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = flashforge_adventurer3
+name = Very Fast
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = veryfast
+setting_version = 22
+type = quality
+variant = 0.6mm Nozzle
+weight = -2
+
+[values]
+speed_print = 50
+speed_travel = 100
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer4_abs_0.3_fine.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer4_abs_0.3_fine.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = flashforge_adventurer4
+name = Fine
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = fine
+setting_version = 22
+type = quality
+variant = 0.3mm Nozzle
+weight = 1
+
+[values]
+speed_print = 50
+speed_travel = 100
+retraction_amount = 5
+retraction_speed = 30
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer4_abs_0.3_vfine.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer4_abs_0.3_vfine.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = flashforge_adventurer4
+name = Very Fine
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = veryfine
+setting_version = 22
+type = quality
+variant = 0.3mm Nozzle
+weight = 2
+
+[values]
+speed_print = 45
+speed_travel = 100
+retraction_amount = 5
+retraction_speed = 30
diff --git a/resources/quality/flashforge/abs/flashforge_adventurer4_abs_0.4_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_adventurer4_abs_0.4_draft.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = flashforge_adventurer4
+name = Draft
+version = 4
+
+[metadata]
+material = generic_abs
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 0.4mm Nozzle
+weight = -3
+
+[values]
+speed_print = 70
+speed_travel = 90
+retraction_amount = 5
+retraction_speed = 30