[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 4df030: Merge branch 'dev' int
|
From: |
noreply |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 4df030: Merge branch 'dev' into dev-state-interface |
|
Date: |
Tue, 29 Mar 2011 12:57:39 -0700 |
Branch: refs/heads/new-state-interface
Home: https://github.com/paparazzi/paparazzi
Commit: 4df030a8518a4b1f067ef89bc8bd40b7137bc734
https://github.com/paparazzi/paparazzi/commit/4df030a8518a4b1f067ef89bc8bd40b7137bc734
Author: Felix Ruess <address@hidden>
Date: 2011-03-27 (Sun, 27 Mar 2011)
Changed paths:
M conf/airframes/Poine/beth.xml
M conf/airframes/booz2_flixr.xml
M conf/autopilot/lisa_l_test_progs.makefile
M conf/autopilot/lisa_passthrough.makefile
M conf/autopilot/obsolete/booz_test_progs.makefile
A conf/autopilot/obsolete/gps_ugear.makefile
M conf/autopilot/obsolete/lisa_test_progs.makefile
A conf/autopilot/obsolete/sitl.makefile
A conf/autopilot/obsolete/sitl_jsbsim.makefile
A conf/autopilot/obsolete/sitl_link_pprz.makefile
A conf/autopilot/obsolete/sitl_link_xbee.makefile
M conf/autopilot/rotorcraft.makefile
R conf/autopilot/sitl.makefile
R conf/autopilot/sitl_jsbsim.makefile
R conf/autopilot/sitl_link_pprz.makefile
R conf/autopilot/sitl_link_xbee.makefile
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
R conf/autopilot/subsystems/fixedwing/gps_ugear.makefile
M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
M conf/autopilot/subsystems/fixedwing/navigation.makefile
M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
M conf/messages.xml
M conf/modules/servo_switch.xml
M conf/settings/tuning.xml
M conf/telemetry/booz_minimal.xml
M conf/telemetry/telemetry_booz2.xml
M sw/airborne/ap_downlink.h
R sw/airborne/arch/lpc21/gps_hw.h
R sw/airborne/arch/sim/gps_hw.c
R sw/airborne/arch/sim/gps_hw.h
M sw/airborne/arch/sim/jsbsim_gps.c
M sw/airborne/arch/sim/jsbsim_hw.h
M sw/airborne/arch/sim/jsbsim_transport.c
M sw/airborne/arch/sim/sim_ap.c
M sw/airborne/arch/sim/sim_baro.c
M sw/airborne/arch/sim/sim_gps.c
R sw/airborne/arch/sim/sim_jsbsim.c
R sw/airborne/arch/stm32/gps_hw.h
R sw/airborne/booz/booz2_commands.c
R sw/airborne/booz/booz2_commands.h
R sw/airborne/booz/booz_gps.c
R sw/airborne/booz/booz_gps.h
R sw/airborne/booz/gps/booz_gps_skytraq.c
R sw/airborne/booz/gps/booz_gps_skytraq.h
R sw/airborne/booz/gps/booz_gps_ubx.c
R sw/airborne/booz/gps/booz_gps_ubx.h
M sw/airborne/booz/test/booz2_test_gps.c
M sw/airborne/csc/mercury_ap.c
M sw/airborne/estimator.c
M sw/airborne/firmwares/beth/main_stm32.c
M sw/airborne/firmwares/beth/overo_test_uart.c
M sw/airborne/firmwares/beth/rcv_telemetry.c
M sw/airborne/firmwares/fixedwing/datalink.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
A sw/airborne/firmwares/rotorcraft/commands.c
A sw/airborne/firmwares/rotorcraft/commands.h
M sw/airborne/firmwares/rotorcraft/datalink.c
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/telemetry.h
R sw/airborne/gps.c
R sw/airborne/gps.h
R sw/airborne/gps_ubx.c
R sw/airborne/gps_ubx.h
R sw/airborne/latlong.c
R sw/airborne/latlong.h
M sw/airborne/lisa/lisa_stm_passthrough_main.c
M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
M sw/airborne/math/pprz_geodetic_double.c
M sw/airborne/math/pprz_geodetic_double.h
M sw/airborne/math/pprz_geodetic_float.c
M sw/airborne/math/pprz_geodetic_float.h
M sw/airborne/math/pprz_geodetic_int.c
M sw/airborne/math/pprz_geodetic_int.h
A sw/airborne/math/pprz_geodetic_utm.h
M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
M sw/airborne/modules/cam_control/cam.c
M sw/airborne/modules/digital_cam/dc.c
M sw/airborne/modules/digital_cam/dc.h
M sw/airborne/modules/gps_i2c/gps_i2c.c
M sw/airborne/modules/gsm/gsm.c
M sw/airborne/modules/ins/ins_arduimu.c
R sw/airborne/modules/ins/ins_osam_ugear.c
R sw/airborne/modules/ins/ins_osam_ugear.h
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/meteo/windturbine.c
M sw/airborne/modules/multi/formation.c
M sw/airborne/modules/multi/potential.c
M sw/airborne/modules/multi/tcas.c
M sw/airborne/modules/sensors/baro_ets.c
M sw/airborne/modules/sensors/trigger_ext.c
M sw/airborne/modules/vehicle_interface/vi.c
M sw/airborne/modules/vehicle_interface/vi_overo_link.c
A sw/airborne/obsolete/booz_gps.c
A sw/airborne/obsolete/booz_gps.h
A sw/airborne/obsolete/booz_gps_skytraq.c
A sw/airborne/obsolete/booz_gps_skytraq.h
A sw/airborne/obsolete/booz_gps_ubx.c
A sw/airborne/obsolete/booz_gps_ubx.h
A sw/airborne/obsolete/gps.c
A sw/airborne/obsolete/gps.h
A sw/airborne/obsolete/gps_ubx.c
A sw/airborne/obsolete/gps_ubx.h
A sw/airborne/obsolete/ins_osam_ugear.c
A sw/airborne/obsolete/ins_osam_ugear.h
A sw/airborne/obsolete/latlong.c
A sw/airborne/obsolete/latlong.h
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
A sw/airborne/subsystems/gps.c
A sw/airborne/subsystems/gps.h
A sw/airborne/subsystems/gps/gps_sim.c
A sw/airborne/subsystems/gps/gps_sim.h
A sw/airborne/subsystems/gps/gps_sim_nps.c
A sw/airborne/subsystems/gps/gps_sim_nps.h
A sw/airborne/subsystems/gps/gps_skytraq.c
A sw/airborne/subsystems/gps/gps_skytraq.h
A sw/airborne/subsystems/gps/gps_ubx.c
A sw/airborne/subsystems/gps/gps_ubx.h
M sw/airborne/subsystems/ins.c
M sw/airborne/subsystems/ins/hf_float.c
M sw/airborne/subsystems/nav.c
M sw/airborne/subsystems/nav.h
M sw/airborne/subsystems/navigation/OSAMNav.c
M sw/airborne/subsystems/navigation/OSAMNav.h
A sw/airborne/subsystems/navigation/common_flight_plan.c
A sw/airborne/subsystems/navigation/common_flight_plan.h
M sw/airborne/subsystems/navigation/common_nav.c
M sw/airborne/subsystems/navigation/common_nav.h
M sw/airborne/subsystems/navigation/discsurvey.c
M sw/airborne/subsystems/navigation/nav_cube.c
M sw/airborne/subsystems/navigation/nav_line.c
M sw/airborne/subsystems/navigation/nav_survey_rectangle.c
M sw/airborne/subsystems/navigation/snav.c
M sw/airborne/subsystems/navigation/spiral.c
M sw/airborne/test/test_actuators.c
M sw/airborne/test/test_geodetic.c
M sw/ground_segment/tmtc/rotorcraft_server.ml
M sw/include/std.h
M sw/logalizer/export.ml
M sw/simulator/nps/nps_autopilot_booz.c
M sw/tools/gen_flight_plan.ml
Log Message:
-----------
Merge branch 'dev' into dev-state-interface
Commit: ed23fc1ee1036732e7add618f82c41c52af83986
https://github.com/paparazzi/paparazzi/commit/ed23fc1ee1036732e7add618f82c41c52af83986
Author: Felix Ruess <address@hidden>
Date: 2011-03-27 (Sun, 27 Mar 2011)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_ap.c
Log Message:
-----------
added support for GPS_TRIGGERED_FUNCTION again
Commit: fa6acf15405b7fe3673375b151ce9d3257b124d0
https://github.com/paparazzi/paparazzi/commit/fa6acf15405b7fe3673375b151ce9d3257b124d0
Author: Felix Ruess <address@hidden>
Date: 2011-03-27 (Sun, 27 Mar 2011)
Changed paths:
M sw/airborne/mcu_periph/uart.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_skytraq.h
M sw/airborne/subsystems/gps/gps_ubx.c
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
ublox gps: re-added gps reset, started adding runtime configure again
Commit: f1f8faff975929503f745c0ebbc205b3ed378eb4
https://github.com/paparazzi/paparazzi/commit/f1f8faff975929503f745c0ebbc205b3ed378eb4
Author: Felix Ruess <address@hidden>
Date: 2011-03-27 (Sun, 27 Mar 2011)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
really call gps configuration on gps event
Commit: 72e54afc1787fcf50283b899170516efae23d223
https://github.com/paparazzi/paparazzi/commit/72e54afc1787fcf50283b899170516efae23d223
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
GPS ubx: mark solution as available when VELNED message instead of SOL message
was received
Commit: ab897b7f55bb00a6f858140cb151a000122f6173
https://github.com/paparazzi/paparazzi/commit/ab897b7f55bb00a6f858140cb151a000122f6173
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/booz2_test_progs.makefile
Log Message:
-----------
added usb tunnels to booz2_test_progs
Commit: 7c3289a9a12416aa07a83c9e6974430a638554a5
https://github.com/paparazzi/paparazzi/commit/7c3289a9a12416aa07a83c9e6974430a638554a5
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/booz2_test_progs.makefile
Log Message:
-----------
Merge branch 'master' into dev
Commit: d1e085c214517e9ecf3e8dd7ebc19a486846c9f4
https://github.com/paparazzi/paparazzi/commit/d1e085c214517e9ecf3e8dd7ebc19a486846c9f4
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/booz2_test_progs.makefile
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/mcu_periph/uart.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_skytraq.h
M sw/airborne/subsystems/gps/gps_ubx.c
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
Merge branch 'dev' into dev-state-interface
Commit: 55d42a50d5f2f286cbe3f68f3e51087e3be605fe
https://github.com/paparazzi/paparazzi/commit/55d42a50d5f2f286cbe3f68f3e51087e3be605fe
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M conf/messages.xml
M conf/telemetry/telemetry_booz2.xml
M sw/airborne/booz/test/booz2_test_crista.c
M sw/airborne/booz/test/booz_test_imu.c
M sw/airborne/csc/mercury_xsens.h
M sw/airborne/firmwares/beth/main_overo.c
M sw/airborne/firmwares/beth/main_stm32.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/test/subsystems/test_ahrs.c
M sw/airborne/test/subsystems/test_imu.c
Log Message:
-----------
renamed BOOZ2_[GYRO|ACCEL|MAG] message to IMU_[GYRO|ACCEL|MAG]_SCALED
Commit: 1c1a280386b2fb01c737cac2e550cadf63970a56
https://github.com/paparazzi/paparazzi/commit/1c1a280386b2fb01c737cac2e550cadf63970a56
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/math/pprz_geodetic_int.h
M sw/airborne/state.c
M sw/airborne/state.h
Log Message:
-----------
state interface: added ENU position and speed representations
Commit: 35f8fa90b1d4c17206862c6b79bd8b3e3067e0fb
https://github.com/paparazzi/paparazzi/commit/35f8fa90b1d4c17206862c6b79bd8b3e3067e0fb
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/math/pprz_geodetic.h
M sw/airborne/state.c
M sw/airborne/state.h
Log Message:
-----------
state interface: added init function and stateSetLocalOrigin
Commit: 3d59ddd89e457a14124cbb371df9bfebae8e6f5b
https://github.com/paparazzi/paparazzi/commit/3d59ddd89e457a14124cbb371df9bfebae8e6f5b
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/subsystems/ahrs.h
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
M sw/airborne/subsystems/ins.c
M sw/airborne/subsystems/ins.h
Log Message:
-----------
state interface: some macros and call state init in main
Commit: 04b70ffd0d18de58922ccedf79c14541eb318c73
https://github.com/paparazzi/paparazzi/commit/04b70ffd0d18de58922ccedf79c14541eb318c73
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/firmwares/rotorcraft/navigation.c
M sw/airborne/firmwares/rotorcraft/navigation.h
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/modules/cam_control/booz_cam.c
M sw/airborne/state.h
Log Message:
-----------
state interface: test commit for returning pointers, results in problems with
flightplans
Commit: a448cebf83055adbe2d8d8ca65bb5b83d8e0c43a
https://github.com/paparazzi/paparazzi/commit/a448cebf83055adbe2d8d8ca65bb5b83d8e0c43a
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M conf/messages.xml
M conf/telemetry/telemetry_booz2.xml
M sw/airborne/booz/test/booz2_test_crista.c
M sw/airborne/booz/test/booz_test_imu.c
M sw/airborne/csc/mercury_xsens.h
M sw/airborne/firmwares/beth/main_overo.c
M sw/airborne/firmwares/beth/main_stm32.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/test/subsystems/test_ahrs.c
M sw/airborne/test/subsystems/test_imu.c
Log Message:
-----------
renamed BOOZ2_[GYRO|ACCEL|MAG] message to IMU_[GYRO|ACCEL|MAG]_SCALED
Commit: 63649d3687734e4b739cf18d5cc430759cf26190
https://github.com/paparazzi/paparazzi/commit/63649d3687734e4b739cf18d5cc430759cf26190
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/state.h
Log Message:
-----------
state interface: ups, fix status defines
Commit: dea3f3589a5c3c6a646cca42cac3aee00b555ac1
https://github.com/paparazzi/paparazzi/commit/dea3f3589a5c3c6a646cca42cac3aee00b555ac1
Author: Felix Ruess <address@hidden>
Date: 2011-03-28 (Mon, 28 Mar 2011)
Changed paths:
M sw/airborne/subsystems/ins.c
Log Message:
-----------
state interface: set origin when ins is initialized
Commit: 075e3659db1bba699af31af08f911a7877d00315
https://github.com/paparazzi/paparazzi/commit/075e3659db1bba699af31af08f911a7877d00315
Author: Gautier Hattenberger <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M sw/ground_segment/joystick/input2ivy.ml
M sw/lib/ocaml/expr_lexer.mll
M sw/lib/ocaml/expr_parser.mly
M sw/lib/ocaml/expr_syntax.ml
M sw/lib/ocaml/expr_syntax.mli
M sw/lib/ocaml/papget.ml
M sw/tools/fp_proc.ml
Log Message:
-----------
expression parser now allows to use '->'
Commit: 01fc468e09515a40309cbb89e081b65e8c42ca59
https://github.com/paparazzi/paparazzi/commit/01fc468e09515a40309cbb89e081b65e8c42ca59
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M sw/ground_segment/joystick/input2ivy.ml
M sw/lib/ocaml/expr_lexer.mll
M sw/lib/ocaml/expr_parser.mly
M sw/lib/ocaml/expr_syntax.ml
M sw/lib/ocaml/expr_syntax.mli
M sw/lib/ocaml/papget.ml
M sw/tools/fp_proc.ml
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi into dev-state-interface
Commit: 400fd674837c30426637966b747be9ba5a4f8a5f
https://github.com/paparazzi/paparazzi/commit/400fd674837c30426637966b747be9ba5a4f8a5f
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
Log Message:
-----------
don't abort with error when using telemetry_transparent_usb in sim
Commit: 2c566ab99e2d5d8883f4625b8dd23c36ff972fc6
https://github.com/paparazzi/paparazzi/commit/2c566ab99e2d5d8883f4625b8dd23c36ff972fc6
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
Log Message:
-----------
Merge branch 'master' into dev-state-interface
Commit: d98fe1cd99af79ed4983ce0ac376cf66ca99b4f4
https://github.com/paparazzi/paparazzi/commit/d98fe1cd99af79ed4983ce0ac376cf66ca99b4f4
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/flight_plans/basic_booz.xml
M conf/flight_plans/booz2_nova.xml
M conf/flight_plans/booz_test_drop.xml
M conf/flight_plans/booz_test_sim.xml
Log Message:
-----------
use state interface instead of ins in booz flight plans
Commit: 8af99bd38f8a4068ee468338f4f2ea2285944808
https://github.com/paparazzi/paparazzi/commit/8af99bd38f8a4068ee468338f4f2ea2285944808
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M sw/airborne/subsystems/ins.c
M sw/airborne/subsystems/ins.h
Log Message:
-----------
removed ins_enu_* representations from ins interface, not needed with state
interface
Commit: 163aa1d0d04451c3e0a921bf1cbee24837c32dd5
https://github.com/paparazzi/paparazzi/commit/163aa1d0d04451c3e0a921bf1cbee24837c32dd5
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M sw/airborne/state.h
Log Message:
-----------
state interface: no more problems with flight plan parser :-), so now always
return pointers
Compare: https://github.com/paparazzi/paparazzi/compare/066fc32...163aa1d
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [paparazzi/paparazzi] 4df030: Merge branch 'dev' into dev-state-interface,
noreply <=