aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://code.google.com/p/ardupilot-mega into param-suffix

Browse Source 
Conflicts:
	Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
	Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataConstants.cs
	Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
	Tools/ArdupilotMegaPlanner/app.config
This commit is contained in:
Adam M Rivera 2012-04-25 20:39:59 -05:00
commit faf51754ba
9 changed files with 136 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Tools/ArdupilotMegaPlanner/ArduCopterConfig.xml
View File

@ -101,6 +101,70 @@ Too high = slow wobbles
<STEP>0.001</STEP> <STEP>0.001</STEP>
</FIELD> </FIELD>
</FIELDS> </FIELDS>
<SUBHEAD>Yaw Angular Rate Control:</SUBHEAD>
<DESC>How much throttle is applied to rotate the copter at the desired speed.
</DESC>
<FIELDS>
<FIELD>
<NAME>P</NAME>
<PARAMNAME>RATE_YAW_P</PARAMNAME>
<RANGEMIN>0.001</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>I</NAME>
<PARAMNAME>RATE_YAW_I</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>D</NAME>
<PARAMNAME>RATE_YAW_D</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>IMAX</NAME>
<PARAMNAME>RATE_YAW_IMAX</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>50</RANGEMAX>
<STEP>1</STEP>
</FIELD>
</FIELDS>
<SUBHEAD>Yaw Stabilize Control:</SUBHEAD>
<DESC>
How fast the copter reacts to user or autopilot input.
Higher = more aggressive control.
Too high = slow wobbles
</DESC>
<FIELDS>
<FIELD>
<NAME>P</NAME>
<PARAMNAME>STB_YAW_P</PARAMNAME>
<RANGEMIN>0.001</RANGEMIN>
<RANGEMAX>10</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>I</NAME>
<PARAMNAME>STB_YAW_I</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>IMAX</NAME>
<PARAMNAME>STB_YAW_IMAX</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>50</RANGEMAX>
<STEP>1</STEP>
</FIELD>
</FIELDS>
</Item> </Item>
<!-- Loiter --> <!-- Loiter -->
<Item> <Item>
@ -140,7 +204,7 @@ How much angle is applied to make the copter accelerate to the desired speed.
<PARAMNAME>LOITER_LON_IMAX</PARAMNAME> <PARAMNAME>LOITER_LON_IMAX</PARAMNAME>
<RANGEMIN>0</RANGEMIN> <RANGEMIN>0</RANGEMIN>
<RANGEMAX>50</RANGEMAX> <RANGEMAX>50</RANGEMAX>
<STEP>0.1</STEP> <STEP>1</STEP>
</FIELD> </FIELD>
</FIELDS> </FIELDS>
<SUBHEAD>Loiter Speed:</SUBHEAD> <SUBHEAD>Loiter Speed:</SUBHEAD>

2
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
View File

@ -227,7 +227,7 @@
<Compile Include="Attributes\PrivateAttribute.cs" /> <Compile Include="Attributes\PrivateAttribute.cs" />
<Compile Include="CodeGen.cs" /> <Compile Include="CodeGen.cs" />
<Compile Include="Utilities\CollectionExtensions.cs" /> <Compile Include="Utilities\CollectionExtensions.cs" />
<Compile Include="Utilities\Constants\ParameterMetaDataConstants.cs" /> <Compile Include="Utilities\ParameterMetaDataConstants.cs" />
<Compile Include="Controls\BackstageView\BackstageView.cs"> <Compile Include="Controls\BackstageView\BackstageView.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>

1
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigRawParams.cs
View File

@ -6,7 +6,6 @@ using System.IO;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ArdupilotMega.Utilities; using ArdupilotMega.Utilities;
using ArdupilotMega.Utilities.Constants;
using log4net; using log4net;
using ArdupilotMega.Controls.BackstageView; using ArdupilotMega.Controls.BackstageView;

BIN
Tools/ArdupilotMegaPlanner/Msi/wix.pdb
View File

Binary file not shown.

2
Tools/ArdupilotMegaPlanner/Utilities/Constants/ParameterMetaDataConstants.cs → Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataConstants.cs
View File

