paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] 33d59c: some more downlink mac


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] 33d59c: some more downlink macros adapted
Date: Tue, 24 Jan 2012 16:41:19 -0800

  Branch: refs/heads/systime_i2c
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 33d59cd8ddc925f998d6082b2a995babf8361e9a
      
https://github.com/paparazzi/paparazzi/commit/33d59cd8ddc925f998d6082b2a995babf8361e9a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/estimator.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/pprz_debug.h

  Log Message:
  -----------
  some more downlink macros adapted


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

  Changed paths:
    R sw/airborne/modules/deploy_sonar_buoy.h

  Log Message:
  -----------
  removed duplicate header file of deploy_sonar_buoy


  Commit: 007fc67275d48762e60ea11c948d6a4b3de27c46
      
https://github.com/paparazzi/paparazzi/commit/007fc67275d48762e60ea11c948d6a4b3de27c46
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  M conf/telemetry/telemetry.dtd
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/modules/MPPT/MPPT.c
  M sw/airborne/modules/MPPT/sim_MPPT.c
  M sw/airborne/modules/adcs/adc_generic.c
  M sw/airborne/modules/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/modules/core/sys_mon.c
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h
  M sw/airborne/modules/datalink/xtend_rssi.c
  M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
  M sw/airborne/modules/enose/enose.c
  M sw/airborne/modules/gps/gps_ubx_ucenter.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/max3100/max3100_hw.c
  M sw/airborne/modules/meteo/charge_sens.c
  M sw/airborne/modules/meteo/dust_gp2y.c
  M sw/airborne/modules/meteo/geiger_counter.c
  M sw/airborne/modules/meteo/humid_dpicco.c
  M sw/airborne/modules/meteo/humid_hih.c
  M sw/airborne/modules/meteo/humid_htm_b71.c
  M sw/airborne/modules/meteo/humid_pcap01.c
  M sw/airborne/modules/meteo/humid_sht.c
  M sw/airborne/modules/meteo/humid_sht_i2c.c
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/light_solar.c
  M sw/airborne/modules/meteo/light_temt.c
  M sw/airborne/modules/meteo/temp_lm75.c
  M sw/airborne/modules/meteo/temp_tcouple_adc.c
  M sw/airborne/modules/meteo/temp_temod.c
  M sw/airborne/modules/meteo/temp_tmp102.c
  M sw/airborne/modules/meteo/wind_gfi.c
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/multi/formation.c
  M sw/airborne/modules/multi/potential.c
  M sw/airborne/modules/multi/tcas.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/alt_srf08.c
  M sw/airborne/modules/sensors/baro_MS5534A.c
  M sw/airborne/modules/sensors/baro_amsys.c
  M sw/airborne/modules/sensors/baro_bmp.c
  M sw/airborne/modules/sensors/baro_ets.c
  M sw/airborne/modules/sensors/baro_ms5611_i2c.c
  M sw/airborne/modules/sensors/baro_scp.c
  M sw/airborne/modules/sensors/baro_scp_i2c.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/modules/sensors/mag_hmc5843.c
  M sw/airborne/modules/sensors/mag_hmc58xx.c
  M sw/airborne/modules/sensors/mag_micromag_fw.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/datalink/datalink.h
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/datalink/pprz_transport.c
  M sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/datalink/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_telemetry.c
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

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

Conflicts:
        sw/airborne/firmwares/fixedwing/ap_downlink.h
        sw/airborne/firmwares/rotorcraft/telemetry.h


  Commit: 63119004a21b83cdfe1d1908bd557fc775f9163b
      
https://github.com/paparazzi/paparazzi/commit/63119004a21b83cdfe1d1908bd557fc775f9163b
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    R sw/airborne/modules/deploy_sonar_buoy.h

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/dev' into dev


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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  rotorcraft telemetry: #if USE_CAM instead of #ifdef USE_CAM


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

  Changed paths:
    M sw/airborne/modules/digital_cam/dc.h

  Log Message:
  -----------
  indentation for dc.h


  Commit: 4afcaca867eb93a4811e7f5ade8755c538c3b408
      
