From 83403a0ba3977e6d06b30930cafbb3db52228fd4 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Tue, 30 Sep 2014 19:19:47 +0200 Subject: [PATCH] [settings] move settings to module files and remove old files --- conf/modules/AOA_adc.xml | 8 +++++- conf/modules/MPPT.xml | 6 ++++- conf/modules/airspeed_amsys.xml | 9 ++++++- conf/modules/baro_amsys.xml | 8 +++++- conf/modules/deploy_sonar_buoy.xml | 13 ++++++++- conf/modules/digital_cam.xml | 24 ++++++++++++++++- conf/modules/direct_memory_logger.xml | 8 +++++- conf/modules/enose.xml | 8 +++++- conf/modules/formation_flight.xml | 11 +++++++- conf/modules/gas_engine_idle.xml | 7 ++++- conf/modules/gps_ubx_ucenter.xml | 11 +++++++- conf/modules/hackhd.xml | 8 ------ .../high_speed_logger_direct_memory.xml | 6 ++++- conf/modules/imu_quality_assessment.xml | 9 ++++++- conf/modules/infrared_adc.xml | 17 +++++++++++- conf/modules/infrared_i2c.xml | 17 +++++++++++- conf/modules/ins_arduimu_basic.xml | 8 +++++- conf/modules/light.xml | 10 ++++++- conf/modules/meteo_france_DAQ.xml | 9 ++++++- conf/modules/nav_catapult.xml | 10 ++++++- conf/modules/nav_cube.xml | 17 +++++++++++- conf/modules/nav_smooth.xml | 6 ++++- conf/modules/pbn.xml | 6 ++++- conf/modules/photogrammetry_calculator.xml | 21 ++++++++++++++- conf/modules/poles.xml | 8 +++++- conf/modules/rotorcraft_cam.xml | 19 ++++++++++++- conf/modules/servo_switch.xml | 9 ++++++- conf/modules/vehicle_interface_datalink.xml | 9 ++++++- conf/settings/control/nav_catapult.xml | 13 --------- conf/settings/control/nav_cube.xml | 21 --------------- conf/settings/control/snav.xml | 9 ------- conf/settings/estimation/infrared.xml | 20 -------------- conf/settings/modules/AOA_adc.xml | 11 -------- conf/settings/modules/MPPT.xml | 9 ------- conf/settings/modules/airspeed_amsys.xml | 12 --------- conf/settings/modules/baro_amsys.xml | 11 -------- conf/settings/modules/dc.xml | 27 ------------------- conf/settings/modules/deploy_sonar_buoy.xml | 16 ----------- .../settings/modules/direct_memory_logger.xml | 13 --------- conf/settings/modules/enose.xml | 11 -------- conf/settings/modules/formation.xml | 16 ----------- .../settings/modules/gas_engine_idle_trim.xml | 10 ------- conf/settings/modules/gps_ubx_ucenter.xml | 16 ----------- conf/settings/modules/hackhd.xml | 17 ------------ .../high_speed_logger_direct_memory.xml | 11 -------- .../modules/imu_quality_assessment.xml | 12 --------- conf/settings/modules/ins_arduimu_basic.xml | 11 -------- conf/settings/modules/ir_i2c.xml | 20 -------------- conf/settings/modules/light.xml | 13 --------- conf/settings/modules/meteo_france_DAQ.xml | 12 --------- conf/settings/modules/pbn.xml | 9 ------- .../modules/photogrammetry_calculator.xml | 24 ----------------- conf/settings/modules/poles.xml | 11 -------- conf/settings/modules/rotorcraft_cam.xml | 22 --------------- conf/settings/modules/vehicle_interface.xml | 14 ---------- 55 files changed, 267 insertions(+), 426 deletions(-) delete mode 100644 conf/settings/control/nav_catapult.xml delete mode 100644 conf/settings/control/nav_cube.xml delete mode 100644 conf/settings/control/snav.xml delete mode 100644 conf/settings/estimation/infrared.xml delete mode 100644 conf/settings/modules/AOA_adc.xml delete mode 100644 conf/settings/modules/MPPT.xml delete mode 100644 conf/settings/modules/airspeed_amsys.xml delete mode 100644 conf/settings/modules/baro_amsys.xml delete mode 100644 conf/settings/modules/dc.xml delete mode 100644 conf/settings/modules/deploy_sonar_buoy.xml delete mode 100644 conf/settings/modules/direct_memory_logger.xml delete mode 100644 conf/settings/modules/enose.xml delete mode 100644 conf/settings/modules/formation.xml delete mode 100644 conf/settings/modules/gas_engine_idle_trim.xml delete mode 100644 conf/settings/modules/gps_ubx_ucenter.xml delete mode 100644 conf/settings/modules/hackhd.xml delete mode 100644 conf/settings/modules/high_speed_logger_direct_memory.xml delete mode 100644 conf/settings/modules/imu_quality_assessment.xml delete mode 100644 conf/settings/modules/ins_arduimu_basic.xml delete mode 100644 conf/settings/modules/ir_i2c.xml delete mode 100644 conf/settings/modules/light.xml delete mode 100644 conf/settings/modules/meteo_france_DAQ.xml delete mode 100644 conf/settings/modules/pbn.xml delete mode 100644 conf/settings/modules/photogrammetry_calculator.xml delete mode 100644 conf/settings/modules/poles.xml delete mode 100644 conf/settings/modules/rotorcraft_cam.xml delete mode 100644 conf/settings/modules/vehicle_interface.xml diff --git a/conf/modules/AOA_adc.xml b/conf/modules/AOA_adc.xml index d9636342a6..e7f7dad811 100644 --- a/conf/modules/AOA_adc.xml +++ b/conf/modules/AOA_adc.xml @@ -9,7 +9,13 @@ - + + + + + + +
diff --git a/conf/modules/MPPT.xml b/conf/modules/MPPT.xml index c38acd5702..7c8c043f7c 100644 --- a/conf/modules/MPPT.xml +++ b/conf/modules/MPPT.xml @@ -8,7 +8,11 @@ - + + + + +
diff --git a/conf/modules/airspeed_amsys.xml b/conf/modules/airspeed_amsys.xml index f752121326..85cb9cbcb0 100644 --- a/conf/modules/airspeed_amsys.xml +++ b/conf/modules/airspeed_amsys.xml @@ -15,7 +15,14 @@ - + + + + + + + +
diff --git a/conf/modules/baro_amsys.xml b/conf/modules/baro_amsys.xml index a7191ec178..6118f779d3 100644 --- a/conf/modules/baro_amsys.xml +++ b/conf/modules/baro_amsys.xml @@ -13,7 +13,13 @@ - + + + + + + +
diff --git a/conf/modules/deploy_sonar_buoy.xml b/conf/modules/deploy_sonar_buoy.xml index 8ddb3eb1ae..c3fa12f462 100644 --- a/conf/modules/deploy_sonar_buoy.xml +++ b/conf/modules/deploy_sonar_buoy.xml @@ -8,7 +8,18 @@ - + + + + + + + + + + + +
diff --git a/conf/modules/digital_cam.xml b/conf/modules/digital_cam.xml index 4ce9870f22..018525ada0 100644 --- a/conf/modules/digital_cam.xml +++ b/conf/modules/digital_cam.xml @@ -16,7 +16,29 @@ - + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/conf/modules/direct_memory_logger.xml b/conf/modules/direct_memory_logger.xml index d292d95f80..4f59643617 100644 --- a/conf/modules/direct_memory_logger.xml +++ b/conf/modules/direct_memory_logger.xml @@ -10,7 +10,13 @@ - + + + + + + +
diff --git a/conf/modules/enose.xml b/conf/modules/enose.xml index 8f813f09b0..550fab9e35 100644 --- a/conf/modules/enose.xml +++ b/conf/modules/enose.xml @@ -9,7 +9,13 @@
- + + + + + + + diff --git a/conf/modules/formation_flight.xml b/conf/modules/formation_flight.xml index bcac37d142..e59708e110 100644 --- a/conf/modules/formation_flight.xml +++ b/conf/modules/formation_flight.xml @@ -5,7 +5,16 @@ Formation flight control - + + + + + + + + + +
diff --git a/conf/modules/gas_engine_idle.xml b/conf/modules/gas_engine_idle.xml index 656179700a..a656c217f2 100644 --- a/conf/modules/gas_engine_idle.xml +++ b/conf/modules/gas_engine_idle.xml @@ -5,7 +5,12 @@ Gas Engine Idle - + + + + + +
diff --git a/conf/modules/gps_ubx_ucenter.xml b/conf/modules/gps_ubx_ucenter.xml index 4fd7cb8f63..243aa0d745 100644 --- a/conf/modules/gps_ubx_ucenter.xml +++ b/conf/modules/gps_ubx_ucenter.xml @@ -19,7 +19,16 @@ Warning: you still need to tell the driver, which paparazzi port you use. - + + + + + + + + + +
diff --git a/conf/modules/hackhd.xml b/conf/modules/hackhd.xml index 59d08c4af2..ca80101150 100644 --- a/conf/modules/hackhd.xml +++ b/conf/modules/hackhd.xml @@ -6,7 +6,6 @@ - @@ -22,13 +21,6 @@ - - - - - - -
diff --git a/conf/modules/high_speed_logger_direct_memory.xml b/conf/modules/high_speed_logger_direct_memory.xml index 2b7bce548d..6cc431e689 100644 --- a/conf/modules/high_speed_logger_direct_memory.xml +++ b/conf/modules/high_speed_logger_direct_memory.xml @@ -26,7 +26,11 @@ For more informations on how to use this module you can refer to the wiki : http - + + + + +
diff --git a/conf/modules/imu_quality_assessment.xml b/conf/modules/imu_quality_assessment.xml index e4d50f04ca..ea7bf3ab38 100644 --- a/conf/modules/imu_quality_assessment.xml +++ b/conf/modules/imu_quality_assessment.xml @@ -10,7 +10,14 @@ - + + + + + + + +
diff --git a/conf/modules/infrared_adc.xml b/conf/modules/infrared_adc.xml index eeffdab98e..1149cc8193 100644 --- a/conf/modules/infrared_adc.xml +++ b/conf/modules/infrared_adc.xml @@ -9,7 +9,22 @@ - + + + + + + + + + + + + + + + +
diff --git a/conf/modules/infrared_i2c.xml b/conf/modules/infrared_i2c.xml index 3d922b839f..eccda07ba6 100644 --- a/conf/modules/infrared_i2c.xml +++ b/conf/modules/infrared_i2c.xml @@ -6,7 +6,22 @@ I2C Infrared sensor - + + + + + + + + + + + + + + + +
diff --git a/conf/modules/ins_arduimu_basic.xml b/conf/modules/ins_arduimu_basic.xml index 48967880fc..fc199a5fa3 100644 --- a/conf/modules/ins_arduimu_basic.xml +++ b/conf/modules/ins_arduimu_basic.xml @@ -7,7 +7,13 @@ - + + + + + + +
diff --git a/conf/modules/light.xml b/conf/modules/light.xml index 9fef3d9c3b..50efcca634 100644 --- a/conf/modules/light.xml +++ b/conf/modules/light.xml @@ -11,7 +11,15 @@ - + + + + + + + + +
diff --git a/conf/modules/meteo_france_DAQ.xml b/conf/modules/meteo_france_DAQ.xml index 8e592af938..1b2e838ed7 100644 --- a/conf/modules/meteo_france_DAQ.xml +++ b/conf/modules/meteo_france_DAQ.xml @@ -5,7 +5,14 @@ Data acquisition board used by Meteo France - + + + + + + + +
diff --git a/conf/modules/nav_catapult.xml b/conf/modules/nav_catapult.xml index 7fb0b404f7..aeff1273ca 100644 --- a/conf/modules/nav_catapult.xml +++ b/conf/modules/nav_catapult.xml @@ -19,7 +19,15 @@ - + + + + + + + + +
diff --git a/conf/modules/nav_cube.xml b/conf/modules/nav_cube.xml index 913f97a362..a4a2dd2212 100644 --- a/conf/modules/nav_cube.xml +++ b/conf/modules/nav_cube.xml @@ -7,7 +7,22 @@ - + + + + + + + + + + + + + + + +
diff --git a/conf/modules/nav_smooth.xml b/conf/modules/nav_smooth.xml index 9aa553f38b..e36e963d2e 100644 --- a/conf/modules/nav_smooth.xml +++ b/conf/modules/nav_smooth.xml @@ -7,7 +7,11 @@ - + + + + +
diff --git a/conf/modules/pbn.xml b/conf/modules/pbn.xml index b93021a60b..60c038e401 100644 --- a/conf/modules/pbn.xml +++ b/conf/modules/pbn.xml @@ -13,7 +13,11 @@ - + + + + +
diff --git a/conf/modules/photogrammetry_calculator.xml b/conf/modules/photogrammetry_calculator.xml index 46cb9db3eb..8d785c4617 100644 --- a/conf/modules/photogrammetry_calculator.xml +++ b/conf/modules/photogrammetry_calculator.xml @@ -5,7 +5,26 @@ Photogrammetry navigation functions - + + + + + + + + + + + + + + + + + + + +
diff --git a/conf/modules/poles.xml b/conf/modules/poles.xml index 62dc4e8b05..f599d055e3 100644 --- a/conf/modules/poles.xml +++ b/conf/modules/poles.xml @@ -5,7 +5,13 @@ Navigate around two poles - + + + + + + +
diff --git a/conf/modules/rotorcraft_cam.xml b/conf/modules/rotorcraft_cam.xml index af0ffb874e..84b1f8fc45 100644 --- a/conf/modules/rotorcraft_cam.xml +++ b/conf/modules/rotorcraft_cam.xml @@ -32,7 +32,24 @@ On boards with CAM_SWITCH, ROTORCRAFT_CAM_SWITCH_GPIO can be defined to CAM_SWIT - + + + + + + + + + + + + + + + + + +
diff --git a/conf/modules/servo_switch.xml b/conf/modules/servo_switch.xml index e38d56c02f..ed30a4dff6 100644 --- a/conf/modules/servo_switch.xml +++ b/conf/modules/servo_switch.xml @@ -8,7 +8,14 @@ - + + + + + + + +
diff --git a/conf/modules/vehicle_interface_datalink.xml b/conf/modules/vehicle_interface_datalink.xml index 9ad79cb5af..c9a11ce607 100644 --- a/conf/modules/vehicle_interface_datalink.xml +++ b/conf/modules/vehicle_interface_datalink.xml @@ -5,7 +5,14 @@ Vehicule Interface over Datalink - + + + + + + + +
diff --git a/conf/settings/control/nav_catapult.xml b/conf/settings/control/nav_catapult.xml deleted file mode 100644 index 82d9eae0f2..0000000000 --- a/conf/settings/control/nav_catapult.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/conf/settings/control/nav_cube.xml b/conf/settings/control/nav_cube.xml deleted file mode 100644 index 1836d9073c..0000000000 --- a/conf/settings/control/nav_cube.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/settings/control/snav.xml b/conf/settings/control/snav.xml deleted file mode 100644 index 6e0a545916..0000000000 --- a/conf/settings/control/snav.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/conf/settings/estimation/infrared.xml b/conf/settings/estimation/infrared.xml deleted file mode 100644 index 629ea2419d..0000000000 --- a/conf/settings/estimation/infrared.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/AOA_adc.xml b/conf/settings/modules/AOA_adc.xml deleted file mode 100644 index dd0b643777..0000000000 --- a/conf/settings/modules/AOA_adc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/conf/settings/modules/MPPT.xml b/conf/settings/modules/MPPT.xml deleted file mode 100644 index 9fe2ec66f8..0000000000 --- a/conf/settings/modules/MPPT.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/conf/settings/modules/airspeed_amsys.xml b/conf/settings/modules/airspeed_amsys.xml deleted file mode 100644 index 0d4f1a66e1..0000000000 --- a/conf/settings/modules/airspeed_amsys.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/conf/settings/modules/baro_amsys.xml b/conf/settings/modules/baro_amsys.xml deleted file mode 100644 index 9c738a05d4..0000000000 --- a/conf/settings/modules/baro_amsys.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/conf/settings/modules/dc.xml b/conf/settings/modules/dc.xml deleted file mode 100644 index a32aa51664..0000000000 --- a/conf/settings/modules/dc.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/deploy_sonar_buoy.xml b/conf/settings/modules/deploy_sonar_buoy.xml deleted file mode 100644 index 76c307b640..0000000000 --- a/conf/settings/modules/deploy_sonar_buoy.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/direct_memory_logger.xml b/conf/settings/modules/direct_memory_logger.xml deleted file mode 100644 index ae9140aa0f..0000000000 --- a/conf/settings/modules/direct_memory_logger.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/conf/settings/modules/enose.xml b/conf/settings/modules/enose.xml deleted file mode 100644 index b4abd356a8..0000000000 --- a/conf/settings/modules/enose.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/conf/settings/modules/formation.xml b/conf/settings/modules/formation.xml deleted file mode 100644 index 7c2a4847f6..0000000000 --- a/conf/settings/modules/formation.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/gas_engine_idle_trim.xml b/conf/settings/modules/gas_engine_idle_trim.xml deleted file mode 100644 index 88a31503b4..0000000000 --- a/conf/settings/modules/gas_engine_idle_trim.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/conf/settings/modules/gps_ubx_ucenter.xml b/conf/settings/modules/gps_ubx_ucenter.xml deleted file mode 100644 index fccb43bab0..0000000000 --- a/conf/settings/modules/gps_ubx_ucenter.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/hackhd.xml b/conf/settings/modules/hackhd.xml deleted file mode 100644 index 10ac672159..0000000000 --- a/conf/settings/modules/hackhd.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/high_speed_logger_direct_memory.xml b/conf/settings/modules/high_speed_logger_direct_memory.xml deleted file mode 100644 index 6c923d2e43..0000000000 --- a/conf/settings/modules/high_speed_logger_direct_memory.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/conf/settings/modules/imu_quality_assessment.xml b/conf/settings/modules/imu_quality_assessment.xml deleted file mode 100644 index 3b15def65f..0000000000 --- a/conf/settings/modules/imu_quality_assessment.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/conf/settings/modules/ins_arduimu_basic.xml b/conf/settings/modules/ins_arduimu_basic.xml deleted file mode 100644 index 6389e0c1b1..0000000000 --- a/conf/settings/modules/ins_arduimu_basic.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/conf/settings/modules/ir_i2c.xml b/conf/settings/modules/ir_i2c.xml deleted file mode 100644 index a099750c7f..0000000000 --- a/conf/settings/modules/ir_i2c.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/light.xml b/conf/settings/modules/light.xml deleted file mode 100644 index 1a480d8122..0000000000 --- a/conf/settings/modules/light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/conf/settings/modules/meteo_france_DAQ.xml b/conf/settings/modules/meteo_france_DAQ.xml deleted file mode 100644 index 479ab8b3bd..0000000000 --- a/conf/settings/modules/meteo_france_DAQ.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/conf/settings/modules/pbn.xml b/conf/settings/modules/pbn.xml deleted file mode 100644 index 4feb83118d..0000000000 --- a/conf/settings/modules/pbn.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/conf/settings/modules/photogrammetry_calculator.xml b/conf/settings/modules/photogrammetry_calculator.xml deleted file mode 100644 index 082c975451..0000000000 --- a/conf/settings/modules/photogrammetry_calculator.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/poles.xml b/conf/settings/modules/poles.xml deleted file mode 100644 index 56751801b3..0000000000 --- a/conf/settings/modules/poles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/conf/settings/modules/rotorcraft_cam.xml b/conf/settings/modules/rotorcraft_cam.xml deleted file mode 100644 index 17ae9b50b4..0000000000 --- a/conf/settings/modules/rotorcraft_cam.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/settings/modules/vehicle_interface.xml b/conf/settings/modules/vehicle_interface.xml deleted file mode 100644 index 606d83c72b..0000000000 --- a/conf/settings/modules/vehicle_interface.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - -