From 1fe1f4293821e790fdbf7c95442d8fbf6a9cfef3 Mon Sep 17 00:00:00 2001
From: Jessica <jessica@ubuntu.ubuntu-domain>
Date: Tue, 31 Jul 2012 15:20:45 -0700
Subject: [PATCH] ParameterList.xml in data.

---
 data/ParameterList.xml     | 227 +++++++++++++++++++++++++++++++++++++++++++++
 settings/ParameterList.xml | 227 ---------------------------------------------
 src/comm/ParameterList.cc  |   2 +-
 3 files changed, 228 insertions(+), 228 deletions(-)
 create mode 100644 data/ParameterList.xml
 delete mode 100644 settings/ParameterList.xml

diff --git a/data/ParameterList.xml b/data/ParameterList.xml
new file mode 100644
index 0000000..445f4d5
--- /dev/null
+++ b/data/ParameterList.xml
@@ -0,0 +1,227 @@
+<ParameterList version="0.1">
+
+  <!-- Parameters in the top level block -->
+  <Block name="TopLevel">
+
+    
+
+  </Block>
+
+  <!--Parameters related to the navigation block -->
+  <Block name="Navigation">
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Navigation_Filter/NAV_FILT_INIT/"
+      SimulinkParameterName="Value"
+      QGCParamID="NAV_FILT_INIT"
+       />
+  </Block>
+
+  <!--Parameters related to the controller block -->
+  <Block name="Controller">
+    <!-- Aileron Control Parameters -->
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kp/"
+      SimulinkParameterName="Gain"
+      QGCParamID="AIL_KP"
+       />
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/ki/"
+      SimulinkParameterName="Gain"
+      QGCParamID="AIL_KI"
+       />
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kd/"
+      SimulinkParameterName="Gain"
+      QGCParamID="AIL_KD"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/Angle_Norm/Max_Min_Angle/"
+       SimulinkParameterName="Value"
+       QGCParamID="ANG_AIL_MAX"
+       />
+    <!-- Elevator Control Parameters -->
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kp/"
+      SimulinkParameterName="Gain"
+      QGCParamID="ELE_KP"
+       />
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/ki/"
+      SimulinkParameterName="Gain"
+      QGCParamID="ELE_KI"
+       />
+    <Parameter
+      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kd/"
+      SimulinkParameterName="Gain"
+      QGCParamID="ELE_KD"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/Angle_Norm/Max_Min_Angle/"
+       SimulinkParameterName="Value"
+       QGCParamID="ANG_ELE_MAX"
+       />
+  </Block>
+
+  <!-- Paremters for the Pilot Input/Raw RC block -->
+  <Block name="ServoInputs">
+    <!-- Settings for Aileron Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="AIL_LEFT_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="AIL_CENTER_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="AIL_RIGHT_IN"
+       />
+    <!-- Settings for Elevator Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="ELE_DOWN_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="ELE_CENTER_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="ELE_UP_IN"
+       />
+    <!-- Settings for Throttle Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="THR_SET0_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="THR_SET1_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="THR_SET2_IN"
+       />    
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
+       SimulinkParameterName="Setpoint3"
+       QGCParamID="THR_SET3_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
+       SimulinkParameterName="Setpoint4"
+       QGCParamID="THR_SET4_IN"
+       />
+    <!-- Settings for Rudder Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="RUD_LEFT_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="RUD_CENTER_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="RUD_RIGHT_IN"
+       />
+    <!-- Settings for Gyro Mode/Gain Switch -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="GYRO_DEF_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="GYRO_TOG_IN"
+       />    
+    <!-- Settings for Pitch Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="PIT_SET0_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="PIT_SET1_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="PIT_SET2_IN"
+       />    
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
+       SimulinkParameterName="Setpoint3"
+       QGCParamID="PIT_SET3_IN"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
+       SimulinkParameterName="Setpoint4"
+       QGCParamID="PIT_SET4_IN"
+       />
+
+  </Block>
+
+  <!-- Parameters for the servo output block -->
+  <Block name="ServoOutputs">
+
+    <!-- Settings for Aileron Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="AIL_LEFT_OUT"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="AIL_CENTER_OUT"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="AIL_RIGHT_OUT"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronMix/Controller_Mix/"
+       SimulinkParameterName="Value"
+       QGCParamID="MIX_AIL"
+       />
+    <!-- Settings for Elevator Servo -->
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
+       SimulinkParameterName="Setpoint0"
+       QGCParamID="ELE_DOWN_OUT"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
+       SimulinkParameterName="Setpoint1"
+       QGCParamID="ELE_CENTER_OUT"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
+       SimulinkParameterName="Setpoint2"
+       QGCParamID="ELE_UP_OUT"
+       />
+    <Parameter
+       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorMix/Controller_Mix/"
+       SimulinkParameterName="Value"
+       QGCParamID="MIX_ELE"
+       />
+  </Block>
+</ParameterList>
diff --git a/settings/ParameterList.xml b/settings/ParameterList.xml
deleted file mode 100644
index 445f4d5..0000000
--- a/settings/ParameterList.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<ParameterList version="0.1">
-
-  <!-- Parameters in the top level block -->
-  <Block name="TopLevel">
-
-    
-
-  </Block>
-
-  <!--Parameters related to the navigation block -->
-  <Block name="Navigation">
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Navigation_Filter/NAV_FILT_INIT/"
-      SimulinkParameterName="Value"
-      QGCParamID="NAV_FILT_INIT"
-       />
-  </Block>
-
-  <!--Parameters related to the controller block -->
-  <Block name="Controller">
-    <!-- Aileron Control Parameters -->
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kp/"
-      SimulinkParameterName="Gain"
-      QGCParamID="AIL_KP"
-       />
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/ki/"
-      SimulinkParameterName="Gain"
-      QGCParamID="AIL_KI"
-       />
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kd/"
-      SimulinkParameterName="Gain"
-      QGCParamID="AIL_KD"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/Angle_Norm/Max_Min_Angle/"
-       SimulinkParameterName="Value"
-       QGCParamID="ANG_AIL_MAX"
-       />
-    <!-- Elevator Control Parameters -->
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kp/"
-      SimulinkParameterName="Gain"
-      QGCParamID="ELE_KP"
-       />
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/ki/"
-      SimulinkParameterName="Gain"
-      QGCParamID="ELE_KI"
-       />
-    <Parameter
-      SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kd/"
-      SimulinkParameterName="Gain"
-      QGCParamID="ELE_KD"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/Angle_Norm/Max_Min_Angle/"
-       SimulinkParameterName="Value"
-       QGCParamID="ANG_ELE_MAX"
-       />
-  </Block>
-
-  <!-- Paremters for the Pilot Input/Raw RC block -->
-  <Block name="ServoInputs">
-    <!-- Settings for Aileron Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="AIL_LEFT_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="AIL_CENTER_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="AIL_RIGHT_IN"
-       />
-    <!-- Settings for Elevator Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="ELE_DOWN_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="ELE_CENTER_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="ELE_UP_IN"
-       />
-    <!-- Settings for Throttle Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="THR_SET0_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="THR_SET1_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="THR_SET2_IN"
-       />    
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
-       SimulinkParameterName="Setpoint3"
-       QGCParamID="THR_SET3_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
-       SimulinkParameterName="Setpoint4"
-       QGCParamID="THR_SET4_IN"
-       />
-    <!-- Settings for Rudder Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="RUD_LEFT_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="RUD_CENTER_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="RUD_RIGHT_IN"
-       />
-    <!-- Settings for Gyro Mode/Gain Switch -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="GYRO_DEF_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="GYRO_TOG_IN"
-       />    
-    <!-- Settings for Pitch Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="PIT_SET0_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="PIT_SET1_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="PIT_SET2_IN"
-       />    
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
-       SimulinkParameterName="Setpoint3"
-       QGCParamID="PIT_SET3_IN"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
-       SimulinkParameterName="Setpoint4"
-       QGCParamID="PIT_SET4_IN"
-       />
-
-  </Block>
-
-  <!-- Parameters for the servo output block -->
-  <Block name="ServoOutputs">
-
-    <!-- Settings for Aileron Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="AIL_LEFT_OUT"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="AIL_CENTER_OUT"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="AIL_RIGHT_OUT"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronMix/Controller_Mix/"
-       SimulinkParameterName="Value"
-       QGCParamID="MIX_AIL"
-       />
-    <!-- Settings for Elevator Servo -->
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
-       SimulinkParameterName="Setpoint0"
-       QGCParamID="ELE_DOWN_OUT"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
-       SimulinkParameterName="Setpoint1"
-       QGCParamID="ELE_CENTER_OUT"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
-       SimulinkParameterName="Setpoint2"
-       QGCParamID="ELE_UP_OUT"
-       />
-    <Parameter
-       SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorMix/Controller_Mix/"
-       SimulinkParameterName="Value"
-       QGCParamID="MIX_ELE"
-       />
-  </Block>
-</ParameterList>
diff --git a/src/comm/ParameterList.cc b/src/comm/ParameterList.cc
index f41a39c..98bac5a 100644
--- a/src/comm/ParameterList.cc
+++ b/src/comm/ParameterList.cc
@@ -39,7 +39,7 @@ ParameterList::ParameterList()
     QDir settingsDir = QDir(qApp->applicationDirPath());
     if (settingsDir.dirName() == "bin")
         settingsDir.cdUp();
-    settingsDir.cd("settings");
+    settingsDir.cd("data");
 
     // Enforce a list of parameters which are necessary for flight
     reqdServoParams->append("AIL_RIGHT_IN");