From c338e1b7d69c252ae80d9590700823108a37f320 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 21 Feb 2018 10:44:51 +0100
Subject: [PATCH] WIP: Fix quality profiles for abax_pri3

 - Fixed duplicated quality_type and name for qualities "Fast" and "Fine"
 - Moved global settings to separate global quality files
 - Fix abax_pri3 definition file: has_machine_quality = true
 - MAYBE FIXME: Normal and Fast have the same layer height. Don't know if
   that's intended. They are kept as before.
---
 resources/definitions/abax_pri3.def.json           |  3 ++-
 resources/quality/abax_pri3/apri3_fast.inst.cfg    | 14 ++++++++++++++
 resources/quality/abax_pri3/apri3_high.inst.cfg    | 14 ++++++++++++++
 resources/quality/abax_pri3/apri3_normal.inst.cfg  | 14 ++++++++++++++
 .../quality/abax_pri3/apri3_pla_fast.inst.cfg      |  5 ++---
 .../quality/abax_pri3/apri3_pla_high.inst.cfg      |  1 -
 .../quality/abax_pri3/apri3_pla_normal.inst.cfg    |  1 -
 7 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 resources/quality/abax_pri3/apri3_fast.inst.cfg
 create mode 100644 resources/quality/abax_pri3/apri3_high.inst.cfg
 create mode 100644 resources/quality/abax_pri3/apri3_normal.inst.cfg

diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json
index 2fa648096f..f91a501a6f 100644
--- a/resources/definitions/abax_pri3.def.json
+++ b/resources/definitions/abax_pri3.def.json
@@ -6,7 +6,8 @@
         "visible": true,
         "author": "ABAX 3d Technologies",
         "manufacturer": "ABAX 3d Technologies",
-        "file_formats": "text/x-gcode"
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": true
     },
     "overrides": {
         "machine_start_gcode": {
diff --git a/resources/quality/abax_pri3/apri3_fast.inst.cfg b/resources/quality/abax_pri3/apri3_fast.inst.cfg
new file mode 100644
index 0000000000..7db569ec72
--- /dev/null
+++ b/resources/quality/abax_pri3/apri3_fast.inst.cfg
@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Fast
+definition = abax_pri3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = fast
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.2
diff --git a/resources/quality/abax_pri3/apri3_high.inst.cfg b/resources/quality/abax_pri3/apri3_high.inst.cfg
new file mode 100644
index 0000000000..8a95b71a88
--- /dev/null
+++ b/resources/quality/abax_pri3/apri3_high.inst.cfg
@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Extra Fine
+definition = abax_pri3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = high
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.1
diff --git a/resources/quality/abax_pri3/apri3_normal.inst.cfg b/resources/quality/abax_pri3/apri3_normal.inst.cfg
new file mode 100644
index 0000000000..29b25d889f
--- /dev/null
+++ b/resources/quality/abax_pri3/apri3_normal.inst.cfg
@@ -0,0 +1,14 @@
+[general]
+version = 2
+name = Fine
+definition = abax_pri3
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.2
diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
index 7d1c1bf588..f24f198b2e 100644
--- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
+++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
@@ -1,17 +1,16 @@
 [general]
 version = 2
-name = Fine
+name = Fast
 definition = abax_pri3
 
 [metadata]
 setting_version = 4
 type = quality
-quality_type = normal
+quality_type = fast
 weight = -1
 material = generic_pla
 
 [values]
-layer_height = 0.2
 wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg
index 46a4178dd9..5b4c470842 100644
--- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg
+++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg
@@ -11,7 +11,6 @@ weight = 1
 material = generic_pla
 
 [values]
-layer_height = 0.1
 wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
index 3f6f36cfe6..2df629af38 100644
--- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
+++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
@@ -11,7 +11,6 @@ weight = 0
 material = generic_pla
 
 [values]
-layer_height = 0.2
 wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20