[settings] fix example conf

conf/conf_example.xml

@@ -36,7 +36,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
-   settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
+   settings="settings/fixedwing_basic.xml"
    gui_color="red"
   />
   <aircraft
@@ -76,7 +76,7 @@
    radio="radios/cockpitMM.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
-   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
+   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
    gui_color="#6293ba"
   />
   <aircraft
@@ -126,7 +126,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml settings/modules/servo_switch.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml"
    gui_color="white"
   />
   <aircraft
@@ -136,7 +136,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/modules/direct_memory_logger.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
    gui_color="#710080"
   />
   <aircraft
@@ -146,7 +146,7 @@
    radio="radios/cockpitMM.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/versatile.xml"
-   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
+   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
    gui_color="#ba6293"
   />
   <aircraft

conf/conf_tests.xml

@@ -26,7 +26,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"
-   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/modules/photogrammetry_calculator.xml settings/modules/dc.xml"
+   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
    gui_color="blue"
   />
   <aircraft
@@ -46,7 +46,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
-   settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
+   settings="settings/fixedwing_basic.xml"
    gui_color="red"
   />
   <aircraft
@@ -126,7 +126,7 @@
    radio="radios/cockpitMM.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
-   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
+   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
    gui_color="#6293ba"
   />
   <aircraft
@@ -196,7 +196,7 @@
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml settings/modules/servo_switch.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml"
    gui_color="white"
   />
   <aircraft
@@ -216,7 +216,7 @@
    radio="radios/cockpitMM.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/versatile.xml"
-   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
+   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
    gui_color="#ba6293"
   />
   <aircraft
@@ -256,7 +256,7 @@
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"
-   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml settings/control/tune_agr_climb.xml settings/modules/dc.xml"
+   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml settings/control/tune_agr_climb.xml"
    gui_color="blue"
   />
   <aircraft

conf/modules/cam_point.xml

@@ -4,6 +4,42 @@
   <doc>
     <description>Camera control for fixedwing</description>
   </doc>
+  <settings name="complete">
+    <dl_settings NAME="control">
+      <dl_settings name="cam">
+        <dl_setting MAX="7" MIN="0" STEP="1" module="cam_control/cam" VAR="cam_mode" values="0FF|ANGLES|NADIR|XY_TARGET|WP_TARGET|AC_TARGET|STABILIZED|RC">
+          <strip_button name="AC_TARGET" value="5"/>
+          <strip_button name="WP_TARGET" value="4"/>
+          <strip_button name="XY_TARGET" value="3"/>
+          <strip_button name="NADIR" value="2"/>
+          <strip_button name="ANGLES" value="1"/>
+          <strip_button name="OFF" value="0"/>
+        </dl_setting>
+      </dl_settings>
+      <dl_settings name="angles">
+        <dl_setting MAX="30" MIN="-30" STEP="1" module="cam_control/cam" VAR="cam_tilt_c" unit="rad" alt_unit="deg"/>
+        <dl_setting MAX="30" MIN="-30" STEP="1" module="cam_control/cam" VAR="cam_pan_c" unit="rad" alt_unit="deg"/>
+      </dl_settings>
+      <dl_settings name="target">
+        <dl_setting min="1" max="27" step="1" module="cam_control/cam" var="cam_target_wp" shortname="wp"/>
+      </dl_settings>
+    </dl_settings>
+  </settings>
+  <settings name="pitch_only">
+    <dl_settings NAME="control">
+      <dl_settings name="cam">
+        <dl_setting MAX="1" MIN="0" STEP="1" module="cam_control/cam" VAR="cam_mode">
+          <strip_button name="ANGLES" value="1"/>
+        </dl_setting>
+      </dl_settings>
+      <dl_settings name="angles">
+        <dl_setting MAX="30" MIN="-30" STEP="1" module="cam_control/cam" VAR="cam_tilt_c" unit="rad" alt_unit="deg">
+          <strip_button name="Look Foreward" icon="lookfore.png" value="-0.5"/>
+          <strip_button name="Look Down" icon="lookdown.png" value="0.5"/>
+        </dl_setting>
+      </dl_settings>
+    </dl_settings>
+  </settings>
   <header>
     <file name="cam.h"/>
     <file name="point.h"/>

conf/modules/cam_roll.xml

@@ -4,6 +4,16 @@
   <doc>
     <description>Camera control on roll axis only</description>
   </doc>
+  <settings>
+    <dl_settings>
+      <dl_settings NAME="Cam">
+        <dl_setting MAX="45" MIN="-45" STEP="1" VAR="cam_roll_phi" module="cam_control/cam_roll" shortname="phi" unit="rad" alt_unit="deg" auto="true">
+        </dl_setting>
+        <dl_setting MAX="1" MIN="0" STEP="1" VAR="cam_roll_mode" module="cam_control/cam_roll" shortname="manual - stablzd">
+        </dl_setting>
+      </dl_settings>
+    </dl_settings>
+  </settings>
   <header>
     <file name="cam.h"/>
   </header>