Merge pull request #753 from MaslowCNC/look-into-issue-750

Add in the missing propWeightZ setting
MaslowCNC · Aug 15, 2018 · 01c2836 · 01c2836
2 parents fa3cb1b + f4f9692
commit 01c2836
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Settings/maslowSettings.py b/Settings/maslowSettings.py
@@ -415,6 +415,13 @@
                 "key": "KdVZ",
                 "default": .28
             },
+            {
+                "type": "string",
+                "title": "Proportional Weighting for Z-Axis",
+                "desc": "The ratio of Proportional on Error (1) to Proportional on Measure (0)",
+                "key": "propWeightZ",
+                "default": 1
+            },
             {
                 "type": "options",
                 "title": "PWM frequency for motor control",
@@ -470,7 +477,7 @@
                 "default": ".45"
             }
         ],
-    "Computed Settings": #These are setting calculated from the user inputs on other settings, they are not direclty seen by the user
+    "Computed Settings": #These are setting calculated from the user inputs on other settings, they are not directly seen by the user
         [
             {
                 "type": "string",

diff --git a/main.py b/main.py
@@ -196,7 +196,7 @@ def computeSettings(self, section, key, value):
                     value = maslowSettings.getDefaultValue('Advanced Settings', key)
                 self.config.set('Computed Settings', key + "Main", value)
             #updated computed values for z-axis
-            for key in ('KpPosZ', 'KiPosZ', 'KdPosZ'):
+            for key in ('KpPosZ', 'KiPosZ', 'KdPosZ', 'propWeightZ'):
                 if int(self.config.get('Advanced Settings', 'enablePosPIDValues')) == 1:
                     value = float(self.config.get('Advanced Settings', key))
                 else: