From 829968d215a89bb6daa81d65623464e58b043f7b Mon Sep 17 00:00:00 2001
From: just-trey <trey.wentz@gmail.com>
Date: Fri, 25 Nov 2022 23:44:17 -0500
Subject: [PATCH] refactor and clean up

---
 resources/definitions/ankermake_m5.def.json   | 44 +++++++------------
 .../ankermake_m5/ankermake_m5_draft.inst.cfg  |  6 +--
 .../ankermake_m5/ankermake_m5_fine.inst.cfg   |  6 +--
 .../ankermake_m5/ankermake_m5_normal.inst.cfg |  6 +--
 4 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json
index bb3fb2d942..c16d83bae4 100644
--- a/resources/definitions/ankermake_m5.def.json
+++ b/resources/definitions/ankermake_m5.def.json
@@ -19,42 +19,32 @@
 
   "overrides": {
     "machine_name": { "default_value": "AnkerMake M5" },
-    "material_diameter": { "default_value": 1.75 },
     "machine_width": { "default_value": 235 },
-    "machine_depth": { "default_value": 235 },
     "machine_height": { "default_value": 250 },
+    "machine_depth": { "default_value": 235 },
     "machine_heated_bed": { "default_value": true },
-    "initial_layer_line_width_factor": { "value": 80 },
-    "optimize_wall_printing_order": { "value": true },
-    "infill_sparse_density": { "value": 15 },
-    "infill_overlap": { "value": 30 },
-    "material_flow_layer_0": { "value": 113 },
-    "skin_material_flow": { "value": 97.0 },
-    "speed_print": { "maximum_value_warning": 300 },
+    "material_diameter": { "default_value": 1.75 },
+    "speed_print": { "value": 250.0, "maximum_value_warning": 300 },
     "speed_infill": { "maximum_value_warning": 300 },
-    "speed_wall": { "value": 150.0, "maximum_value_warning": 300 },
-    "speed_wall_0": { "value": 150.0, "maximum_value_warning": 300 },
-    "speed_wall_x": { "value": 250.0, "maximum_value_warning": 300 },
     "speed_topbottom": { "value": 150.0 },
     "speed_travel": { "value": 250.0 },
-    "speed_travel_layer_0": { "value": "speed_travel" },
-    "acceleration_print": { "value": "2500" },
-    "acceleration_travel": { "value": "acceleration_print" },
-    "retraction_amount": { "default_value": 1.5 },
-    "retraction_speed": { "default_value": 70 },
-    "retraction_combing": { "value": "infill" },
+    "speed_wall": { "value": 150.0, "maximum_value_warning": 300 },
+    "speed_wall_x": { "value": 250.0, "maximum_value_warning": 300 },
+    "material_flow_layer_0": { "value": 120 },
     "cool_min_layer_time": { "value": 6 },
     "cool_min_speed": { "value": 30 },
+    "retraction_amount": { "default_value": 1.5 },
+    "retraction_speed": { "default_value": 70 },
+    "acceleration_enabled": { "value": "False" },
+    "acceleration_print": { "value": "2500" },
     "adhesion_type": { "default_value": "skirt" },
-    "raft_margin": { "default_value": 5 },
-    "raft_airgap": { "default_value": 0.25 },
-    "skin_overlap": { "value": 10 },
-    "skirt_line_count": { "value": 3 },
-    "small_feature_speed_factor": { "value": 80 },
-    "small_feature_speed_factor_0": { "value": 30 },
-    "small_hole_max_size": { "value": 10 },
-    "wall_overhang_angle": { "value": 55 },
-    "wall_overhang_speed_factor": { "value": 50 },
+    "retraction_combing": { "value": "infill" },
+    "machine_start_gcode": {
+      "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)"
+    },
+    "machine_end_gcode": {
+      "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
+    },
     "gantry_height": { "value": 25 }
   }
 }
diff --git a/resources/quality/ankermake_m5/ankermake_m5_draft.inst.cfg b/resources/quality/ankermake_m5/ankermake_m5_draft.inst.cfg
index 0c445107df..adbd19c44d 100644
--- a/resources/quality/ankermake_m5/ankermake_m5_draft.inst.cfg
+++ b/resources/quality/ankermake_m5/ankermake_m5_draft.inst.cfg
@@ -12,8 +12,4 @@ weight = -2
 
 [values]
 layer_height = 0.28
-layer_height_0 = 0.28
-speed_print = 250
-speed_wall_0 = 150
-speed_wall_x = 250
-wall_line_count = 2
\ No newline at end of file
+layer_height_0 = 0.28
\ No newline at end of file
diff --git a/resources/quality/ankermake_m5/ankermake_m5_fine.inst.cfg b/resources/quality/ankermake_m5/ankermake_m5_fine.inst.cfg
index 71f6c01ed7..aeb5a377e8 100644
--- a/resources/quality/ankermake_m5/ankermake_m5_fine.inst.cfg
+++ b/resources/quality/ankermake_m5/ankermake_m5_fine.inst.cfg
@@ -12,8 +12,4 @@ weight = 1
 
 [values]
 layer_height = 0.12
-layer_height_0 = 0.16
-speed_print = 150
-speed_wall_0 = 80
-speed_wall_x = 150
-wall_line_count = 4
\ No newline at end of file
+layer_height_0 = 0.2
\ No newline at end of file
diff --git a/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg b/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg
index 405d3da099..fb46cdcd7e 100644
--- a/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg
+++ b/resources/quality/ankermake_m5/ankermake_m5_normal.inst.cfg
@@ -12,8 +12,4 @@ weight = 0
 
 [values]
 layer_height = 0.2
-layer_height_0 = 0.24
-speed_print = 200
-speed_wall_0 = 110
-speed_wall_x = 200
-wall_line_count = 3
\ No newline at end of file
+layer_height_0 = 0.24
\ No newline at end of file