[paparazzi-commits] [paparazzi/paparazzi] 227715: Merge remote-tracking

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 227715: Merge remote-tracking

From:	noreply
Subject:	[paparazzi-commits] [paparazzi/paparazzi] 227715: Merge remote-tracking branch 'paparazzi/master' in...
Date:	Thu, 10 Nov 2011 16:02:19 -0800
  Branch: refs/heads/new-state-interface
  Home:   https://github.com/paparazzi/paparazzi

  Commit: 22771595ff72f8c0c63845f16812fd21ae3a7366
      
https://github.com/paparazzi/paparazzi/commit/22771595ff72f8c0c63845f16812fd21ae3a7366
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-09-29 (Thu, 29 Sep 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/weasel.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  A conf/joystick/xbox_booz_cam.xml
  M conf/messages.xml
  M conf/modules/booz_cam.xml
  M conf/modules/booz_drop.xml
  M conf/modules/poles.xml
  M conf/settings/booz_cam.xml
  M conf/settings/poles.xml
  M conf/settings/settings_booz_drop.xml
  M conf/telemetry/booz_minimal.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/boards/umarim_1.0.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/modules/cam_control/booz_cam.c
  M sw/airborne/modules/cam_control/booz_cam.h
  M sw/airborne/modules/drop/booz_drop.h
  M sw/airborne/modules/poles/nav_poles.c
  M sw/airborne/modules/poles/nav_poles.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/nav.h
  M sw/logalizer/export.ml
  M sw/logalizer/plot.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into dev


  Commit: 0e7a39deb284407685a4198d9ecf5d16648bbcb2
      
https://github.com/paparazzi/paparazzi/commit/0e7a39deb284407685a4198d9ecf5d16648bbcb2
  Author: Felix Ruess <address@hidden>
  Date:   2011-09-29 (Thu, 29 Sep 2011)

  Changed paths:
    M conf/airframes/CDW/LisaFw.xml
  M conf/airframes/CDW/TinyFw.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/LAAS/mmlaas_N1.xml
  M conf/airframes/LAAS/mmlaas_N2.xml
  M conf/airframes/LAAS/mmlaas_N3.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/osam_xsens_twog.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared_i2c.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/modules/infrared_adc.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/airborne/subsystems/sensors/infrared_adc.c

  Log Message:
  -----------
  Merge branch 'ahrs_infrared' into dev


  Commit: 7ffce447a5f58fd61e79aee9cc07c8fa4e967983
      
https://github.com/paparazzi/paparazzi/commit/7ffce447a5f58fd61e79aee9cc07c8fa4e967983
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/arch/stm32/sys_time_hw.h

  Log Message:
  -----------
  XBee-Api mode now works on STM32


  Commit: 321df6bedfb55f842ea809dc2c87412202093577
      
https://github.com/paparazzi/paparazzi/commit/321df6bedfb55f842ea809dc2c87412202093577
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/sim/sim_imu.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h

  Log Message:
  -----------
  fix the simple sim with imu based ahrs subsystems, use the ahrs_infrared 
subsystem for simulation


  Commit: 0cbb8063f209003997c6db8b19fecc22a5e14d9a
      
https://github.com/paparazzi/paparazzi/commit/0cbb8063f209003997c6db8b19fecc22a5e14d9a
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    A conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/skywalker.xml
  A conf/airframes/TU_Delft/skywalkerfiber.xml

  Log Message:
  -----------
  TUDelft Airframes


  Commit: f29eebb7662dbc13d48107c620a21b0d5d8598d9
      
https://github.com/paparazzi/paparazzi/commit/f29eebb7662dbc13d48107c620a21b0d5d8598d9
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

  Log Message:
  -----------
  added timer and function for simulating attitude, only true value


  Commit: 1d6eee4d507d32c824de80a97beb10c0e52ccca7
      
https://github.com/paparazzi/paparazzi/commit/1d6eee4d507d32c824de80a97beb10c0e52ccca7
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    A conf/telemetry/default_fixedwing_imu_9k6.xml

  Log Message:
  -----------
  Fixedwing + imu telemetry through 9k6 modems


  Commit: ff76f0b5f44451ae439565273f98be660593b395
      
https://github.com/paparazzi/paparazzi/commit/ff76f0b5f44451ae439565273f98be660593b395
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  A sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/ahrs/ahrs_sim.h

  Log Message:
  -----------
  added an ahrs_sim subsystem implementation that uses the true attitude from 
the simple ocaml sim


  Commit: 622bc0da8e885c54b3cb1f8ecd83d314f6a371ad
      
https://github.com/paparazzi/paparazzi/commit/622bc0da8e885c54b3cb1f8ecd83d314f6a371ad
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/subsystems/ahrs.c

  Log Message:
  -----------
  removed include of imu.h in ahrs.c


  Commit: 10c6c9e137aead2e1741a57aed5e58458c7bca53
      
https://github.com/paparazzi/paparazzi/commit/10c6c9e137aead2e1741a57aed5e58458c7bca53
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/ap_downlink.h

  Log Message:
  -----------
  fix downlink, only send ahrs_timeout_counter if imu is used as well as ahrs


  Commit: 883ac3e89befc6424af97d534205875916e21b99
      
https://github.com/paparazzi/paparazzi/commit/883ac3e89befc6424af97d534205875916e21b99
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M conf/modules/airspeed_ets.xml

  Log Message:
  -----------
  hack to make sim works with airspeed_ets: added sim_ir to sim target because 
sim_airspeed is set there


  Commit: b386d33e0974cca1f2d10eb9338b12e1bc4363da
      
https://github.com/paparazzi/paparazzi/commit/b386d33e0974cca1f2d10eb9338b12e1bc4363da
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/subsystems/sensors/infrared.h

  Log Message:
  -----------
  added default values for IR_ROLL_NEUTRAL_DEFAULT and IR_PITCH_NEUTRAL_DEFAULT 
in infrared.h if not already defined (in the airframe file)


  Commit: 10f6a86400af1be7c1617d986e04aeefcf2915cd
      
https://github.com/paparazzi/paparazzi/commit/10f6a86400af1be7c1617d986e04aeefcf2915cd
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.c

  Log Message:
  -----------
  always use ahrs.status, never ahrs_float.status


  Commit: f53b55101d74cfcfa2c346fef221be840740deb4
      
https://github.com/paparazzi/paparazzi/commit/f53b55101d74cfcfa2c346fef221be840740deb4
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  update airframe file, set loiter and dash trims to zero


  Commit: 925d745e2e60d40038a65d68741b95dab7f2ec2b
      
https://github.com/paparazzi/paparazzi/commit/925d745e2e60d40038a65d68741b95dab7f2ec2b
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_sim.c

  Log Message:
  -----------
  fix heading in ahrs_sim, need to check what exactly psi is that comes from 
the ocaml sim


  Commit: 63c83493e1f0875fc2e18f68479d581662f11312
      
https://github.com/paparazzi/paparazzi/commit/63c83493e1f0875fc2e18f68479d581662f11312
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/ahrs/ahrs_sim.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.h

  Log Message:
  -----------
  added an AhrsEvent makro to update the ahrs_sim and for now an empty one for 
ahrs_infrared


  Commit: 283dd64e7c38bdc284e779cce5844765a706d349
      
https://github.com/paparazzi/paparazzi/commit/283dd64e7c38bdc284e779cce5844765a706d349
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M conf/modules/airspeed_ets.xml

  Log Message:
  -----------
  Revert "hack to make sim works with airspeed_ets: added sim_ir to sim target 
because sim_airspeed is set there"

This reverts commit 883ac3e89befc6424af97d534205875916e21b99.


  Commit: 35e2d34130d4bc091fccd6ecdaa2e975eeafae7f
      
https://github.com/paparazzi/paparazzi/commit/35e2d34130d4bc091fccd6ecdaa2e975eeafae7f
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.c

  Log Message:
  -----------
  fix simulation, sim_ir and sim_ahrs are now always compiled so the ocaml sim 
does not complain about non-existent functions


  Commit: e4d624cae06c0acca33b9cef8926d90f15fa1702
      
https://github.com/paparazzi/paparazzi/commit/e4d624cae06c0acca33b9cef8926d90f15fa1702
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_sim.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.h
  M sw/simulator/flightModel.ml
  M sw/simulator/flightModel.mli
  M sw/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

  Log Message:
  -----------
  simulate rates p and q as well


  Commit: 9dba6dcca14e5bc2c39a04db0d9e1563e48fab6f
      
https://github.com/paparazzi/paparazzi/commit/9dba6dcca14e5bc2c39a04db0d9e1563e48fab6f
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c

  Log Message:
  -----------
  update simulation of ins_arduimu


  Commit: 52fff14aa68697c291153e08de68d610cb5425ad
      
https://github.com/paparazzi/paparazzi/commit/52fff14aa68697c291153e08de68d610cb5425ad
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
  M sw/airborne/arch/sim/sim_imu.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/subsystems/ahrs.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  A sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/ahrs/ahrs_sim.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/simulator/flightModel.ml
  M sw/simulator/flightModel.mli
  M sw/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

  Log Message:
  -----------
  Merge branch 'ahrs_sim' into dev
fixes #57


  Commit: 06015be50ce0d8f68276f6876eeb21186555d1ce
      
https://github.com/paparazzi/paparazzi/commit/06015be50ce0d8f68276f6876eeb21186555d1ce
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    A conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/skywalker.xml
  A conf/airframes/TU_Delft/skywalkerfiber.xml
  A conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/arch/stm32/sys_time_hw.h

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into dev


  Commit: c57ef4353c55f89d8fbc738a3fb2c958382dc61c
      
https://github.com/paparazzi/paparazzi/commit/c57ef4353c55f89d8fbc738a3fb2c958382dc61c
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    A sw/airborne/arch/sim/sim_ahrs.c

  Log Message:
  -----------
  ups, forgot to commit sim_ahrs.c


  Commit: 7e6548b90b40a36b5bce60f9d0f36a1d5780aa01
      
https://github.com/paparazzi/paparazzi/commit/7e6548b90b40a36b5bce60f9d0f36a1d5780aa01
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    A sw/airborne/arch/sim/sim_ahrs.c

  Log Message:
  -----------
  Merge branch 'ahrs_sim' into dev


  Commit: 94f715d3f436e4903544f9ee9c5c8706aac68bc8
      
https://github.com/paparazzi/paparazzi/commit/94f715d3f436e4903544f9ee9c5c8706aac68bc8
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    M conf/airframes/Poine/turntable.xml
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c

  Log Message:
  -----------
  trying to fix turntable file


  Commit: 343c9ee69b307a3eb2998efdc88d1cc9b603a440
      
https://github.com/paparazzi/paparazzi/commit/343c9ee69b307a3eb2998efdc88d1cc9b603a440
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml

  Log Message:
  -----------
  moved some of Antoine's old booz airframe files to obsolte


  Commit: 49e5def5a37a33b9d1151215af0b449d854e3413
      
https://github.com/paparazzi/paparazzi/commit/49e5def5a37a33b9d1151215af0b449d854e3413
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    M conf/conf.xml.example

  Log Message:
  -----------
  removed booz2_a2 from example conf


  Commit: 2bb9dc530ca08868ae55427338d64e55aa4c7268
      
https://github.com/paparazzi/paparazzi/commit/2bb9dc530ca08868ae55427338d64e55aa4c7268
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/fuckyou.xml
  A conf/airframes/obsolete/autoplato.xml

  Log Message:
  -----------
  more airframe cleanup


  Commit: 929d2856312ff40468ec3b4454bfdec32e860891
      
https://github.com/paparazzi/paparazzi/commit/929d2856312ff40468ec3b4454bfdec32e860891
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-14 (Fri, 14 Oct 2011)

  Changed paths:
    M conf/telemetry/xbee868.xml

  Log Message:
  -----------
  Xbee868 working over 50min


  Commit: 32f4e2a3ff3a07ec7b83baca1f874eba9eac4412
      
https://github.com/paparazzi/paparazzi/commit/32f4e2a3ff3a07ec7b83baca1f874eba9eac4412
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-14 (Fri, 14 Oct 2011)

  Changed paths:
    A githelper.sh

  Log Message:
  -----------
  Attempt to loose less time explaining git to others


  Commit: 1180d1b328f242719fb4c19215cbb32fc2d2391d
      
https://github.com/paparazzi/paparazzi/commit/1180d1b328f242719fb4c19215cbb32fc2d2391d
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile

  Log Message:
  -----------
  removed linking of libpcre where not needed, otherwise place after glibivy


  Commit: 6062bd8724de75a95abe11b88234e79ccf0aa3c1
      
https://github.com/paparazzi/paparazzi/commit/6062bd8724de75a95abe11b88234e79ccf0aa3c1
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    M sw/airborne/test/ahrs/Makefile
  M sw/simulator/old_booz/tests/Makefile

  Log Message:
  -----------
  more makefile updates regarding unneeded libs


  Commit: ebfefa1cc5d215304f1b442bd9be9bbf7a11d633
      
https://github.com/paparazzi/paparazzi/commit/ebfefa1cc5d215304f1b442bd9be9bbf7a11d633
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  added some binaries to gitignore


  Commit: 2229f3a888819fe98d2c85456dc90b921d573498
      
https://github.com/paparazzi/paparazzi/commit/2229f3a888819fe98d2c85456dc90b921d573498
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    M sw/logalizer/sliding_plot.c

  Log Message:
  -----------
  fix include of tkdatabox_markers.h


  Commit: ea167572039353fdd7eede901d0d8f28d732ec98
      
https://github.com/paparazzi/paparazzi/commit/ea167572039353fdd7eede901d0d8f28d732ec98
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml

  Log Message:
  -----------
  removed old ocaml 3d visualization/map stuff


  Commit: 59b95dd3fa0d24de4b5cba79817b532bda4761dc
      
https://github.com/paparazzi/paparazzi/commit/59b95dd3fa0d24de4b5cba79817b532bda4761dc
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    R sw/supervision/paparazzi.pl

  Log Message:
  -----------
  removed old perl version of paparazzi-center


  Commit: 73c00f39cdf8d254411893f2bd3bdf96973c09b1
      
https://github.com/paparazzi/paparazzi/commit/73c00f39cdf8d254411893f2bd3bdf96973c09b1
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-17 (Mon, 17 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile

  Log Message:
  -----------
  fix ahrs_int_cmpl_euler subsystem makefile for rotorcrafts


  Commit: 0e6aaee7150f8517aa734cb83ee34d44c5e25232
      
https://github.com/paparazzi/paparazzi/commit/0e6aaee7150f8517aa734cb83ee34d44c5e25232
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-17 (Mon, 17 Oct 2011)

  Changed paths:
    M conf/Makefile.lpc21

  Log Message:
  -----------
  remove compiler warnings about functions that can't be inlined for lpc based 
builds


  Commit: 6309b735dc10bbda3e4beacd2a49cef55cae96a3
      
https://github.com/paparazzi/paparazzi/commit/6309b735dc10bbda3e4beacd2a49cef55cae96a3
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-17 (Mon, 17 Oct 2011)

  Changed paths:
    M conf/Makefile.lpc21

  Log Message:
  -----------
  use the new multilib toolchain for lpc21 as well


  Commit: a069445dc6cf9a0830cd85f98b89455e593eaedb
      
https://github.com/paparazzi/paparazzi/commit/a069445dc6cf9a0830cd85f98b89455e593eaedb
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-17 (Mon, 17 Oct 2011)

  Changed paths:
    M conf/Makefile.lpc21
  M conf/Makefile.stm32

  Log Message:
  -----------
  added /opt/paparazzi/arm-multilib to search path for toolchain


  Commit: d5815595993b96fe56ae864dcf8d77b277392cb2
      
https://github.com/paparazzi/paparazzi/commit/d5815595993b96fe56ae864dcf8d77b277392cb2
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-17 (Mon, 17 Oct 2011)

  Changed paths:
    M Makefile
  M sw/airborne/arch/lpc21/lpcusb/Makefile

  Log Message:
  -----------
  main makefile and lpcusb: also look for compiler in 
/opt/paparazzi/arm-multilib


  Commit: c7bb02e3c02fe83db32787a739d0f065c3665a2b
      
https://github.com/paparazzi/paparazzi/commit/c7bb02e3c02fe83db32787a739d0f065c3665a2b
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M conf/Makefile.stm32

  Log Message:
  -----------
  use detected openocd binary for start_gdb


  Commit: 0369c96409eb9fbb2be1285b8f5cfdc6777293ce
      
https://github.com/paparazzi/paparazzi/commit/0369c96409eb9fbb2be1285b8f5cfdc6777293ce
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M Makefile
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M sw/airborne/arch/lpc21/lpcusb/Makefile

  Log Message:
  -----------
  first look for compiler in /opt/paparazzi/arm-multilib then in ~/sat, try old 
arm-elf if arm-none-eabi not found


  Commit: 5a67b3300d9c5ff824e93ba5c83853bc90d58bbd
      
https://github.com/paparazzi/paparazzi/commit/5a67b3300d9c5ff824e93ba5c83853bc90d58bbd
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M conf/Makefile.jsbsim
  M conf/Makefile.omap
  M conf/Makefile.pentium-m

  Log Message:
  -----------
  cleanup whitespaces


  Commit: 97ed6ecd4405b592c9f523ef3325f25c1c49817b
      
https://github.com/paparazzi/paparazzi/commit/97ed6ecd4405b592c9f523ef3325f25c1c49817b
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M conf/telemetry/xbee868.xml
  A githelper.sh

  Log Message:
  -----------
  Merge branch 'master' into dev


  Commit: 8e94f27b1a90a2af35df8b02a43f8a487da257d3
      
https://github.com/paparazzi/paparazzi/commit/8e94f27b1a90a2af35df8b02a43f8a487da257d3
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/autopilot.h

  Log Message:
  -----------
  fix when using only settings/basic_infrared.xml: include estimator.h in 
autopilot.h


  Commit: adf8753f02fb5540e59e1c87cc8b150d36454596
      
https://github.com/paparazzi/paparazzi/commit/adf8753f02fb5540e59e1c87cc8b150d36454596
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/autopilot.h

  Log Message:
  -----------
  fix when using only settings/basic_infrared.xml: include estimator.h in 
autopilot.h


  Commit: 7b37761da710636648e9ccb2aded477e6cfe84ec
      
https://github.com/paparazzi/paparazzi/commit/7b37761da710636648e9ccb2aded477e6cfe84ec
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M conf/telemetry/xbee868.xml
  A githelper.sh
  M sw/airborne/firmwares/fixedwing/autopilot.h

  Log Message:
  -----------
  Merge branch 'dev' into multilib


  Commit: e5238af5dd36c9cdfc346f71c83ff0297533dba7
      
https://github.com/paparazzi/paparazzi/commit/e5238af5dd36c9cdfc346f71c83ff0297533dba7
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M sw/airborne/boards/tiny_1.1.h

  Log Message:
  -----------
  fix telemetry transparent_usb for tiny1.1. Use higher clock for tiny1.1 as 
well if USE_USB_HIGH_PCLK is defined


  Commit: 7dfc6f97095cade5c5561d07e30bfbbd36421848
      
https://github.com/paparazzi/paparazzi/commit/7dfc6f97095cade5c5561d07e30bfbbd36421848
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  A conf/settings/tuning_ins_rc.xml
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h

  Log Message:
  -----------
  started reviving settings via remote control, to use it add <subsystem 
name=settings type=rc/> to your airframe file


  Commit: 05603dcda4852f5ce53b0371d87064e7c0761cf5
      
https://github.com/paparazzi/paparazzi/commit/05603dcda4852f5ce53b0371d87064e7c0761cf5
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml

  Log Message:
  -----------
  readded visualization of RC Settings to GCS, uses ugly SETTINGS message


  Commit: 9fc33b8acfdd0d5096854437d73047eb8cc7d688
      
https://github.com/paparazzi/paparazzi/commit/9fc33b8acfdd0d5096854437d73047eb8cc7d688
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml

  Log Message:
  -----------
  added SETTINGS message to the default messages set for a few standard fw 
telemetry configs
If the subsystem settings_rc is not used the message is not sent anyway....


  Commit: 1e174d09bbbe502d55b382f785882e42d0747eff
      
https://github.com/paparazzi/paparazzi/commit/1e174d09bbbe502d55b382f785882e42d0747eff
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile

  Log Message:
  -----------
  when replacing attitude_infrared subsystem, tell the user to load 
infrared_adc.xml and not infrared.xml


  Commit: 1e8ff6731419c1a243d787ca5fa2f9dc7f3bfbc0
      
https://github.com/paparazzi/paparazzi/commit/1e8ff6731419c1a243d787ca5fa2f9dc7f3bfbc0
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml

  Log Message:
  -----------
  Merge pull request #72 from flixr/rc_settings

Rc settings


  Commit: efbe7038e7504d4a55c664742e7b4190489cd7be
      
https://github.com/paparazzi/paparazzi/commit/efbe7038e7504d4a55c664742e7b4190489cd7be
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M .gitignore
  M conf/Makefile.lpc21
  R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  R conf/airframes/Poine/fuckyou.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/flixr_discovery.xml
  A conf/airframes/obsolete/autoplato.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/conf.xml.example
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/test/ahrs/Makefile
  M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile
  M sw/logalizer/sliding_plot.c
  M sw/simulator/old_booz/tests/Makefile
  R sw/supervision/paparazzi.pl

  Log Message:
  -----------
  Merge branch 'dev'


  Commit: 14711057392965f353ba95fbcf96d111123e3a57
      
https://github.com/paparazzi/paparazzi/commit/14711057392965f353ba95fbcf96d111123e3a57
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M sw/tools/gen_settings.ml

  Log Message:
  -----------
  fix code generation settings.h when RC settings contain a variable within a 
struct


  Commit: f0519cc0f6382bebcd1eb1a03ecb4ba34e7d0c32
      
https://github.com/paparazzi/paparazzi/commit/f0519cc0f6382bebcd1eb1a03ecb4ba34e7d0c32
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M sw/tools/gen_settings.ml

  Log Message:
  -----------
  ok, really fix the generation of settings.h now


  Commit: 8e68bda4becaa9041fc1640b4cb5b1c7a8024446
      
https://github.com/paparazzi/paparazzi/commit/8e68bda4becaa9041fc1640b4cb5b1c7a8024446
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M Makefile
  M conf/Makefile.jsbsim
  M conf/Makefile.lpc21
  M conf/Makefile.omap
  M conf/Makefile.pentium-m
  M conf/Makefile.stm32
  M sw/airborne/arch/lpc21/lpcusb/Makefile

  Log Message:
  -----------
  Merge branch 'multilib' into dev


  Commit: 5d9a0dfbeee40c950257a04024bffd56db335c57
      
https://github.com/paparazzi/paparazzi/commit/5d9a0dfbeee40c950257a04024bffd56db335c57
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml

  Log Message:
  -----------
  Enable the infrared modules for jsbsim target as well. Closes #74


  Commit: 471720a4915f4d9474805a487e50763654a2bea2
      
https://github.com/paparazzi/paparazzi/commit/471720a4915f4d9474805a487e50763654a2bea2
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

  Log Message:
  -----------
  removed pcre lib from jsbsim and rotorcraft sim targets, not needed and won't 
compile when the linker uses --as-needed option


  Commit: d198072226a77b3ce82ea41f00fe0a8da105dba8
      
https://github.com/paparazzi/paparazzi/commit/d198072226a77b3ce82ea41f00fe0a8da105dba8
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M Makefile.ac

  Log Message:
  -----------
  also print LDFLAGS to var/ac/target_srcs.list


  Commit: ce08e1a86946fec74c472aaf39c10ec52b009fe9
      
https://github.com/paparazzi/paparazzi/commit/ce08e1a86946fec74c472aaf39c10ec52b009fe9
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M .gitignore
  M sw/ground_segment/misc/Makefile
  A sw/ground_segment/misc/ivy2serial.c

  Log Message:
  -----------
  IVY 2 Serial relay


  Commit: 311c105ef09ad00e2183b479814bb2e83410614b
      
https://github.com/paparazzi/paparazzi/commit/311c105ef09ad00e2183b479814bb2e83410614b
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M Makefile.ac
  M conf/Makefile.jsbsim
  M conf/Makefile.lpc21
  M conf/Makefile.omap
  M conf/Makefile.pentium-m
  M conf/Makefile.stm32
  R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  R conf/airframes/Poine/fuckyou.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/flixr_discovery.xml
  A conf/airframes/obsolete/autoplato.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/test/ahrs/Makefile
  M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile
  M sw/logalizer/sliding_plot.c
  M sw/simulator/old_booz/tests/Makefile
  R sw/supervision/paparazzi.pl
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Pulled Master


  Commit: 01baeec1a575035722002a27453255b7715a8b23
      
https://github.com/paparazzi/paparazzi/commit/01baeec1a575035722002a27453255b7715a8b23
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M sw/ground_segment/misc/ivy2serial.c

  Log Message:
  -----------
  IVY <-> Longrange Serial


  Commit: 6f82311504f9ecefef64038bbd33cfed7605f57e
      
https://github.com/paparazzi/paparazzi/commit/6f82311504f9ecefef64038bbd33cfed7605f57e
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-25 (Tue, 25 Oct 2011)

  Changed paths:
    M githelper.sh

  Log Message:
  -----------
  Added mergetool and tags to githelper


  Commit: cf0d5b9316c7cc3b05d1d01d0566cc457a6dab56
      
https://github.com/paparazzi/paparazzi/commit/cf0d5b9316c7cc3b05d1d01d0566cc457a6dab56
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-10-26 (Wed, 26 Oct 2011)

  Changed paths:
    M conf/airframes/TU_Delft/skywalker.xml
  R conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  A conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  R conf/modules/ins_xsens_MTiG_fixedwing.xml
  M githelper.sh
  M sw/airborne/ap_downlink.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h

  Log Message:
  -----------
  Starting the IMU/AHRS/INS organization. Step 1: attempt to nicely add an INS 
+ its simulation model into a subsystem.


  Commit: 3c8ff67a8e74fa583f24ff4f19f81c910d2c4bcb
      
https://github.com/paparazzi/paparazzi/commit/3c8ff67a8e74fa583f24ff4f19f81c910d2c4bcb
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M sw/simulator/sim_ac_flightgear.c
  M sw/simulator/sim_ac_jsbsim.c

  Log Message:
  -----------
  whitespace cleanup


  Commit: c4bf4365a3b03baf4e68ae97cfd289ecf31cd8d0
      
https://github.com/paparazzi/paparazzi/commit/c4bf4365a3b03baf4e68ae97cfd289ecf31cd8d0
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A sw/airborne/arch/sim/jsbsim_ahrs.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/simulator/sim_ac_fw.c

  Log Message:
  -----------
  also feed sim_ahrs from jsbsim


  Commit: 8034bcb20931358cbd8853f8f51cda04844114eb
      
https://github.com/paparazzi/paparazzi/commit/8034bcb20931358cbd8853f8f51cda04844114eb
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    R sw/airborne/arch/sim/sim_imu.c

  Log Message:
  -----------
  removed obsolete sim_imu file


  Commit: 0b9922c690e705ad06994adad8ec74fd6fc491bf
      
https://github.com/paparazzi/paparazzi/commit/0b9922c690e705ad06994adad8ec74fd6fc491bf
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-28 (Fri, 28 Oct 2011)

  Changed paths:
    M Makefile
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M sw/airborne/arch/lpc21/lpcusb/Makefile

  Log Message:
  -----------
  Call xargs with option -r (--no-run-if-empty) so that when the toolchain is 
not found, dirname does not complain about a missing operand


  Commit: 88d8f4458eadf296814b09b5141ea2d5f5d4381d
      
https://github.com/paparazzi/paparazzi/commit/88d8f4458eadf296814b09b5141ea2d5f5d4381d
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-28 (Fri, 28 Oct 2011)

  Changed paths:
    M Makefile
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M sw/airborne/arch/lpc21/lpcusb/Makefile

  Log Message:
  -----------
  trying to make everyone happy.... no xargs -r on osx


  Commit: 0cd41d92258e5aa24e6e47c0787886811b3d837e
      
https://github.com/paparazzi/paparazzi/commit/0cd41d92258e5aa24e6e47c0787886811b3d837e
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-28 (Fri, 28 Oct 2011)

  Changed paths:
    M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.h

  Log Message:
  -----------
  no execuable flag for source files


  Commit: 29ccad782cd615d0765541f3180385719938a055
      
https://github.com/paparazzi/paparazzi/commit/29ccad782cd615d0765541f3180385719938a055
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-30 (Sun, 30 Oct 2011)

  Changed paths:
    M conf/modules/servo_switch.xml

  Log Message:
  -----------
  update comments for servo_switch module


  Commit: 1ff3548720d8df9403f1080769a572aa9e53d4f0
      
https://github.com/paparazzi/paparazzi/commit/1ff3548720d8df9403f1080769a572aa9e53d4f0
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-31 (Mon, 31 Oct 2011)

  Changed paths:
    M Makefile
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/modules/servo_switch.xml
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  A sw/airborne/arch/sim/jsbsim_ahrs.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  R sw/airborne/arch/sim/sim_imu.c
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.h
  M sw/simulator/sim_ac_flightgear.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c

  Log Message:
  -----------
  Merge branch 'master' into dev


  Commit: 0d499fb991d30af3cd47250aefe47ba58eefe57b
      
https://github.com/paparazzi/paparazzi/commit/0d499fb991d30af3cd47250aefe47ba58eefe57b
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-31 (Mon, 31 Oct 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/imu_analog.makefile

  Log Message:
  -----------
  updated comments, use configure and not param keyword


  Commit: 0d9bf23508b4515f0d7eca0c72237c466d5dd627
      
https://github.com/paparazzi/paparazzi/commit/0d9bf23508b4515f0d7eca0c72237c466d5dd627
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-31 (Mon, 31 Oct 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c

  Log Message:
  -----------
  only check and use aligner if USE_AHRS_ALIGNER is defined


  Commit: f1e30ba0d7f0e8248addbb63925d31512fd86542
      
https://github.com/paparazzi/paparazzi/commit/f1e30ba0d7f0e8248addbb63925d31512fd86542
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-11-01 (Tue, 01 Nov 2011)

  Changed paths:
    M .gitignore
  M sw/ground_segment/misc/Makefile
  R sw/ground_segment/misc/ivy2serial.c
  M sw/ground_segment/tmtc/Makefile
  A sw/ground_segment/tmtc/ivy_serial_bridge.c

  Log Message:
  -----------
  IVY Serial Longrange Bridge


  Commit: f0dcd7eceb52bb0defe5746799e9bdbd62fb9475
      
https://github.com/paparazzi/paparazzi/commit/f0dcd7eceb52bb0defe5746799e9bdbd62fb9475
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/server.ml

  Log Message:
  -----------
  small fix to avoid warning when runing replay session


  Commit: 1702412f7db403171c6bc25d1f9d2f0724cf8e04
      
https://github.com/paparazzi/paparazzi/commit/1702412f7db403171c6bc25d1f9d2f0724cf8e04
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M Makefile.ac
  M conf/Makefile.jsbsim
  M conf/Makefile.lpc21
  M conf/Makefile.omap
  M conf/Makefile.pentium-m
  M conf/Makefile.stm32
  M conf/airframes/CDW/LisaFw.xml
  M conf/airframes/CDW/TinyFw.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/LAAS/mmlaas_N1.xml
  M conf/airframes/LAAS/mmlaas_N2.xml
  M conf/airframes/LAAS/mmlaas_N3.xml
  R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  R conf/airframes/Poine/fuckyou.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  A conf/airframes/obsolete/autoplato.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/osam_xsens_twog.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared_i2c.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  A conf/modules/gps_ubx_ucenter.xml
  M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml
  M conf/modules/servo_switch.xml
  A conf/settings/gps_ubx_ucenter.xml
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M conf/telemetry/xbee868.xml
  M conf/ubx.xml
  A githelper.sh
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  A sw/airborne/arch/sim/jsbsim_ahrs.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
  A sw/airborne/arch/sim/sim_ahrs.c
  R sw/airborne/arch/sim/sim_imu.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.h
  A sw/airborne/modules/gps/gps_ubx_ucenter.c
  A sw/airborne/modules/gps/gps_ubx_ucenter.h
  R sw/airborne/modules/gps_i2c/runtime_configure.h
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/subsystems/ahrs.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.h
  A sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/ahrs/ahrs_sim.h
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/airborne/subsystems/sensors/infrared_adc.c
  M sw/airborne/test/ahrs/Makefile
  M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/ground_segment/tmtc/Makefile
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  A sw/ground_segment/tmtc/ivy_serial_bridge.c
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile
  M sw/logalizer/sliding_plot.c
  M sw/simulator/flightModel.ml
  M sw/simulator/flightModel.mli
  M sw/simulator/hitl.ml
  M sw/simulator/old_booz/tests/Makefile
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sim_ac_flightgear.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c
  M sw/simulator/sitl.ml
  R sw/supervision/paparazzi.pl
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master'


  Commit: f145da9437835eda78e7815f03e07859ef32171d
      
https://github.com/paparazzi/paparazzi/commit/f145da9437835eda78e7815f03e07859ef32171d
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    A conf/modules/mcp355x.xml
  A sw/airborne/modules/adcs/mcp355x.h
  A sw/airborne/peripherals/mcp355x.c
  A sw/airborne/peripherals/mcp355x.h

  Log Message:
  -----------
  driver for mcp355x (22-bit spi adc)


  Commit: 3564133b61277d62351986b2efc9eef02e747608
      
https://github.com/paparazzi/paparazzi/commit/3564133b61277d62351986b2efc9eef02e747608
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M conf/telemetry/default_fixedwing_imu_9k6.xml

  Log Message:
  -----------
  Still too much data on 9k6


  Commit: 6aa559e3275f54f312793e84614780e53156af05
      
https://github.com/paparazzi/paparazzi/commit/6aa559e3275f54f312793e84614780e53156af05
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-03 (Thu, 03 Nov 2011)

  Changed paths:
    M .gitignore
  A conf/modules/mcp355x.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  A sw/airborne/modules/adcs/mcp355x.h
  A sw/airborne/peripherals/mcp355x.c
  A sw/airborne/peripherals/mcp355x.h
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/misc/Makefile
  R sw/ground_segment/misc/ivy2serial.c
  M sw/ground_segment/tmtc/Makefile
  A sw/ground_segment/tmtc/ivy_serial_bridge.c
  M sw/ground_segment/tmtc/server.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into dev


  Commit: 1021f94cdff52701c3e26a61cead46b9123000ed
      
https://github.com/paparazzi/paparazzi/commit/1021f94cdff52701c3e26a61cead46b9123000ed
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-03 (Thu, 03 Nov 2011)

  Changed paths:
    M conf/Makefile.stm32

  Log Message:
  -----------
  only print the first line of the version information of gcc and openocd


  Commit: 82c6fdae7c45564bc8b45ca0b576073704d9b191
      
https://github.com/paparazzi/paparazzi/commit/82c6fdae7c45564bc8b45ca0b576073704d9b191
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-03 (Thu, 03 Nov 2011)

  Changed paths:
    M conf/messages.xml
  M sw/airborne/ap_downlink.h

  Log Message:
  -----------
  chaned resolution of amps in BAT message to centi-amps, gives you higher 
resolution and still up to 327A max


  Commit: 2d0a06107558309ed7ee31b3e195321f3e4c2375
      
https://github.com/paparazzi/paparazzi/commit/2d0a06107558309ed7ee31b3e195321f3e4c2375
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-04 (Fri, 04 Nov 2011)

  Changed paths:
    M conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/osam_xsens_twog.xml

  Log Message:
  -----------
  updated some older airframe files, param keyword for subsystems has been 
renamed to configre quite a while ago


  Commit: 9703e8019afd10b2b572ecff66408c9656b626d3
      
https://github.com/paparazzi/paparazzi/commit/9703e8019afd10b2b572ecff66408c9656b626d3
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-05 (Sat, 05 Nov 2011)

  Changed paths:
    M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml

  Log Message:
  -----------
  added the tele_fbw setting to some basic telemetry files... especially 
beginners use these files and then miss the option


  Commit: 210fb1fac10063ee32a8ba32809c6ef492d7229d
      
https://github.com/paparazzi/paparazzi/commit/210fb1fac10063ee32a8ba32809c6ef492d7229d
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-06 (Sun, 06 Nov 2011)

  Changed paths:
    M sw/airborne/subsystems/radio_control/rc_datalink.c
  M sw/airborne/subsystems/radio_control/rc_datalink.h

  Log Message:
  -----------
  rc_datalink: actually use yaw from the 4ch message


  Commit: 0bdd36a1186c84603cc5ca250d4071f8159567e2
      
https://github.com/paparazzi/paparazzi/commit/0bdd36a1186c84603cc5ca250d4071f8159567e2
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/imu_analog.makefile

  Log Message:
  -----------
  updated comments, use configure and not param keyword


  Commit: ce82f6330be7cd51c77c747437f67fde487c8a4a
      
https://github.com/paparazzi/paparazzi/commit/ce82f6330be7cd51c77c747437f67fde487c8a4a
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c

  Log Message:
  -----------
  only check and use aligner if USE_AHRS_ALIGNER is defined


  Commit: 5a1bfa9e14b740a4e391fa3ab9dcac63e367fc9b
      
https://github.com/paparazzi/paparazzi/commit/5a1bfa9e14b740a4e391fa3ab9dcac63e367fc9b
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/osam_xsens_twog.xml

  Log Message:
  -----------
  updated some older airframe files, param keyword for subsystems has been 
renamed to configre quite a while ago


  Commit: 82867543dca2812d6768ae2b823b9944fc851af4
      
https://github.com/paparazzi/paparazzi/commit/82867543dca2812d6768ae2b823b9944fc851af4
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  added two binaries to .gitignore


  Commit: b02f38f1255df48cf71e49826dd7b3624e2a720e
      
https://github.com/paparazzi/paparazzi/commit/b02f38f1255df48cf71e49826dd7b3624e2a720e
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M sw/ground_segment/misc/Makefile

  Log Message:
  -----------
  a little whitespace cleanup


  Commit: 0c086276ad91c50ad530309419497d592e8ed3c5
      
https://github.com/paparazzi/paparazzi/commit/0c086276ad91c50ad530309419497d592e8ed3c5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-08 (Tue, 08 Nov 2011)

  Changed paths:
    M sw/ground_segment/joystick/input2ivy.ml

  Log Message:
  -----------
  check if ac_id field is needed


  Commit: 222e2355320da153a56b6e248d52527c3666df4f
      
https://github.com/paparazzi/paparazzi/commit/222e2355320da153a56b6e248d52527c3666df4f
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-08 (Tue, 08 Nov 2011)

  Changed paths:
    M sw/ground_segment/misc/Makefile

  Log Message:
  -----------
  ups, fix Makefile, leading tabs again not spaces


  Commit: fa96ce714746197c644d95b2cc290a62aaca4c43
      
https://github.com/paparazzi/paparazzi/commit/fa96ce714746197c644d95b2cc290a62aaca4c43
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-09 (Wed, 09 Nov 2011)

  Changed paths:
    M .gitignore
  M conf/Makefile.stm32
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/messages.xml
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/subsystems/radio_control/rc_datalink.c
  M sw/airborne/subsystems/radio_control/rc_datalink.h
  M sw/ground_segment/joystick/input2ivy.ml
  M sw/ground_segment/misc/Makefile

  Log Message:
  -----------
  Merge branch 'master' into dev


  Commit: 4c4276ff88ea7fe775cb30396862ee0eb37896dc
      
https://github.com/paparazzi/paparazzi/commit/4c4276ff88ea7fe775cb30396862ee0eb37896dc
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M Makefile.ac
  M conf/Makefile.jsbsim
  M conf/Makefile.lpc21
  M conf/Makefile.omap
  M conf/Makefile.pentium-m
  M conf/Makefile.stm32
  M conf/airframes/NoVa_L.xml
  R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  R conf/airframes/Poine/fuckyou.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/turntable.xml
  A conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/skywalker.xml
  A conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/rotor/qmk1.xml
  A conf/airframes/obsolete/autoplato.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/osam_xsens_twog.xml
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  R conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  A conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  M conf/messages.xml
  M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml
  R conf/modules/ins_xsens_MTiG_fixedwing.xml
  A conf/modules/mcp355x.xml
  M conf/modules/servo_switch.xml
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  A conf/telemetry/default_fixedwing_imu_9k6.xml
  M conf/telemetry/xbee868.xml
  A githelper.sh
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  A sw/airborne/arch/sim/jsbsim_ahrs.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
  A sw/airborne/arch/sim/sim_ahrs.c
  R sw/airborne/arch/sim/sim_imu.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/stm32/sys_time_hw.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  A sw/airborne/modules/adcs/mcp355x.h
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/peripherals/mcp355x.c
  A sw/airborne/peripherals/mcp355x.h
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/subsystems/ahrs.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  A sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/ahrs/ahrs_sim.h
  M sw/airborne/subsystems/radio_control/rc_datalink.c
  M sw/airborne/subsystems/radio_control/rc_datalink.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/airborne/test/ahrs/Makefile
  M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/joystick/input2ivy.ml
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/ground_segment/tmtc/Makefile
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  A sw/ground_segment/tmtc/ivy_serial_bridge.c
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile
  M sw/logalizer/sliding_plot.c
  M sw/simulator/flightModel.ml
  M sw/simulator/flightModel.mli
  M sw/simulator/hitl.ml
  M sw/simulator/old_booz/tests/Makefile
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sim_ac_flightgear.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c
  M sw/simulator/sitl.ml
  R sw/supervision/paparazzi.pl
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge branch 'dev' into new-state-interface


Compare: https://github.com/paparazzi/paparazzi/compare/18c4895...4c4276f
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [paparazzi/paparazzi] 227715: Merge remote-tracking branch 'paparazzi/master' in..., noreply <=
Prev by Date: [paparazzi-commits] Build failed in Jenkins: Paparazzi #12
Next by Date: [paparazzi-commits] Build failed in Jenkins: Paparazzi #13
Previous by thread: [paparazzi-commits] Build failed in Jenkins: Paparazzi #10
Next by thread: [paparazzi-commits] [paparazzi/paparazzi] a9e5d0: added another diagram for fw auto airspeed control...
Index(es):
- Date
- Thread