https://github.com/paparazzi/paparazzi/commit/4afcaca867eb93a4811e7f5ade8755c538c3b408
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  M conf/telemetry/telemetry.dtd
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/modules/MPPT/MPPT.c
  M sw/airborne/modules/MPPT/sim_MPPT.c
  M sw/airborne/modules/adcs/adc_generic.c
  M sw/airborne/modules/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/modules/core/sys_mon.c
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h
  M sw/airborne/modules/datalink/xtend_rssi.c
  R sw/airborne/modules/deploy_sonar_buoy.h
  M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
  M sw/airborne/modules/enose/enose.c
  M sw/airborne/modules/gps/gps_ubx_ucenter.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/max3100/max3100_hw.c
  M sw/airborne/modules/meteo/charge_sens.c
  M sw/airborne/modules/meteo/dust_gp2y.c
  M sw/airborne/modules/meteo/geiger_counter.c
  M sw/airborne/modules/meteo/humid_dpicco.c
  M sw/airborne/modules/meteo/humid_hih.c
  M sw/airborne/modules/meteo/humid_htm_b71.c
  M sw/airborne/modules/meteo/humid_pcap01.c
  M sw/airborne/modules/meteo/humid_sht.c
  M sw/airborne/modules/meteo/humid_sht_i2c.c
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/light_solar.c
  M sw/airborne/modules/meteo/light_temt.c
  M sw/airborne/modules/meteo/temp_lm75.c
  M sw/airborne/modules/meteo/temp_tcouple_adc.c
  M sw/airborne/modules/meteo/temp_temod.c
  M sw/airborne/modules/meteo/temp_tmp102.c
  M sw/airborne/modules/meteo/wind_gfi.c
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/multi/formation.c
  M sw/airborne/modules/multi/potential.c
  M sw/airborne/modules/multi/tcas.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/alt_srf08.c
  M sw/airborne/modules/sensors/baro_MS5534A.c
  M sw/airborne/modules/sensors/baro_amsys.c
  M sw/airborne/modules/sensors/baro_bmp.c
  M sw/airborne/modules/sensors/baro_ets.c
  M sw/airborne/modules/sensors/baro_ms5611_i2c.c
  M sw/airborne/modules/sensors/baro_scp.c
  M sw/airborne/modules/sensors/baro_scp_i2c.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/modules/sensors/mag_hmc5843.c
  M sw/airborne/modules/sensors/mag_hmc58xx.c
  M sw/airborne/modules/sensors/mag_micromag_fw.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/datalink/datalink.h
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/datalink/pprz_transport.c
  M sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/datalink/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_telemetry.c
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

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


  Commit: 71a0b8e6a275fbe2a77f4aa0c58ef356269e6e22
      
https://github.com/paparazzi/paparazzi/commit/71a0b8e6a275fbe2a77f4aa0c58ef356269e6e22
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
  M sw/airborne/mcu_periph/sys_time.c
  M sw/airborne/mcu_periph/sys_time.h

  Log Message:
  -----------
  added doxygen file cmd


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

  Changed paths:
    M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h

  Log Message:
  -----------
  fix sim: define USEC_OF_RC_PPM_TICKS instead of USEC_OF_RC_PPM_TICS


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

  Changed paths:
    A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  M conf/telemetry/telemetry.dtd
  M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/mcu_periph/sys_time.c
  M sw/airborne/mcu_periph/sys_time.h
  M sw/airborne/modules/MPPT/MPPT.c
  M sw/airborne/modules/MPPT/sim_MPPT.c
  M sw/airborne/modules/adcs/adc_generic.c
  M sw/airborne/modules/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/modules/core/sys_mon.c
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h
  M sw/airborne/modules/datalink/xtend_rssi.c
  R sw/airborne/modules/deploy_sonar_buoy.h
  M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
  M sw/airborne/modules/enose/enose.c
  M sw/airborne/modules/gps/gps_ubx_ucenter.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/max3100/max3100_hw.c
  M sw/airborne/modules/meteo/charge_sens.c
  M sw/airborne/modules/meteo/dust_gp2y.c
  M sw/airborne/modules/meteo/geiger_counter.c
  M sw/airborne/modules/meteo/humid_dpicco.c
  M sw/airborne/modules/meteo/humid_hih.c
  M sw/airborne/modules/meteo/humid_htm_b71.c
  M sw/airborne/modules/meteo/humid_pcap01.c
  M sw/airborne/modules/meteo/humid_sht.c
  M sw/airborne/modules/meteo/humid_sht_i2c.c
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/light_solar.c
  M sw/airborne/modules/meteo/light_temt.c
  M sw/airborne/modules/meteo/temp_lm75.c
  M sw/airborne/modules/meteo/temp_tcouple_adc.c
  M sw/airborne/modules/meteo/temp_temod.c
  M sw/airborne/modules/meteo/temp_tmp102.c
  M sw/airborne/modules/meteo/wind_gfi.c
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/multi/formation.c
  M sw/airborne/modules/multi/potential.c
  M sw/airborne/modules/multi/tcas.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/alt_srf08.c
  M sw/airborne/modules/sensors/baro_MS5534A.c
  M sw/airborne/modules/sensors/baro_amsys.c
  M sw/airborne/modules/sensors/baro_bmp.c
  M sw/airborne/modules/sensors/baro_ets.c
  M sw/airborne/modules/sensors/baro_ms5611_i2c.c
  M sw/airborne/modules/sensors/baro_scp.c
  M sw/airborne/modules/sensors/baro_scp_i2c.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/modules/sensors/mag_hmc5843.c
  M sw/airborne/modules/sensors/mag_hmc58xx.c
  M sw/airborne/modules/sensors/mag_micromag_fw.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/datalink/datalink.h
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/datalink/pprz_transport.c
  M sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/datalink/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_telemetry.c
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

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


Compare: https://github.com/paparazzi/paparazzi/compare/3a4fdeb...870f1de

reply via email to

[Prev in Thread] Current Thread [Next in Thread]