Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-11-08 22:13:23 -05:00
commit 3acd4b658b
2 changed files with 3 additions and 3 deletions

View file

@ -1119,8 +1119,8 @@
<ki>0.0</ki>
<kd>fbw/yaw/tc-d-gain</kd>
<clipto>
<min>-0.2</min>
<max>0.2</max>
<min>-0.4</min>
<max>0.4</max>
</clipto>
<output>fbw/yaw/tc-pid</output>
</pid>

View file

@ -1 +1 @@
4697
4698