Merge branch 'main' into main

SoftFever · Dec 6, 2024 · c91ebbb · c91ebbb
2 parents 1f8aef7 + 3caca22
commit c91ebbb
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 38 deletions.
diff --git a/resources/profiles/Anker/machine/Anker M5 0.2 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.2 nozzle.json
@@ -15,7 +15,6 @@
     "printer_variant": "0.2",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 0.25 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.25 nozzle.json
@@ -15,7 +15,6 @@
     "printer_variant": "0.25",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json
@@ -12,7 +12,6 @@
     "printer_variant": "0.4",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 0.6 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.6 nozzle.json
@@ -18,7 +18,6 @@
     "printer_variant": "0.6",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.2 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.2 nozzle.json
@@ -15,7 +15,6 @@
     "printer_variant": "0.2",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.25 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.25 nozzle.json
@@ -15,7 +15,6 @@
     "printer_variant": "0.25",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.4 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.4 nozzle.json
@@ -12,7 +12,6 @@
     "printer_variant": "0.4",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.6 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.6 nozzle.json
@@ -18,7 +18,6 @@
     "printer_variant": "0.6",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5C 0.2 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.2 nozzle.json
@@ -15,7 +15,6 @@
     "printer_variant": "0.2",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5C 0.25 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.25 nozzle.json
@@ -15,7 +15,6 @@
     "printer_variant": "0.25",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json
@@ -12,7 +12,6 @@
     "printer_variant": "0.4",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/Anker M5C 0.6 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.6 nozzle.json
@@ -18,7 +18,6 @@
     "printer_variant": "0.6",
     "auxiliary_fan": "0",
     "bed_exclude_area": [],
-    "printer_structure": "i3",
     "default_filament_profile": [
         "Anker Generic PLA+"
     ],

diff --git a/resources/profiles/Anker/machine/fdm_machine_common.json b/resources/profiles/Anker/machine/fdm_machine_common.json
@@ -16,46 +16,46 @@
     ],
     "silent_mode": "0",
     "machine_max_acceleration_e": [
-        "10000"
+        "4000"
     ],
     "machine_max_acceleration_extruding": [
-        "10000"
+        "6000"
     ],
     "machine_max_acceleration_retracting": [
-        "10000"
+        "1000"
     ],
     "machine_max_acceleration_x": [
-        "10000"
+        "6000"
     ],
     "machine_max_acceleration_y": [
-        "10000"
+        "6000"
     ],
     "machine_max_acceleration_z": [
-        "10000"
+        "300"
     ],
     "machine_max_acceleration_travel": [
-        "10000"
+        "6000"
     ],
     "machine_max_speed_e": [
-        "100"
+        "50"
     ],
     "machine_max_speed_x": [
-        "500"
+        "600"
     ],
     "machine_max_speed_y": [
-        "500"
+        "600"
     ],
     "machine_max_speed_z": [
-        "50"
+        "30"
     ],
     "machine_max_jerk_e": [
         "3"
     ],
     "machine_max_jerk_x": [
-        "15"
+        "12"
     ],
     "machine_max_jerk_y": [
-        "15"
+        "12"
     ],
     "machine_max_jerk_z": [
         "0.3"
@@ -70,11 +70,11 @@
         "0.32"
     ],
     "min_layer_height": [
-        "0.08"
+        "0.05"
     ],
     "printer_settings_id": "",
     "retraction_minimum_travel": [
-        "1.5"
+        "1"
     ],
     "retract_before_wipe": [
         "0%"
@@ -83,10 +83,10 @@
         "1"
     ],
     "retraction_length": [
-        "3"
+        "0.5"
     ],
     "retract_length_toolchange": [
-        "4"
+        "2"
     ],
     "z_hop": [
         "0"
@@ -106,4 +106,4 @@
     "wipe": [
         "1"
     ]
-}
+}
diff --git a/resources/profiles/Anker/process/fdm_process_anker_fast_common.json b/resources/profiles/Anker/process/fdm_process_anker_fast_common.json
@@ -22,5 +22,12 @@
     "travel_speed": "500",
     "travel_acceleration": "6000",
     "top_surface_speed": "360",
-    "top_surface_acceleration": "2500"
+    "top_surface_acceleration": "2500",
+    "default_jerk": "9",
+    "outer_wall_jerk": "9",
+    "inner_wall_jerk": "9",
+    "infill_jerk": "9",
+    "top_surface_jerk": "9",
+    "initial_layer_jerk": "9",
+    "travel_jerk": "10"
 }
diff --git a/resources/profiles/Anker/process/fdm_process_common.json b/resources/profiles/Anker/process/fdm_process_common.json
@@ -51,13 +51,13 @@
     "inner_wall_acceleration": "500",
     "bridge_acceleration": "500",
     "travel_acceleration": "2500",
-    "default_jerk": "15",
-    "outer_wall_jerk": "10",
-    "inner_wall_jerk": "15",
-    "infill_jerk": "15",
-    "top_surface_jerk": "12",
-    "initial_layer_jerk": "12",
-    "travel_jerk": "20",
+    "default_jerk": "8",
+    "outer_wall_jerk": "5",
+    "inner_wall_jerk": "8",
+    "infill_jerk": "9",
+    "top_surface_jerk": "5",
+    "initial_layer_jerk": "8",
+    "travel_jerk": "9",
     "enable_support": "0",
     "support_type": "normal(auto)",
     "support_threshold_angle": "30",