@ -1,4 +1,4 @@
namespace ArdupilotMega.Utilities.Constants namespace ArdupilotMega.Utilities
{ {
public sealed class ParameterMetaDataConstants public sealed class ParameterMetaDataConstants
{ {

2
Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
View File

@ -7,7 +7,7 @@ using System.Net;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using ArdupilotMega.Utilities.Constants; using ArdupilotMega.Utilities;
using log4net; using log4net;
namespace ArdupilotMega.Utilities namespace ArdupilotMega.Utilities

2
Tools/ArdupilotMegaPlanner/app.config
View File

@ -9,7 +9,7 @@
<add key="UpdateLocation" <add key="UpdateLocation"
value="http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/bin/Release/"/> value="http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/bin/Release/"/>
<add key="ParameterLocations" <add key="ParameterLocations"
value="http://a432511-wip.googlecode.com/git-history/param-suffix/ArduCopter/Parameters.pde"/> value="http://ardupilot-mega.googlecode.com/git/ArduCopter/Parameters.pde"/>
<add key="ParameterMetaDataXMLFileName" <add key="ParameterMetaDataXMLFileName"
value="ParameterMetaData.xml"/> value="ParameterMetaData.xml"/>
</appSettings> </appSettings>

66
Tools/ArdupilotMegaPlanner/bin/Release/ArduCopterConfig.xml
View File

@ -101,6 +101,70 @@ Too high = slow wobbles
<STEP>0.001</STEP> <STEP>0.001</STEP>
</FIELD> </FIELD>
</FIELDS> </FIELDS>
<SUBHEAD>Yaw Angular Rate Control:</SUBHEAD>
<DESC>How much throttle is applied to rotate the copter at the desired speed.
</DESC>
<FIELDS>
<FIELD>
<NAME>P</NAME>
<PARAMNAME>RATE_YAW_P</PARAMNAME>
<RANGEMIN>0.001</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>I</NAME>
<PARAMNAME>RATE_YAW_I</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>D</NAME>
<PARAMNAME>RATE_YAW_D</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>IMAX</NAME>
<PARAMNAME>RATE_YAW_IMAX</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>50</RANGEMAX>
<STEP>1</STEP>
</FIELD>
</FIELDS>
<SUBHEAD>Yaw Stabilize Control:</SUBHEAD>
<DESC>
How fast the copter reacts to user or autopilot input.
Higher = more aggressive control.
Too high = slow wobbles
</DESC>
<FIELDS>
<FIELD>
<NAME>P</NAME>
<PARAMNAME>STB_YAW_P</PARAMNAME>
<RANGEMIN>0.001</RANGEMIN>
<RANGEMAX>10</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>I</NAME>
<PARAMNAME>STB_YAW_I</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>5</RANGEMAX>
<STEP>0.001</STEP>
</FIELD>
<FIELD>
<NAME>IMAX</NAME>
<PARAMNAME>STB_YAW_IMAX</PARAMNAME>
<RANGEMIN>0</RANGEMIN>
<RANGEMAX>50</RANGEMAX>
<STEP>1</STEP>
</FIELD>
</FIELDS>
</Item> </Item>
<!-- Loiter --> <!-- Loiter -->
<Item> <Item>
@ -140,7 +204,7 @@ How much angle is applied to make the copter accelerate to the desired speed.
<PARAMNAME>LOITER_LON_IMAX</PARAMNAME> <PARAMNAME>LOITER_LON_IMAX</PARAMNAME>
<RANGEMIN>0</RANGEMIN> <RANGEMIN>0</RANGEMIN>
<RANGEMAX>50</RANGEMAX> <RANGEMAX>50</RANGEMAX>
<STEP>0.1</STEP> <STEP>1</STEP>
</FIELD> </FIELD>
</FIELDS> </FIELDS>
<SUBHEAD>Loiter Speed:</SUBHEAD> <SUBHEAD>Loiter Speed:</SUBHEAD>

2
Tools/ArdupilotMegaPlanner/bin/Release/version.txt
View File

@ -1 +1 @@
1.1.4498.32482 1.1.4499.14296