[paparazzi-commits] [paparazzi/paparazzi] 626f50: Merge branch 'master' into CHIMU

[noreply]

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

Commit: 626f500c0cd4e5e95a8658371d312072803edc70
    
https://github.com/paparazzi/paparazzi/commit/626f500c0cd4e5e95a8658371d312072803edc70
Author: Christophe De Wagter <address@hidden>
Date:   2011-04-21 (Thu, 21 Apr 2011)

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


Commit: 73d7af9e49a9dd3b1be9411b129ee78c92904781
    
https://github.com/paparazzi/paparazzi/commit/73d7af9e49a9dd3b1be9411b129ee78c92904781
Author: Christophe De Wagter <address@hidden>
Date:   2011-04-21 (Thu, 21 Apr 2011)

Changed paths:
  M .gitignore
  M Makefile
  M conf/airframes/LAAS/mmlaas_N1.xml
  A conf/airframes/LAAS/mmlaas_N1_carto_cam.xml
  R conf/airframes/Poine/booz2_a6.xml
  A conf/airframes/Poine/h_hex.xml
  A conf/airframes/esden/calib/aspirin_012.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/control_panel.xml.example
  R conf/flight_plans/basic_booz.xml
  A conf/flight_plans/rotorcraft_basic.xml
  A conf/flight_plans/versatile_carto_fixe_muret.xml
  A conf/joystick/attack3_booz_nav.xml
  A conf/joystick/aurora_skate_controller.xml
  A conf/joystick/cockpit_sx.xml
  A conf/joystick/ikarus_usb.xml
  A conf/joystick/logitech_dual_action.xml
  A conf/joystick/logitech_f710.xml
  A conf/joystick/ngs_set_actuators.xml
  A conf/joystick/xbox_booz_nav.xml
  M conf/messages.xml
  A conf/modules/cartography.xml
  M conf/modules/ins_arduimu_basic.xml
  M conf/settings/tuning_ctl_new.xml
  A sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
  M sw/airborne/arch/stm32/mcu_arch.c
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/ADC.pde
  M sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/DCM.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_pprz.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/Output.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/arduimu_basic.pde
  A sw/airborne/modules/cartography/cartography.c
  A sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/subsystems/radio_control/rc_datalink.c
  M sw/airborne/subsystems/radio_control/rc_datalink.h
  M sw/ground_segment/joystick/README
  R sw/ground_segment/joystick/attack3_booz_nav.xml
  M sw/ground_segment/joystick/input2ivy.ml
  R sw/ground_segment/joystick/ngs_set_actuators.xml
  M sw/ground_segment/joystick/usb_stick.c
  M sw/ground_segment/joystick/usb_stick.h
  R sw/ground_segment/joystick/xbox_booz_nav.xml
  A sw/ground_segment/misc/Makefile
  A sw/ground_segment/misc/davis2ivy.c
  A sw/ground_segment/misc/readme.txt

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


Commit: 223e3310505cf9604df30604a6c774ed8415a1ab
    
https://github.com/paparazzi/paparazzi/commit/223e3310505cf9604df30604a6c774ed8415a1ab
Author: Christophe De Wagter <address@hidden>
Date:   2011-04-21 (Thu, 21 Apr 2011)

Changed paths:
  M conf/modules/ins_arduimu_basic.xml
  A sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
  M sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/DCM.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_pprz.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/arduimu_basic.pde
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/ground_segment/joystick/input2ivy.ml

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


Commit: bcf40abd95e39e6f8803531ce9e6c6a8f27d7170
    
https://github.com/paparazzi/paparazzi/commit/bcf40abd95e39e6f8803531ce9e6c6a8f27d7170
Author: Christophe De Wagter <address@hidden>
Date:   2011-04-21 (Thu, 21 Apr 2011)

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

Log Message:
-----------
Chimu Cleanup


Compare: https://github.com/paparazzi/paparazzi/compare/cd17ba3...bcf40ab