[paparazzi-commits] [paparazzi/paparazzi] 0a9353: Merge branch 'master' of github.com:paparazzi/papa...

[noreply]

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi

  Commit: 0a93537c727992915c7072d2e300f3744e6d1861
      
https://github.com/paparazzi/paparazzi/commit/0a93537c727992915c7072d2e300f3744e6d1861
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    A conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/messages.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/inter_mcu.h
  M sw/ground_segment/cockpit/live.ml
  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/rotorcraft_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi


  Commit: 4a6eeae45625d1c9470a7083eff43528463efec6
      
https://github.com/paparazzi/paparazzi/commit/4a6eeae45625d1c9470a7083eff43528463efec6
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  discovery airframe: enable ets airspeeds sensor and use different vic slot 
for i2c0 as slot 9 is already in use by imu


  Commit: c87be8a41e8ab910c942a410e01fb588857a7c65
      
https://github.com/paparazzi/paparazzi/commit/c87be8a41e8ab910c942a410e01fb588857a7c65
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    A conf/settings/tuning_ctl_adaptive.xml

  Log Message:
  -----------
  added settings file to tune adaptive control (without airspeed)


  Commit: e7f4281da0838fb632ddac19257d667554bfe598
      
https://github.com/paparazzi/paparazzi/commit/e7f4281da0838fb632ddac19257d667554bfe598
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M conf/telemetry/default_fixedwing_imu.xml

  Log Message:
  -----------
  default fw imu telemetry: send desired with higher rate, don't send raw 
values in default mode (use debug imu for that)


  Commit: 9cae0a30014208adc04e613aba27cbc20a02054f
      
https://github.com/paparazzi/paparazzi/commit/9cae0a30014208adc04e613aba27cbc20a02054f
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c

  Log Message:
  -----------
  some fixes for ins modules to use new gps interface


Compare: https://github.com/paparazzi/paparazzi/compare/d1c02eb...9cae0a3