paparazzi-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] a74080: Merge pull request #11

From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] a74080: Merge pull request #116 from TobiasMue/devTob_gls
Date: Wed, 18 Jan 2012 06:57:43 -0800 
  Branch: refs/heads/systime
  Home:   https://github.com/paparazzi/paparazzi
  Commit: a7408050025f1bf2d790e228ad3c82c8da3ed309
      
https://github.com/paparazzi/paparazzi/commit/a7408050025f1bf2d790e228ad3c82c8da3ed309
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h

  Log Message:
  -----------
  Merge pull request #116 from TobiasMue/devTob_gls

gps landing routines and new border_line nav routine


  Commit: bb1dcf1352078de0a877bedd1eecf28e17133f6f
      
https://github.com/paparazzi/paparazzi/commit/bb1dcf1352078de0a877bedd1eecf28e17133f6f
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h

  Log Message:
  -----------
  some more doxygen comments


  Commit: d66599129007262b30b50e880c2ae78b4cddd78c
      
https://github.com/paparazzi/paparazzi/commit/d66599129007262b30b50e880c2ae78b4cddd78c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Doxyfile

  Log Message:
  -----------
  doxygen: set JAVADOC_AUTOBRIEF to yes


  Commit: c12f3401a082ef5b016f208a1b1ccd0fec0a3fd6
      
https://github.com/paparazzi/paparazzi/commit/c12f3401a082ef5b016f208a1b1ccd0fec0a3fd6
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/avr/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.c
  M sw/airborne/arch/lpc21/sys_time_hw.c
  M sw/airborne/arch/lpc21/usb_msc_hw.c
  M sw/airborne/arch/lpc21/usb_ser_hw.c
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/omap/mcu_periph/uart_arch.c
  M sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
  M sw/airborne/arch/stm32/mcu_periph/can_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/stm32_vector_table.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/tiny_0.99.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/boards/tiny_2.0.h
  M sw/airborne/boards/tiny_2.1.h
  M sw/airborne/boards/tiny_sim.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/boards/umarim_1.0.h
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_can.c
  M sw/airborne/csc/csc_can.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/bench_sensors.h
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/beth/uart_hw.c
  M sw/airborne/firmwares/beth/uart_hw.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_spi_autopilot_msg.h
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/mcu.c
  M sw/airborne/mcu_periph/i2c.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/pwm_input.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/core/sys_mon.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/AOA_adc.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/print.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_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/test_adcs.c

  Log Message:
  -----------
  #if USE_x instead of #ifdef USE_x


  Commit: b83a9fbd567cff587b3cb661af56469d8ca9dc1e
      
https://github.com/paparazzi/paparazzi/commit/b83a9fbd567cff587b3cb661af56469d8ca9dc1e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/avr/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.c
  M sw/airborne/arch/lpc21/sys_time_hw.c
  M sw/airborne/arch/lpc21/usb_msc_hw.c
  M sw/airborne/arch/lpc21/usb_ser_hw.c
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/omap/mcu_periph/uart_arch.c
  M sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
  M sw/airborne/arch/stm32/mcu_periph/can_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/stm32_vector_table.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/tiny_0.99.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/boards/tiny_2.0.h
  M sw/airborne/boards/tiny_2.1.h
  M sw/airborne/boards/tiny_sim.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/boards/umarim_1.0.h
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_can.c
  M sw/airborne/csc/csc_can.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/bench_sensors.h
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/beth/uart_hw.c
  M sw/airborne/firmwares/beth/uart_hw.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_spi_autopilot_msg.h
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/mcu.c
  M sw/airborne/mcu_periph/i2c.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/pwm_input.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/core/sys_mon.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/AOA_adc.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/print.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_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/test_adcs.c

  Log Message:
  -----------
  Revert "#if USE_x instead of #ifdef USE_x"

somehow this does not work in some cases:
arch/lpc21/mcu_periph/adc_arch.c:32:12: error: #if with no expression

This reverts commit c12f3401a082ef5b016f208a1b1ccd0fec0a3fd6.


  Commit: 3d4935ebc5012a92ecf592373602ffcad243c54b
      
https://github.com/paparazzi/paparazzi/commit/3d4935ebc5012a92ecf592373602ffcad243c54b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  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_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c

  Log Message:
  -----------
  use #if USE_x instead of #ifdef USE_x

Then you can also define e.g. -DUSE_GPS=0 and it will work as expected
(disable it just like as if it would be undefined)
-DUSE_GPS (without a value) has the same effect as -DUSE_GPS=1

Please always use #if instead of #ifdef if it is a flag to enable/disable 
something
and it will always evaluate as a fixed-point arithmetic expression.


  Commit: 6f88d0d243af245e0e49f9bf9555e40dfe38ad1c
      
https://github.com/paparazzi/paparazzi/commit/6f88d0d243af245e0e49f9bf9555e40dfe38ad1c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  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_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c

  Log Message:
  -----------
  Revert "use #if USE_x instead of #ifdef USE_x"
ok, somehow this doesn't work in all cases
This reverts commit 3d4935ebc5012a92ecf592373602ffcad243c54b.


  Commit: 00f8eec9b1dfa98c6a720047c49666db73056e22
      
https://github.com/paparazzi/paparazzi/commit/00f8eec9b1dfa98c6a720047c49666db73056e22
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  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_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c

  Log Message:
  -----------
  use #if USE_x instead of #ifdef USE_x

Then you can also define e.g. -DUSE_GPS=0 and it will work as expected
(disable it just like as if it would be undefined)
-DUSE_GPS (without a value) has the same effect as -DUSE_GPS=1
If you need to define it in the code, use #define USE_GPS 1

Please always use #if instead of #ifdef if it is a flag to enable/disable 
something
and it will always evaluate as an integer arithmetic expression.


  Commit: c14a4506285e1c9f249eb98eb242bf34a0451d00
      
https://github.com/paparazzi/paparazzi/commit/c14a4506285e1c9f249eb98eb242bf34a0451d00
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/navigation/border_line.c
  M sw/airborne/subsystems/navigation/border_line.h
  M sw/airborne/subsystems/navigation/gls.c
  M sw/airborne/subsystems/navigation/gls.h

  Log Message:
  -----------
  whitespace cleanup and doxygen stuff


  Commit: d569370cd346436f2c32d055e86f14c2848b9fc8
      
https://github.com/paparazzi/paparazzi/commit/d569370cd346436f2c32d055e86f14c2848b9fc8
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M Doxyfile
  M conf/autopilot/logger.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h

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


  Commit: cf76b4840388bca493d3524e6d6234026c2f6338
      
https://github.com/paparazzi/paparazzi/commit/cf76b4840388bca493d3524e6d6234026c2f6338
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/navigation/gls.c

  Log Message:
  -----------
  gls: indentation, app_angle in rad instead of deg, #if instead of #ifdef


  Commit: a9119d3d88c9d9ff7ad7c137fba54c87cca94690
      
https://github.com/paparazzi/paparazzi/commit/a9119d3d88c9d9ff7ad7c137fba54c87cca94690
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M Doxyfile
  M conf/autopilot/logger.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.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_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h
  M sw/airborne/subsystems/settings.c

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


Compare: https://github.com/paparazzi/paparazzi/compare/4fbf06b...a9119d3
reply via email to
[Prev in Thread] Current Thread [Next in Thread]