[paparazzi-commits] [paparazzi/paparazzi] 00f8ee: use #if USE_x instead of #ifdef USE_x

[GitHub]

  Branch: refs/heads/dev
  Home:   https://github.com/paparazzi/paparazzi
  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


Compare: https://github.com/paparazzi/paparazzi/compare/6f88d0d...cf76b48