rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-17 02:52:12 +01:00
Code Issues Releases Activity

Updates to various objects

Browse Source
This commit is contained in:
James Cotton 2011-03-06 18:22:39 -06:00
parent 6158e19df1
commit c7f57dffe3
13 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/AHRSCalibration.java
View File

@ -171,7 +171,7 @@ public class AHRSCalibration extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("measure_var").setValue(0);
getField("measure_var").setValue("SET");
getField("accel_bias").setValue(-73.5,0);
getField("accel_bias").setValue(-73.5,1);
getField("accel_bias").setValue(73.5,2);

4
androidgcs/src/org/openpilot/uavtalk/uavobjects/AHRSSettings.java
View File

@ -132,10 +132,10 @@ public class AHRSSettings extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("Algorithm").setValue(1);
getField("Algorithm").setValue("INSGPS_INDOOR_NOMAG");
getField("Downsampling").setValue(20);
getField("UpdatePeriod").setValue(1);
getField("BiasCorrectedRaw").setValue(0);
getField("BiasCorrectedRaw").setValue("TRUE");
getField("YawBias").setValue(0);
getField("PitchBias").setValue(0);
getField("RollBias").setValue(0);

44
androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
View File

@ -358,20 +358,20 @@ public class ActuatorSettings extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("FixedWingRoll1").setValue(8);
getField("FixedWingRoll2").setValue(8);
getField("FixedWingPitch1").setValue(8);
getField("FixedWingPitch2").setValue(8);
getField("FixedWingYaw").setValue(8);
getField("FixedWingThrottle").setValue(8);
getField("VTOLMotorN").setValue(8);
getField("VTOLMotorNE").setValue(8);
getField("VTOLMotorE").setValue(8);
getField("VTOLMotorSE").setValue(8);
getField("VTOLMotorS").setValue(8);
getField("VTOLMotorSW").setValue(8);
getField("VTOLMotorW").setValue(8);
getField("VTOLMotorNW").setValue(8);
getField("FixedWingRoll1").setValue("None");
getField("FixedWingRoll2").setValue("None");
getField("FixedWingPitch1").setValue("None");
getField("FixedWingPitch2").setValue("None");
getField("FixedWingYaw").setValue("None");
getField("FixedWingThrottle").setValue("None");
getField("VTOLMotorN").setValue("None");
getField("VTOLMotorNE").setValue("None");
getField("VTOLMotorE").setValue("None");
getField("VTOLMotorSE").setValue("None");
getField("VTOLMotorS").setValue("None");
getField("VTOLMotorSW").setValue("None");
getField("VTOLMotorW").setValue("None");
getField("VTOLMotorNW").setValue("None");
getField("ChannelUpdateFreq").setValue(50,0);
getField("ChannelUpdateFreq").setValue(50,1);
getField("ChannelUpdateFreq").setValue(50,2);
@ -400,14 +400,14 @@ public class ActuatorSettings extends UAVDataObject {
getField("ChannelMin").setValue(1000,5);
getField("ChannelMin").setValue(1000,6);
getField("ChannelMin").setValue(1000,7);
getField("ChannelType").setValue(0,0);
getField("ChannelType").setValue(0,1);
getField("ChannelType").setValue(0,2);
getField("ChannelType").setValue(0,3);
getField("ChannelType").setValue(0,4);
getField("ChannelType").setValue(0,5);
getField("ChannelType").setValue(0,6);
getField("ChannelType").setValue(0,7);
getField("ChannelType").setValue("PWM",0);
getField("ChannelType").setValue("PWM",1);
getField("ChannelType").setValue("PWM",2);
getField("ChannelType").setValue("PWM",3);
getField("ChannelType").setValue("PWM",4);
getField("ChannelType").setValue("PWM",5);
getField("ChannelType").setValue("PWM",6);
getField("ChannelType").setValue("PWM",7);
getField("ChannelAddr").setValue(0,0);
getField("ChannelAddr").setValue(1,1);
getField("ChannelAddr").setValue(2,2);

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/BatterySettings.java
View File

@ -121,7 +121,7 @@ public class BatterySettings extends UAVDataObject {
{
getField("BatteryVoltage").setValue(11.1);
getField("BatteryCapacity").setValue(2200);
getField("BatteryType").setValue(0);
getField("BatteryType").setValue("LiPo");
getField("Calibrations").setValue(1,0);
getField("Calibrations").setValue(1,1);

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanControl.java
View File

@ -104,7 +104,7 @@ public class FlightPlanControl extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("Command").setValue(0);
getField("Command").setValue("Start");
}

4
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanStatus.java
View File

@ -144,8 +144,8 @@ public class FlightPlanStatus extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("Status").setValue(0);
getField("ErrorType").setValue(0);
getField("Status").setValue("Stopped");
getField("ErrorType").setValue("None");
getField("Debug1").setValue(0);
getField("Debug2").setValue(0);

4
androidgcs/src/org/openpilot/uavtalk/uavobjects/GuidanceSettings.java
View File

@ -142,7 +142,7 @@ public class GuidanceSettings extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("GuidanceMode").setValue(0);
getField("GuidanceMode").setValue("DUAL_LOOP");
getField("HorizontalP").setValue(0.2,0);
getField("HorizontalP").setValue(150,1);
getField("HorizontalVelPID").setValue(0.1,0);
@ -155,7 +155,7 @@ public class GuidanceSettings extends UAVDataObject {
getField("VerticalVelPID").setValue(0,1);
getField("VerticalVelPID").setValue(0,2);
getField("VerticalVelPID").setValue(0,3);
getField("ThrottleControl").setValue(0);
getField("ThrottleControl").setValue("FALSE");
getField("MaxRollPitch").setValue(10);
getField("UpdatePeriod").setValue(100);

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
View File

@ -139,7 +139,7 @@ public class HomeLocation extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("Set").setValue(0);
getField("Set").setValue("FALSE");
getField("Latitude").setValue(0);
getField("Longitude").setValue(0);
getField("Altitude").setValue(0);

44
androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
View File

@ -309,28 +309,28 @@ public class ManualControlSettings extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("InputMode").setValue(0);
getField("Roll").setValue(0);
getField("Pitch").setValue(1);
getField("Yaw").setValue(2);
getField("Throttle").setValue(3);
getField("FlightMode").setValue(4);
getField("Accessory1").setValue(8);
getField("Accessory2").setValue(8);
getField("Accessory3").setValue(8);
getField("Arming").setValue(0);
getField("Stabilization1Settings").setValue(2,0);
getField("Stabilization1Settings").setValue(2,1);
getField("Stabilization1Settings").setValue(2,2);
getField("Stabilization2Settings").setValue(2,0);
getField("Stabilization2Settings").setValue(2,1);
getField("Stabilization2Settings").setValue(2,2);
getField("Stabilization3Settings").setValue(2,0);
getField("Stabilization3Settings").setValue(2,1);
getField("Stabilization3Settings").setValue(2,2);
getField("FlightModePosition").setValue(0,0);
getField("FlightModePosition").setValue(1,1);
getField("FlightModePosition").setValue(2,2);
getField("InputMode").setValue("PWM");
getField("Roll").setValue("Channel1");
getField("Pitch").setValue("Channel2");
getField("Yaw").setValue("Channel3");
getField("Throttle").setValue("Channel4");
getField("FlightMode").setValue("Channel5");
getField("Accessory1").setValue("None");
getField("Accessory2").setValue("None");
getField("Accessory3").setValue("None");
getField("Arming").setValue("Always Disarmed");
getField("Stabilization1Settings").setValue("Attitude",0);
getField("Stabilization1Settings").setValue("Attitude",1);
getField("Stabilization1Settings").setValue("Attitude",2);
getField("Stabilization2Settings").setValue("Attitude",0);
getField("Stabilization2Settings").setValue("Attitude",1);
getField("Stabilization2Settings").setValue("Attitude",2);
getField("Stabilization3Settings").setValue("Attitude",0);
getField("Stabilization3Settings").setValue("Attitude",1);
getField("Stabilization3Settings").setValue("Attitude",2);
getField("FlightModePosition").setValue("Manual",0);
getField("FlightModePosition").setValue("Manual",1);
getField("FlightModePosition").setValue("Manual",2);
getField("ChannelMax").setValue(2000,0);
getField("ChannelMax").setValue(2000,1);
getField("ChannelMax").setValue(2000,2);

16
androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerSettings.java
View File

@ -270,49 +270,49 @@ public class MixerSettings extends UAVDataObject {
getField("ThrottleCurve2").setValue(0.5,2);
getField("ThrottleCurve2").setValue(0.75,3);
getField("ThrottleCurve2").setValue(1,4);
getField("Mixer1Type").setValue(0);
getField("Mixer1Type").setValue("Disabled");
getField("Mixer1Vector").setValue(0,0);
getField("Mixer1Vector").setValue(0,1);
getField("Mixer1Vector").setValue(0,2);
getField("Mixer1Vector").setValue(0,3);
getField("Mixer1Vector").setValue(0,4);
getField("Mixer2Type").setValue(0);
getField("Mixer2Type").setValue("Disabled");
getField("Mixer2Vector").setValue(0,0);
getField("Mixer2Vector").setValue(0,1);
getField("Mixer2Vector").setValue(0,2);
getField("Mixer2Vector").setValue(0,3);
getField("Mixer2Vector").setValue(0,4);
getField("Mixer3Type").setValue(0);
getField("Mixer3Type").setValue("Disabled");
getField("Mixer3Vector").setValue(0,0);
getField("Mixer3Vector").setValue(0,1);
getField("Mixer3Vector").setValue(0,2);
getField("Mixer3Vector").setValue(0,3);
getField("Mixer3Vector").setValue(0,4);
getField("Mixer4Type").setValue(0);
getField("Mixer4Type").setValue("Disabled");
getField("Mixer4Vector").setValue(0,0);
getField("Mixer4Vector").setValue(0,1);
getField("Mixer4Vector").setValue(0,2);
getField("Mixer4Vector").setValue(0,3);
getField("Mixer4Vector").setValue(0,4);
getField("Mixer5Type").setValue(0);
getField("Mixer5Type").setValue("Disabled");
getField("Mixer5Vector").setValue(0,0);
getField("Mixer5Vector").setValue(0,1);
getField("Mixer5Vector").setValue(0,2);
getField("Mixer5Vector").setValue(0,3);
getField("Mixer5Vector").setValue(0,4);
getField("Mixer6Type").setValue(0);
getField("Mixer6Type").setValue("Disabled");
getField("Mixer6Vector").setValue(0,0);
getField("Mixer6Vector").setValue(0,1);
getField("Mixer6Vector").setValue(0,2);
getField("Mixer6Vector").setValue(0,3);
getField("Mixer6Vector").setValue(0,4);
getField("Mixer7Type").setValue(0);
getField("Mixer7Type").setValue("Disabled");
getField("Mixer7Vector").setValue(0,0);
getField("Mixer7Vector").setValue(0,1);
getField("Mixer7Vector").setValue(0,2);
getField("Mixer7Vector").setValue(0,3);
getField("Mixer7Vector").setValue(0,4);
getField("Mixer8Type").setValue(0);
getField("Mixer8Type").setValue("Disabled");
getField("Mixer8Vector").setValue(0,0);
getField("Mixer8Vector").setValue(0,1);
getField("Mixer8Vector").setValue(0,2);

32
androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
View File

@ -121,22 +121,22 @@ public class SystemAlarms extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("Alarm").setValue(0,0);
getField("Alarm").setValue(0,1);
getField("Alarm").setValue(0,2);
getField("Alarm").setValue(0,3);
getField("Alarm").setValue(0,4);
getField("Alarm").setValue(0,5);
getField("Alarm").setValue(0,6);
getField("Alarm").setValue(0,7);
getField("Alarm").setValue(0,8);
getField("Alarm").setValue(0,9);
getField("Alarm").setValue(0,10);
getField("Alarm").setValue(0,11);
getField("Alarm").setValue(0,12);
getField("Alarm").setValue(0,13);
getField("Alarm").setValue(0,14);
getField("Alarm").setValue(0,15);
getField("Alarm").setValue("Uninitialised",0);
getField("Alarm").setValue("Uninitialised",1);
getField("Alarm").setValue("Uninitialised",2);
getField("Alarm").setValue("Uninitialised",3);
getField("Alarm").setValue("Uninitialised",4);
getField("Alarm").setValue("Uninitialised",5);
getField("Alarm").setValue("Uninitialised",6);
getField("Alarm").setValue("Uninitialised",7);
getField("Alarm").setValue("Uninitialised",8);
getField("Alarm").setValue("Uninitialised",9);
getField("Alarm").setValue("Uninitialised",10);
getField("Alarm").setValue("Uninitialised",11);
getField("Alarm").setValue("Uninitialised",12);
getField("Alarm").setValue("Uninitialised",13);
getField("Alarm").setValue("Uninitialised",14);
getField("Alarm").setValue("Uninitialised",15);
}

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemSettings.java
View File

@ -117,7 +117,7 @@ public class SystemSettings extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("AirframeType").setValue(0);
getField("AirframeType").setValue("FixedWing");
}

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/TelemetrySettings.java
View File

@ -108,7 +108,7 @@ public class TelemetrySettings extends UAVDataObject {
*/
public void setDefaultFieldValues()
{
getField("Speed").setValue(5);
getField("Speed").setValue("57600");
}