[paparazzi-commits] [paparazzi/paparazzi] 4c12e4: Merge remote branch 'paparazzi/param-names'

[noreply]

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

Commit: 4c12e4bb0e997b567e95e13988d32baffbb41d82
    
https://github.com/paparazzi/paparazzi/commit/4c12e4bb0e997b567e95e13988d32baffbb41d82
Author: Felix Ruess <address@hidden>
Date:   2010-12-22 (Wed, 22 Dec 2010)

Changed paths:
  M conf/airframes/AirborneCodeReorg/LisaFw.xml
  M conf/airframes/AirborneCodeReorg/TinyFw.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  A conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  A conf/airframes/ENAC/quadrotor/g1_vision.xml
  A conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  A conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/yapa_xsens.xml
  M conf/airframes/airframe.dtd
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/microjet_example.xml
  M conf/autopilot/fixedwing.xml
  M conf/autopilot/rotorcraft.xml
  M conf/modules/adc_generic.xml
  M conf/modules/airspeed_adc.xml
  M conf/modules/airspeed_ets.xml
  M conf/modules/alt_srf08.xml
  M conf/modules/baro_MS5534A.xml
  M conf/modules/baro_bmp.xml
  M conf/modules/baro_scp.xml
  M conf/modules/baro_scp_i2c.xml
  M conf/modules/booz_cam.xml
  M conf/modules/booz_drop.xml
  M conf/modules/booz_extra_dl.xml
  M conf/modules/cam_point.xml
  M conf/modules/cam_roll.xml
  M conf/modules/demo_module.xml
  M conf/modules/digital_cam.xml
  M conf/modules/digital_cam_i2c.xml
  M conf/modules/enose.xml
  M conf/modules/humid_hih.xml
  M conf/modules/infrared_i2c.xml
  M conf/modules/ins_xsens_MTiG_Uart0.xml
  M conf/modules/ins_xsens_MTiG_fixedwing.xml
  M conf/modules/ins_xsens_MTi_Uart0.xml
  M conf/modules/lcd_dogm.xml
  M conf/modules/light.xml
  M conf/modules/light_temt.xml
  M conf/modules/mag_micromag_fw.xml
  M conf/modules/max11040.xml
  M conf/modules/module.dtd
  M conf/modules/sonar_maxbotix_booz.xml
  M conf/modules/tcas.xml
  M conf/modules/trig_test.xml
  M conf/modules/trigger_ext.xml
  M conf/modules/twog_extra_dl.xml
  M conf/modules/vehicle_interface_overo_link.xml
  M conf/modules/wind_gfi.xml
  M conf/modules/windturbine.xml
  M sw/tools/gen_aircraft.ml

Log Message:
-----------
Merge remote branch 'paparazzi/param-names'


Commit: a6487cf9c3ec5b23f31d0e0ceb61e4703805770d
    
https://github.com/paparazzi/paparazzi/commit/a6487cf9c3ec5b23f31d0e0ceb61e4703805770d
Author: Felix Ruess <address@hidden>
Date:   2010-12-23 (Thu, 23 Dec 2010)

Changed paths:
  M conf/airframes/easy_glider_example.xml

Log Message:
-----------
update easy_glider_example, adc_generic is not a subsystem anymore but a module


Commit: 5ddebd6c8dfd85cda941eb2aaca5d006fca206d3
    
https://github.com/paparazzi/paparazzi/commit/5ddebd6c8dfd85cda941eb2aaca5d006fca206d3
Author: Felix Ruess <address@hidden>
Date:   2010-12-23 (Thu, 23 Dec 2010)

Changed paths:
  M conf/airframes/mentor_tum.xml

Log Message:
-----------
fix module defines in mentor airframe file


Commit: 7bb9ea839a898b7971f361ee935f79324c8d7fcb
    
https://github.com/paparazzi/paparazzi/commit/7bb9ea839a898b7971f361ee935f79324c8d7fcb
Author: Felix Ruess <address@hidden>
Date:   2010-12-23 (Thu, 23 Dec 2010)

Changed paths:
  M conf/modules/adc_generic.xml

Log Message:
-----------
update adc_generic xml after parameter name unification