[paparazzi-commits] [paparazzi/paparazzi] 9ecb94: Merge remote branch 'gautier/multi_select' into ma...

[noreply]

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

Commit: 9ecb9457edb754c22ecdbf1ce38e7e0965c2de6e
    
https://github.com/paparazzi/paparazzi/commit/9ecb9457edb754c22ecdbf1ce38e7e0965c2de6e
Author: Felix Ruess <address@hidden>
Date:   2010-12-21 (Tue, 21 Dec 2010)

Changed paths:
  M sw/lib/ocaml/gtk_tools.ml
  M sw/lib/ocaml/gtk_tools.mli
  M sw/supervision/paparazzicenter.glade
  M sw/supervision/pc_aircraft.ml

Log Message:
-----------
Merge remote branch 'gautier/multi_select' into master. Closes gh-6.


Commit: d33066189465bb8b2339665696753a91a807e886
    
https://github.com/paparazzi/paparazzi/commit/d33066189465bb8b2339665696753a91a807e886
Author: Christophe De Wagter <address@hidden>
Date:   2010-12-21 (Tue, 21 Dec 2010)

Changed paths:
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  A conf/radios/mc22.xml
  A sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
  A sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
  R sw/airborne/arch/stm32/peripherals/hmc8543_arch.c
  R sw/airborne/arch/stm32/peripherals/hmc8543_arch.h
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/fms/overo_test_passthrough.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_led.c
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_uart.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_telemetry.c

Log Message:
-----------
Fixed as many Lisa Test Progs as possible...


Commit: 3f0e39e7cce7bc5b643fa3a6224a9d97077fe789
    
https://github.com/paparazzi/paparazzi/commit/3f0e39e7cce7bc5b643fa3a6224a9d97077fe789
Author: Gautier Hattenberger <address@hidden>
Date:   2010-12-21 (Tue, 21 Dec 2010)

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

Log Message:
-----------
make sure altgraph drawing function is not called if the widget is not
loaded


Commit: 199894f9f30ed338f42e323a22ec6f113c39e2c5
    
https://github.com/paparazzi/paparazzi/commit/199894f9f30ed338f42e323a22ec6f113c39e2c5
Author: Gautier Hattenberger <address@hidden>
Date:   2010-12-21 (Tue, 21 Dec 2010)

Changed paths:
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  A conf/radios/mc22.xml
  A sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
  A sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
  R sw/airborne/arch/stm32/peripherals/hmc8543_arch.c
  R sw/airborne/arch/stm32/peripherals/hmc8543_arch.h
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/fms/overo_test_passthrough.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_led.c
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_uart.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_telemetry.c

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


Commit: 7746f13eb4ae905f7981ff064765d601d96d438a
    
https://github.com/paparazzi/paparazzi/commit/7746f13eb4ae905f7981ff064765d601d96d438a
Author: Felix Ruess <address@hidden>
Date:   2010-12-21 (Tue, 21 Dec 2010)

Changed paths:
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  M sw/airborne/subsystems/ins.c

Log Message:
-----------
correct comments, booz2_datalink.c is now datalink.c


Commit: 3c45b0fd6a949d79997fd38606969abe6381ec87
    
https://github.com/paparazzi/paparazzi/commit/3c45b0fd6a949d79997fd38606969abe6381ec87
Author: Christophe De Wagter <address@hidden>
Date:   2010-12-21 (Tue, 21 Dec 2010)

Changed paths:
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/sitl.makefile
  M conf/autopilot/sitl_jsbsim.makefile
  M conf/autopilot/sitl_link_pprz.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/boards/booz_1.0.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  A conf/radios/mc22.xml
  M sw/airborne/arch/lpc21/peripherals/max1168_arch.c
  A sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
  A sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
  R sw/airborne/arch/stm32/peripherals/hmc8543_arch.c
  R sw/airborne/arch/stm32/peripherals/hmc8543_arch.h
  M sw/airborne/arch/stm32/peripherals/max1168_arch.c
  M sw/airborne/boards/lisa_l/test_baro.c
  R sw/airborne/booz/booz2_datalink.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  R sw/airborne/datalink.c
  A sw/airborne/firmwares/fixedwing/datalink.c
  A sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/fms/overo_test_passthrough.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_led.c
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_uart.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_telemetry.c
  M sw/ground_segment/cockpit/live.ml
  M sw/lib/ocaml/gtk_tools.ml
  M sw/lib/ocaml/gtk_tools.mli
  M sw/supervision/paparazzicenter.glade
  M sw/supervision/pc_aircraft.ml

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