Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add in the missing propWeightZ setting #753

Merged
merged 1 commit into from
Aug 15, 2018
Merged

Add in the missing propWeightZ setting #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Settings/maslowSettings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down