[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] ef43e7: [nps] Started to add f
|
From: |
GitHub |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] ef43e7: [nps] Started to add fixed wing support in NPS |
|
Date: |
Thu, 05 Sep 2013 07:08:13 -0700 |
Branch: refs/heads/master
Home: https://github.com/paparazzi/paparazzi
Commit: ef43e75b2a2f948fd6c3902600817cc9fe831918
https://github.com/paparazzi/paparazzi/commit/ef43e75b2a2f948fd6c3902600817cc9fe831918
Author: Stephen Dwyer <address@hidden>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M conf/airframes/examples/MentorEnergy.xml
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
A sw/simulator/nps/nps_autopilot_fixedwing.c
A sw/simulator/nps/nps_autopilot_fixedwing.h
Log Message:
-----------
[nps] Started to add fixed wing support in NPS
Commit: e160b739388c44d1c83ee18b7c233cd01259d6ad
https://github.com/paparazzi/paparazzi/commit/e160b739388c44d1c83ee18b7c233cd01259d6ad
Author: Stephen Dwyer <address@hidden>
Date: 2013-07-13 (Sat, 13 Jul 2013)
Changed paths:
A conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/simulator/nps/nps_autopilot_fixedwing.c
Log Message:
-----------
[nps] A few more NPS for FW updates
* tweaked FBW for USE_NPS, not SITL
* Better support for AP or FBW or both
* added start of a subsystem makefile
Commit: 48b40265b5d42f27d8bfec73becc196cb49972ef
https://github.com/paparazzi/paparazzi/commit/48b40265b5d42f27d8bfec73becc196cb49972ef
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
Log Message:
-----------
[fixedwing] energy_ctrl: don't keywords reserved in c++
Commit: 97d81cf4371ea7f395352a0258557b6e50fafb45
https://github.com/paparazzi/paparazzi/commit/97d81cf4371ea7f395352a0258557b6e50fafb45
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M conf/modules/light.xml
Log Message:
-----------
[modules] light only for ap
Commit: 0f4935b320ba7776a105c5608e753deec288944a
https://github.com/paparazzi/paparazzi/commit/0f4935b320ba7776a105c5608e753deec288944a
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M sw/airborne/modules/sensors/airspeed_adc.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
Log Message:
-----------
[modules] only use sim_air_speed if not using NPS
for now...
Commit: 3166221fdf02e0798295163edf730ef704fc4365
https://github.com/paparazzi/paparazzi/commit/3166221fdf02e0798295163edf730ef704fc4365
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/gps_mediatek_diy.makefile
M conf/firmwares/subsystems/fixedwing/gps_nmea.makefile
M conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
Log Message:
-----------
[fixedwing] gps for nps sim
Commit: eddc778d664d868fe3b44c87cb919fe9e7a5c969
https://github.com/paparazzi/paparazzi/commit/eddc778d664d868fe3b44c87cb919fe9e7a5c969
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
Log Message:
-----------
[fixedwing] cleanup autopilot makefile a bit
Commit: 62cf74fc594eef4b7a4bc1e8f7a021ef8004735f
https://github.com/paparazzi/paparazzi/commit/62cf74fc594eef4b7a4bc1e8f7a021ef8004735f
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/fixedwing/ins_alt_float.makefile
M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
Log Message:
-----------
[fixedwing] ahrs and ins subsystems for nps target
Commit: 08863c4a88e5ce633706850edd56efdcd963b1e0
https://github.com/paparazzi/paparazzi/commit/08863c4a88e5ce633706850edd56efdcd963b1e0
Author: Felix Ruess <address@hidden>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/simulator/nps/nps_autopilot_fixedwing.c
A sw/simulator/nps/nps_ivy_fixedwing.c
Log Message:
-----------
[nps][fixedwing] updates for fixedwing support in NPS
Commit: 083d0fd3409efe92661c7506085b9da115c4a575
https://github.com/paparazzi/paparazzi/commit/083d0fd3409efe92661c7506085b9da115c4a575
Author: Felix Ruess <address@hidden>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M sw/simulator/nps/nps_autopilot_fixedwing.c
M sw/simulator/nps/nps_fdm_jsbsim.c
Log Message:
-----------
[nps] minor cleanup
Commit: d1ceba79ea1eba046312f9eb34b2a313272757ef
https://github.com/paparazzi/paparazzi/commit/d1ceba79ea1eba046312f9eb34b2a313272757ef
Author: Stephen Dwyer <address@hidden>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M sw/simulator/nps/nps_fdm.h
M sw/simulator/nps/nps_fdm_jsbsim.c
Log Message:
-----------
[nps] Detect nans and exit in JSBSim FDM
Commit: 9d52cfa9211743da2cdb2c1a8c9b82cea5aff2ab
https://github.com/paparazzi/paparazzi/commit/9d52cfa9211743da2cdb2c1a8c9b82cea5aff2ab
Author: Felix Ruess <address@hidden>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M sw/simulator/nps/nps_fdm_jsbsim.c
Log Message:
-----------
[nps] only declare isnan on osx
Commit: 6acdf25b96be7fd443f3300a4b330be0a32034ab
https://github.com/paparazzi/paparazzi/commit/6acdf25b96be7fd443f3300a4b330be0a32034ab
Author: Stephen Dwyer <address@hidden>
Date: 2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
A conf/simulator/jsbsim/aircraft/Engines/18x8.xml
A conf/simulator/jsbsim/aircraft/Engines/Zenoah_G-26A.xml
A conf/simulator/jsbsim/aircraft/LisaAspirin2.xml
Log Message:
-----------
[conf][nps] Temporary addition of fw jsbsim models
Commit: d2e02960043930d156c07299d0dee8b5f0cc31c2
https://github.com/paparazzi/paparazzi/commit/d2e02960043930d156c07299d0dee8b5f0cc31c2
Author: Felix Ruess <address@hidden>
Date: 2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
M conf/airframes/ENAC/fixed-wing/apogee.xml
M conf/airframes/ENAC/fixed-wing/eternity1.xml
M conf/airframes/ENAC/fixed-wing/firestorm.xml
M conf/airframes/ENAC/fixed-wing/funjet2.xml
M conf/airframes/ENAC/fixed-wing/mythe.xml
A conf/airframes/ENAC/fixed-wing/quark1.xml
M conf/airframes/ENAC/fixed-wing/weasel.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/ENAC/quadrotor/hen1.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/ardrone2_sdk.xml
M conf/airframes/booz2_flixr.xml
M conf/airframes/booz2_ppzuav.xml
M conf/airframes/esden/cocto_lm2a2.xml
M conf/airframes/esden/gain_scheduling_example.xml
M conf/airframes/esden/hexy_ll11a2pwm.xml
M conf/airframes/esden/hexy_lm2a2pwm.xml
M conf/airframes/esden/lisa2_hex.xml
M conf/airframes/esden/qs_asp22.xml
M conf/airframes/esden/quady_ll11a2pwm.xml
M conf/airframes/esden/quady_lm1a1pwm.xml
M conf/airframes/esden/quady_lm2a2pwm.xml
M conf/airframes/esden/quady_lm2a2pwmppm.xml
M conf/airframes/examples/MentorEnergy.xml
M conf/airframes/examples/Twinstar_energyadaptive.xml
M conf/airframes/examples/booz2.xml
M conf/airframes/examples/h_hex.xml
A conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
A conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_navgo.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
A conf/airframes/examples/stm32f4_discovery_test.xml
M conf/airframes/flixr_discovery.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M conf/airframes/obsolete/ENAC/mkk1.xml
M conf/airframes/obsolete/ENAC/nova1.xml
M conf/airframes/obsolete/Poine/booz2_a1.xml
M conf/airframes/obsolete/Poine/booz2_a7.xml
M conf/airframes/obsolete/Poine/h_hex.xml
M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
M conf/airframes/obsolete/example_heli_lisam.xml
M conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
M conf/airframes/obsolete/mm/rotor/qmk1.xml
A conf/boards/apogee_1.0.makefile
A conf/boards/stm32f4_discovery.makefile
M conf/conf.xml.example
M conf/firmwares/rotorcraft.makefile
M conf/firmwares/subsystems/fixedwing/spi_slave_hs.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
A conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
A conf/firmwares/subsystems/shared/imu_gl1.makefile
A conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
A conf/firmwares/subsystems/shared/radio_control_sbus.makefile
M conf/joystick/ms_sidewinder.xml
A conf/joystick/xbox_gamepad.xml
M conf/maps.xml.example
M conf/modules/airspeed_amsys.xml
M conf/modules/airspeed_ets.xml
M conf/modules/baro_amsys.xml
M conf/modules/baro_ets.xml
A conf/modules/osd_max7456.xml
A conf/radios/T10CG_SBUS.xml
A conf/settings/control/stabilization_att_float_quat.xml
A conf/system/preferences.d/paparazzi-uav-ppa
M data/maps/Makefile
A data/pictures/Penguin.gif
M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
M sw/airborne/arch/lpc21/subsystems/actuators/servos_ppm_hw.h
R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c
R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h
M sw/airborne/arch/stm32/mcu_arch.c
M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.h
M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
M sw/airborne/arch/stm32/subsystems/settings_arch.c
M sw/airborne/boards/apogee_0.99.h
A sw/airborne/boards/apogee_1.0.h
M sw/airborne/boards/ardrone/at_com.h
A sw/airborne/boards/ardrone/electrical_raw.c
A sw/airborne/boards/ardrone/electrical_raw.h
A sw/airborne/boards/krooz/baro_board.c
A sw/airborne/boards/krooz/baro_board.h
A sw/airborne/boards/krooz/imu_krooz.c
A sw/airborne/boards/krooz/imu_krooz.h
M sw/airborne/boards/krooz_sd.h
A sw/airborne/boards/stm32f4_discovery.h
M sw/airborne/boards/umarim/imu_umarim.c
M sw/airborne/firmwares/fixedwing/datalink.c
M sw/airborne/firmwares/fixedwing/fbw_downlink.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
M sw/airborne/firmwares/rotorcraft/main.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
A
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
R
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
M sw/airborne/led.h
M sw/airborne/lisa/tunnel_hw.c
M sw/airborne/math/pprz_geodetic_int.c
M sw/airborne/mcu.c
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/mcu_periph/spi.h
M sw/airborne/mcu_periph/uart.h
M sw/airborne/modules/digital_cam/led_cam_ctrl.c
M sw/airborne/modules/digital_cam/led_cam_ctrl.h
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
A sw/airborne/modules/max7456/max7456.c
A sw/airborne/modules/max7456/max7456.h
A sw/airborne/modules/max7456/max7456_regs.h
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/modules/sensors/baro_ets.c
M sw/airborne/modules/sensors/baro_ets.h
M sw/airborne/modules/sensors/baro_ms5611_i2c.c
M sw/airborne/modules/sensors/baro_ms5611_i2c.h
M sw/airborne/peripherals/l3g4200.c
M sw/airborne/peripherals/l3g4200.h
M sw/airborne/peripherals/l3g4200_regs.h
M sw/airborne/peripherals/mpu60x0_i2c.c
R sw/airborne/sd_card/main.c
R sw/airborne/sd_card/sd_card.c
R sw/airborne/sd_card/sd_card.h
M sw/airborne/subsystems/actuators/motor_mixing.c
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
M sw/airborne/subsystems/datalink/pprz_transport.h
M sw/airborne/subsystems/electrical.c
M sw/airborne/subsystems/gps/gps_ardrone2.c
M sw/airborne/subsystems/gps/gps_ardrone2.h
R sw/airborne/subsystems/imu/imu_aspirin2.c
R sw/airborne/subsystems/imu/imu_aspirin2.h
M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
A sw/airborne/subsystems/imu/imu_gl1.c
A sw/airborne/subsystems/imu/imu_gl1.h
A sw/airborne/subsystems/imu/imu_gl1_defaults.h
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/ins/ins_alt_float.h
M sw/airborne/subsystems/ins/ins_int_extended.c
A sw/airborne/subsystems/radio_control/sbus.c
A sw/airborne/subsystems/radio_control/sbus.h
A sw/extras/chdk/pictuav.lua
M sw/ground_segment/joystick/input2ivy.ml
M sw/ground_segment/joystick/ml_sdl_stick.c
M sw/ground_segment/joystick/sdl_stick.c
M sw/ground_segment/joystick/sdl_stick.h
M sw/simulator/nps/nps_autopilot_rotorcraft.c
M sw/simulator/nps/nps_ivy.c
M sw/tools/dfu/stm32_mem.py
A sw/tools/process_exif/README
A sw/tools/process_exif/process_exif.py
Log Message:
-----------
Merge branch 'master' into nps_fixedwing
in order to get nps datalink fixes
* master: (92 commits)
[rotorcraft] call ahrs_update_gps
[boards] stm32f4_discovery board file for some testing
[lpc21] only indentation cleanup
[rotorcraft] PRINT_CONFIG_VAR for GUIDANCE_V_NOMINAL_HOVER_THROTTLE
[conf] updates for fraser quad with spektrum
[conf] stm32f4 discovery test board files
[rotorcraft][stabilization_ref_quat] saturate rate and trim accel
[rotorcraft] CAUTION! stabilization int_quat ref model scaling fixes
[rotorcraft][stabilization] move some macros
[rotorcraft] AHRS_FLOAT flag for float_cmpl_quat
[rotorcraft] ins_int_extended without sonar
[lisa] comments for the tunnel
[conf] configurable spi for aspirin_2
[boards] correct include guard for apogee 1.0
[fix][lpc21] workaround for init of spi_slave_hs
[modules] silence some warnings in imu_chimu
[lpc21][uart] fix some unused arg warnings
20s timeout and max 2 retries when trying to update_google_version
[imu] aspirin_2_spi: default AHRS_PROPAGATE_FREQUENCY is 512
[rotorcraft] only reset psi and integrators if previous mode was not attitude
...
resolved conflicts:
sw/airborne/modules/sensors/airspeed_amsys.c
Commit: 1827ed12a9aea72dedba2b0c043befb424882e62
https://github.com/paparazzi/paparazzi/commit/1827ed12a9aea72dedba2b0c043befb424882e62
Author: Felix Ruess <address@hidden>
Date: 2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
M conf/airframes/examples/MentorEnergy.xml
M conf/firmwares/subsystems/fixedwing/gps_mediatek_diy.makefile
M conf/firmwares/subsystems/fixedwing/gps_nmea.makefile
M conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
M sw/airborne/subsystems/gps/gps_sim_nps.c
Log Message:
-----------
[nps][gps] calc utm, ned_vel, gspeed, course
Commit: 29bdf40d9a87381e3d5b39b8aa4a53ea7f043e59
https://github.com/paparazzi/paparazzi/commit/29bdf40d9a87381e3d5b39b8aa4a53ea7f043e59
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M sw/simulator/nps/nps_autopilot_fixedwing.c
R sw/simulator/nps/nps_ivy.c
M sw/simulator/nps/nps_ivy.h
A sw/simulator/nps/nps_ivy_common.c
M sw/simulator/nps/nps_ivy_fixedwing.c
A sw/simulator/nps/nps_ivy_rotorcraft.c
Log Message:
-----------
[nps] datalink via ivy handling
Commit: bfcbb9e15eae59952a74e49c13d5356336b50745
https://github.com/paparazzi/paparazzi/commit/bfcbb9e15eae59952a74e49c13d5356336b50745
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
M conf/firmwares/subsystems/shared/imu_nps.makefile
Log Message:
-----------
[nps][conf] add needed sources/flags for imu/ahrs in fw nps
Commit: 19afae8cee924c5cb079ae0948f599fef2b91d08
https://github.com/paparazzi/paparazzi/commit/19afae8cee924c5cb079ae0948f599fef2b91d08
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M sw/simulator/nps/nps_fdm_jsbsim.c
Log Message:
-----------
[nps] configurable jsbsim model and initial conditions from flight plan
If NPS_JSBSIM_MODEL is not defined, it defaults to the AIRCRAFT_NAME (previous
behavior).
If NPS_JSBSIM_INIT is defined, that ic file is used, otherwise uses flight plan
location.
NPS_INITIAL_CONDITITONS is not used anymore.
Commit: 2c8e58d879c2c8f851eb7dfdaa7e18fdc5e29156
https://github.com/paparazzi/paparazzi/commit/2c8e58d879c2c8f851eb7dfdaa7e18fdc5e29156
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/NoVa_L.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/booz2_flixr.xml
M conf/airframes/esden/cocto_lm2a2.xml
M conf/airframes/esden/gain_scheduling_example.xml
M conf/airframes/esden/hexy_ll11a2pwm.xml
M conf/airframes/esden/hexy_lm2a2pwm.xml
M conf/airframes/esden/lisa2_hex.xml
M conf/airframes/esden/qs_asp22.xml
M conf/airframes/esden/quady_ll11a2pwm.xml
M conf/airframes/esden/quady_lm1a1pwm.xml
M conf/airframes/esden/quady_lm2a2pwm.xml
M conf/airframes/esden/quady_lm2a2pwmppm.xml
M conf/airframes/examples/MentorEnergy.xml
M conf/airframes/examples/booz2.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_navgo.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M conf/airframes/obsolete/ENAC/g1_vision.xml
M conf/airframes/obsolete/Poine/booz2_a1.xml
M conf/airframes/obsolete/Poine/booz2_a7.xml
M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
M conf/airframes/obsolete/booz2_a1p.xml
M conf/airframes/obsolete/booz2_s1.xml
M conf/airframes/obsolete/example_heli_lisam.xml
M conf/airframes/obsolete/mm/rotor/qmk1.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
Log Message:
-----------
[conf][nps] replace INITIAL_CONDITITONS with JSBSIM_INIT in all airframes
Commit: 0959c0428ffa1e07469cd308e2a394eeedbe5de2
https://github.com/paparazzi/paparazzi/commit/0959c0428ffa1e07469cd308e2a394eeedbe5de2
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M conf/flight_plans/versatile.xml
M conf/flight_plans/versatile_airspeed.xml
Log Message:
-----------
[conf] ground alt for versatile flight plans
Commit: 7f73f615fda4c355ace0ae03e3f2cba2d26be210
https://github.com/paparazzi/paparazzi/commit/7f73f615fda4c355ace0ae03e3f2cba2d26be210
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M sw/simulator/nps/nps_autopilot_fixedwing.c
M sw/simulator/nps/nps_autopilot_rotorcraft.c
Log Message:
-----------
[nps] set ahrs in float
Commit: cf574d8a2ac0b812bf970db1217801422727108c
https://github.com/paparazzi/paparazzi/commit/cf574d8a2ac0b812bf970db1217801422727108c
Author: Felix Ruess <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_ap.c
Log Message:
-----------
[fixedwing][nps] fix for ahrs and bypass
Commit: f2815056fd58d9e0f9f3177a1033d96a25c2fdfe
https://github.com/paparazzi/paparazzi/commit/f2815056fd58d9e0f9f3177a1033d96a25c2fdfe
Author: Stephen Dwyer <address@hidden>
Date: 2013-08-19 (Mon, 19 Aug 2013)
Changed paths:
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M sw/simulator/nps/nps_radio_control_joystick.c
Log Message:
-----------
[nps] Made joystick buttons/axes configurable
Commit: 077ea342080b21a96b6620fb81f3d6902f4420a8
https://github.com/paparazzi/paparazzi/commit/077ea342080b21a96b6620fb81f3d6902f4420a8
Author: Felix Ruess <address@hidden>
Date: 2013-09-04 (Wed, 04 Sep 2013)
Changed paths:
M Makefile
M conf/Makefile.omap
A conf/airframes/CDW/asctec_cdw.xml
A conf/airframes/CDW/conf.xml
A conf/airframes/CDW/tricopter_cdw.xml
A conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
A conf/airframes/TUDelft/IMAV2013/conf.xml
A conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
A conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
A conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
A conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/ardrone2_sdk.xml
A conf/airframes/esden/calib/ls01-default.xml
A conf/airframes/esden/quady_ls01pwm.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
A conf/airframes/examples/quadrotor_lisa_s.xml
M conf/airframes/examples/quadrotor_mlkf.xml
A conf/airframes/examples/quadrotor_px4fmu.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
M conf/airframes/examples/stm32f4_discovery_test.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M conf/airframes/obsolete/Poine/test_libeknav.xml
M conf/boards/ardrone2_raw.makefile
A conf/boards/lisa_s_0.1.makefile
A conf/boards/px4fmu_1.7.makefile
M conf/conf.xml.example
M conf/firmwares/lisa_test_progs.makefile
M conf/firmwares/rotorcraft.makefile
A conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
R conf/firmwares/subsystems/fixedwing/joystick.makefile
A conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile
M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
R conf/firmwares/subsystems/rotorcraft/ahrs_extern_quat.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
A conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
R conf/firmwares/subsystems/rotorcraft/ahrs_lkf.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M conf/firmwares/subsystems/rotorcraft/ins.makefile
M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
A conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile
R conf/firmwares/subsystems/shared/ahrs_gx3.makefile
M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
A conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
A conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
M conf/firmwares/subsystems/shared/radio_control_datalink.makefile
A conf/firmwares/subsystems/shared/radio_control_superbitrf_rc.makefile
M conf/flight_plans/rotorcraft_basic.xml
A conf/flight_plans/zamboni_survey_test.xml
M conf/messages.xml
M conf/modules/AOA_adc.xml
M conf/modules/baro_bmp.xml
M conf/modules/baro_ms5611_i2c.xml
A conf/modules/baro_ms5611_spi.xml
A conf/modules/gumstix_qr_code_spi_link.xml
M conf/modules/sys_mon.xml
A conf/modules/zamboni_survey.xml
M conf/settings/control/rotorcraft_guidance.xml
R conf/settings/estimation/booz2_ahrs_lkf.xml
M conf/settings/nps.xml
M conf/system/udev/rules/50-paparazzi.rules
M conf/telemetry/default_rotorcraft.xml
A make-release-tarball.sh
M paparazzi_version
M sw/airborne/arch/lpc21/mcu_periph/gpio_arch.h
M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
M sw/airborne/arch/omap/led_hw.h
A sw/airborne/arch/omap/mcu_periph/gpio_arch.h
M sw/airborne/arch/omap/mcu_periph/sys_time_arch.c
M sw/airborne/arch/omap/mcu_periph/uart_arch.c
M sw/airborne/arch/omap/mcu_periph/uart_arch.h
A sw/airborne/arch/omap/serial_port.c
A sw/airborne/arch/omap/serial_port.h
A sw/airborne/arch/stm32/lisa-s.ld
M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
M sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
M sw/airborne/boards/apogee_1.0.h
M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
M sw/airborne/boards/ardrone/actuators_ardrone2_raw.h
M sw/airborne/boards/ardrone/at_com.c
M sw/airborne/boards/ardrone/at_com.h
M sw/airborne/boards/ardrone/baro_board.c
M sw/airborne/boards/ardrone/baro_board.h
M sw/airborne/boards/ardrone/electrical_raw.c
M sw/airborne/boards/ardrone/gpio_ardrone.c
R sw/airborne/boards/ardrone/gpio_ardrone.h
M sw/airborne/boards/ardrone/navdata.c
M sw/airborne/boards/ardrone/navdata.h
R sw/airborne/boards/krooz/baro_board.c
M sw/airborne/boards/krooz/baro_board.h
M sw/airborne/boards/krooz/imu_krooz.c
M sw/airborne/boards/krooz/imu_krooz.h
M sw/airborne/boards/lia/baro_board.h
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
R sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
R sw/airborne/boards/lisa_m/baro_ms5611_spi.c
A sw/airborne/boards/lisa_s/baro_board.h
A sw/airborne/boards/lisa_s_0.1.h
A sw/airborne/boards/px4fmu/baro_board.h
A sw/airborne/boards/px4fmu_1.7.h
M sw/airborne/firmwares/beth/overo_test_uart.c
M sw/airborne/firmwares/beth/uart_hw.c
M sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/autopilot.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.c
A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.h
R sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/firmwares/rotorcraft/navigation.c
M sw/airborne/firmwares/rotorcraft/navigation.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
R sw/airborne/fms/fms_serial_port.c
R sw/airborne/fms/fms_serial_port.h
M sw/airborne/lisa/test/lisa_test_hmc5843.c
M sw/airborne/lisa/test/lisa_test_itg3200.c
M sw/airborne/lisa/test/test_board.c
M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
M sw/airborne/lisa/test_baro_i2c.c
M sw/airborne/math/pprz_algebra.h
M sw/airborne/math/pprz_algebra_double.h
M sw/airborne/math/pprz_algebra_float.h
M sw/airborne/math/pprz_algebra_int.h
M sw/airborne/math/pprz_geodetic_int.c
M sw/airborne/math/pprz_geodetic_int.h
M sw/airborne/math/pprz_simple_matrix.h
M sw/airborne/mcu_periph/gpio.h
M sw/airborne/mcu_periph/i2c.h
M sw/airborne/mcu_periph/uart.h
M sw/airborne/modules/bat_checker/bat_checker.c
M sw/airborne/modules/bat_checker/bat_checker.h
M sw/airborne/modules/core/sys_mon.c
M sw/airborne/modules/core/sys_mon.h
M sw/airborne/modules/geo_mag/geo_mag.c
A sw/airborne/modules/gumstix_interface/qr_code_spi_link.c
A sw/airborne/modules/gumstix_interface/qr_code_spi_link.h
M sw/airborne/modules/max7456/max7456.c
M sw/airborne/modules/max7456/max7456_regs.h
A sw/airborne/modules/nav/zamboni_survey.c
A sw/airborne/modules/nav/zamboni_survey.h
R sw/airborne/modules/sensors/AOA_adc.c
R sw/airborne/modules/sensors/AOA_adc.h
M sw/airborne/modules/sensors/airspeed_amsys.c
A sw/airborne/modules/sensors/aoa_adc.c
A sw/airborne/modules/sensors/aoa_adc.h
M sw/airborne/modules/sensors/baro_MS5534A.h
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/modules/sensors/baro_bmp.c
M sw/airborne/modules/sensors/baro_bmp.h
M sw/airborne/modules/sensors/baro_board_module.h
M sw/airborne/modules/sensors/baro_ets.h
M sw/airborne/modules/sensors/baro_ms5611_i2c.c
M sw/airborne/modules/sensors/baro_ms5611_i2c.h
A sw/airborne/modules/sensors/baro_ms5611_spi.c
A sw/airborne/modules/sensors/baro_ms5611_spi.h
M sw/airborne/modules/sensors/baro_scp.h
A sw/airborne/peripherals/bmp085.c
A sw/airborne/peripherals/bmp085.h
A sw/airborne/peripherals/bmp085_regs.h
A sw/airborne/peripherals/cyrf6936.c
A sw/airborne/peripherals/cyrf6936.h
A sw/airborne/peripherals/cyrf6936_regs.h
A sw/airborne/peripherals/ms5611.c
M sw/airborne/peripherals/ms5611.h
A sw/airborne/peripherals/ms5611_i2c.c
A sw/airborne/peripherals/ms5611_i2c.h
A sw/airborne/peripherals/ms5611_regs.h
A sw/airborne/peripherals/ms5611_spi.c
A sw/airborne/peripherals/ms5611_spi.h
M sw/airborne/state.h
M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
R sw/airborne/subsystems/ahrs/ahrs_extern_quat.c
R sw/airborne/subsystems/ahrs/ahrs_extern_quat.h
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
R sw/airborne/subsystems/ahrs/ahrs_float_ekf.c
R sw/airborne/subsystems/ahrs/ahrs_float_ekf.h
R sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
R sw/airborne/subsystems/ahrs/ahrs_float_lkf.h
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
M sw/airborne/subsystems/ahrs/ahrs_gx3.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.h
M sw/airborne/subsystems/datalink/datalink.h
M sw/airborne/subsystems/datalink/downlink.h
A sw/airborne/subsystems/datalink/superbitrf.c
A sw/airborne/subsystems/datalink/superbitrf.h
M sw/airborne/subsystems/electrical.c
M sw/airborne/subsystems/electrical.h
M sw/airborne/subsystems/gps/gps_ardrone2.c
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/imu.h
M sw/airborne/subsystems/imu/imu_ardrone2_raw.c
M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
M sw/airborne/subsystems/imu/imu_nps.h
A sw/airborne/subsystems/imu/imu_px4fmu.c
A sw/airborne/subsystems/imu/imu_px4fmu.h
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/ins/ins_alt_float.h
M sw/airborne/subsystems/ins/ins_int.c
M sw/airborne/subsystems/ins/ins_int.h
M sw/airborne/subsystems/ins/ins_int_extended.c
A sw/airborne/subsystems/ins/ins_int_extended.h
M sw/airborne/subsystems/ins/vf_extended_float.c
M sw/airborne/subsystems/ins/vf_float.c
M sw/airborne/subsystems/navigation/common_nav.c
M sw/airborne/subsystems/navigation/common_nav.h
M sw/airborne/subsystems/radio_control/sbus.c
A sw/airborne/subsystems/radio_control/superbitrf_rc.c
A sw/airborne/subsystems/radio_control/superbitrf_rc.h
A sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
A sw/airborne/subsystems/sensors/baro_ms5611_spi.c
M sw/airborne/test/subsystems/test_ahrs.c
M sw/airborne/test/subsystems/test_imu.c
M sw/ext/ardrone2_drivers/cdc-acm.ko
R sw/ext/ardrone2_drivers/cp210x.ko
R sw/ext/ardrone2_drivers/ftdi-sio.ko
R sw/ext/ardrone2_drivers/pl2303.ko
R sw/ext/ardrone2_drivers/usbserial.ko
M sw/simulator/nps/nps_autopilot_rotorcraft.c
M sw/simulator/nps/nps_autopilot_rotorcraft.h
M sw/simulator/pprzsim-launch
M sw/supervision/paparazzicenter.glade
M sw/supervision/paparazzicenter.ml
M sw/tools/calibration/calibrate.py
Log Message:
-----------
Merge branch 'master' into nps_fixedwing
merge for further testing and resolve some conflicts
Commit: 280f97111e3c1e77af9433bb37728818612f6dcd
https://github.com/paparazzi/paparazzi/commit/280f97111e3c1e77af9433bb37728818612f6dcd
Author: Felix Ruess <address@hidden>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M conf/airframes/CDW/asctec_cdw.xml
M conf/airframes/CDW/tricopter_cdw.xml
M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/esden/quady_ls01pwm.xml
M conf/airframes/examples/quadrotor_lisa_s.xml
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_px4fmu.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
Log Message:
-----------
[conf] nps: replace INITIAL_CONDITITONS by JSBSIM_INIT
Commit: 95e063f8aa4487500db06e0f794f79786e87f2c8
https://github.com/paparazzi/paparazzi/commit/95e063f8aa4487500db06e0f794f79786e87f2c8
Author: Felix Ruess <address@hidden>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_ap.c
Log Message:
-----------
[fixedwing] fix missing #endif
Commit: 15027d5e4d123c8e75e7b7d1434158b2836d2748
https://github.com/paparazzi/paparazzi/commit/15027d5e4d123c8e75e7b7d1434158b2836d2748
Author: Felix Ruess <address@hidden>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
Log Message:
-----------
[conf] fix conditional in ins_xsens makefile
Commit: c659d7d8d649705e0910b34112c7dacc3c1941ff
https://github.com/paparazzi/paparazzi/commit/c659d7d8d649705e0910b34112c7dacc3c1941ff
Author: Felix Ruess <address@hidden>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M sw/simulator/nps/nps_ivy_common.c
Log Message:
-----------
[nps] include common_flight_plan.h on ivy_common
Commit: cecb952acab4bbdb5697e4ceb476cd15058780c3
https://github.com/paparazzi/paparazzi/commit/cecb952acab4bbdb5697e4ceb476cd15058780c3
Author: Felix Ruess <address@hidden>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M conf/airframes/CDW/asctec_cdw.xml
M conf/airframes/CDW/tricopter_cdw.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/NoVa_L.xml
M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/booz2_flixr.xml
M conf/airframes/esden/cocto_lm2a2.xml
M conf/airframes/esden/gain_scheduling_example.xml
M conf/airframes/esden/hexy_ll11a2pwm.xml
M conf/airframes/esden/hexy_lm2a2pwm.xml
M conf/airframes/esden/lisa2_hex.xml
M conf/airframes/esden/qs_asp22.xml
M conf/airframes/esden/quady_ll11a2pwm.xml
M conf/airframes/esden/quady_lm1a1pwm.xml
M conf/airframes/esden/quady_lm2a2pwm.xml
M conf/airframes/esden/quady_lm2a2pwmppm.xml
M conf/airframes/esden/quady_ls01pwm.xml
M conf/airframes/examples/MentorEnergy.xml
M conf/airframes/examples/booz2.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
M conf/airframes/examples/quadrotor_lisa_s.xml
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_navgo.xml
M conf/airframes/examples/quadrotor_px4fmu.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M conf/airframes/obsolete/ENAC/g1_vision.xml
M conf/airframes/obsolete/Poine/booz2_a1.xml
M conf/airframes/obsolete/Poine/booz2_a7.xml
M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
M conf/airframes/obsolete/booz2_a1p.xml
M conf/airframes/obsolete/booz2_s1.xml
M conf/airframes/obsolete/example_heli_lisam.xml
M conf/airframes/obsolete/mm/rotor/qmk1.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
A conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
M conf/firmwares/subsystems/fixedwing/gps_mediatek_diy.makefile
M conf/firmwares/subsystems/fixedwing/gps_nmea.makefile
M conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
M conf/firmwares/subsystems/fixedwing/ins_alt_float.makefile
M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M conf/firmwares/subsystems/shared/imu_nps.makefile
M conf/flight_plans/versatile.xml
M conf/flight_plans/versatile_airspeed.xml
M conf/modules/light.xml
A conf/simulator/jsbsim/aircraft/Engines/18x8.xml
A conf/simulator/jsbsim/aircraft/Engines/Zenoah_G-26A.xml
A conf/simulator/jsbsim/aircraft/LisaAspirin2.xml
M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/modules/sensors/airspeed_adc.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/subsystems/gps/gps_sim_nps.c
A sw/simulator/nps/nps_autopilot_fixedwing.c
A sw/simulator/nps/nps_autopilot_fixedwing.h
M sw/simulator/nps/nps_autopilot_rotorcraft.c
M sw/simulator/nps/nps_fdm.h
M sw/simulator/nps/nps_fdm_jsbsim.c
R sw/simulator/nps/nps_ivy.c
M sw/simulator/nps/nps_ivy.h
A sw/simulator/nps/nps_ivy_common.c
A sw/simulator/nps/nps_ivy_fixedwing.c
A sw/simulator/nps/nps_ivy_rotorcraft.c
M sw/simulator/nps/nps_radio_control_joystick.c
Log Message:
-----------
Merge pull request #516 from paparazzi/nps_fixedwing
NPS improvements and basics for fixedwing simulation
Also:
- configurable jsbsim model and initial conditions from flight plan
- If NPS_JSBSIM_MODEL is not defined, it defaults to the AIRCRAFT_NAME
(previous behavior).
- If NPS_JSBSIM_INIT is defined, that ic file is used, otherwise uses flight
plan location.
- NPS_INITIAL_CONDITITONS is not used anymore.
-configurable joystick buttons/axes
Compare:
https://github.com/paparazzi/paparazzi/compare/5a6f4cff1714...cecb952acab4
- [paparazzi-commits] [paparazzi/paparazzi] ef43e7: [nps] Started to add fixed wing support in NPS,
GitHub <=