paparazzi-commits
[Top][All Lists]
Advanced

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

[paparazzi-commits] [paparazzi/paparazzi] eda1ea: [boards] add missing d


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] eda1ea: [boards] add missing defines for lisa/l board
Date: Wed, 10 Jul 2013 10:25:48 -0700

  Branch: refs/heads/telemetry
  Home:   https://github.com/paparazzi/paparazzi
  Commit: eda1ea3271ba421612cf5c616ea7af834cbd1c0b
      
https://github.com/paparazzi/paparazzi/commit/eda1ea3271ba421612cf5c616ea7af834cbd1c0b
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M sw/airborne/boards/lisa_l_1.0.h

  Log Message:
  -----------
  [boards] add missing defines for lisa/l board


  Commit: 65d0889ad08fc5f693dfadea12128916385a933f
      
https://github.com/paparazzi/paparazzi/commit/65d0889ad08fc5f693dfadea12128916385a933f
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c

  Log Message:
  -----------
  [rotorcraft] fix stabilization_attitude_read_rc_setpoint_eulers

Reported by Ewoud.
The constants max_phi_scale etc. were zero because it is an integer divide
where the denominator is larger (depending on 
STABILIZATION_ATTITUDE_SP_MAX_PHI).
This causes the euler setpoint to always be zero.

Closes #461


  Commit: b97d8c22366bd29479e94cc3d5c49599299755bf
      
https://github.com/paparazzi/paparazzi/commit/b97d8c22366bd29479e94cc3d5c49599299755bf
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
    R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    M sw/airborne/peripherals/mpu60x0.c
    M sw/airborne/peripherals/mpu60x0.h
    M sw/airborne/peripherals/mpu60x0_i2c.c
    M sw/airborne/peripherals/mpu60x0_i2c.h
    M sw/airborne/peripherals/mpu60x0_regs.h
    M sw/airborne/peripherals/mpu60x0_spi.c
    M sw/airborne/peripherals/mpu60x0_spi.h
    R sw/airborne/subsystems/imu/imu_aspirin_2.c
    R sw/airborne/subsystems/imu/imu_aspirin_2.h
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.h
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
    A sw/airborne/subsystems/imu/imu_mpu60x0_defaults.h

  Log Message:
  -----------
  [peripherals][imu] i2c slaves for the mpu60x0

new IMU drivers using the mpu60x0 peripheral with slave support
- aspirin 2 (spi) driver with mag as real slave
- drotek 10dof v2 with mag as passthrough slave (untested and axes might be 
wrong)

closes #450
closes #190


  Commit: dab1d0ef9e945f21ed0c8d6c04e1debac021a29c
      
https://github.com/paparazzi/paparazzi/commit/dab1d0ef9e945f21ed0c8d6c04e1debac021a29c
  Author: Ewoud <address@hidden(none)>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c

  Log Message:
  -----------
  [rotorcraft] rc euler read in fixed point

closes #462


  Commit: 0195a94b1e9cd0ddb81b48c093bc4364639cf288
      
https://github.com/paparazzi/paparazzi/commit/0195a94b1e9cd0ddb81b48c093bc4364639cf288
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml

  Log Message:
  -----------
  [airframe] updating some ENAC airframes


  Commit: 20588e835080a539ee3981bfa2c949ece30b45d0
      
https://github.com/paparazzi/paparazzi/commit/20588e835080a539ee3981bfa2c949ece30b45d0
  Author: fvantienen <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M conf/airframes/ardrone2_sdk.xml
    A conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
    M sw/airborne/boards/ardrone/at_com.h
    M sw/airborne/boards/ardrone2_sdk.h
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    A sw/airborne/subsystems/gps/gps_ardrone2.c
    A sw/airborne/subsystems/gps/gps_ardrone2.h
    M sw/airborne/subsystems/ins/ins_ardrone2.c

  Log Message:
  -----------
  [rotorcraft ]Added ardrone2 sdk version gps, fixed some bugs.

The GPS receiver from parrot is added for the SDK version of the ardrone2.
This new gps receiver is the flightrecorde from parrot.
Also fixed some bugs in the navdata receive of the SDK version, and added some 
comments to the INS.

Closes #463


  Commit: 1931ec6628e7a961056b59466e8e20cdb6a96a70
      
https://github.com/paparazzi/paparazzi/commit/1931ec6628e7a961056b59466e8e20cdb6a96a70
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c

  Log Message:
  -----------
  cleanup some trailing whitespace


  Commit: cf0dba85effcfd0e3f243803cb090634e7e5f3db
      
https://github.com/paparazzi/paparazzi/commit/cf0dba85effcfd0e3f243803cb090634e7e5f3db
  Author: Dino Hensen <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M conf/airframes/ardrone2_sdk.xml
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  [rotorcraft] check_in_flight without RC

Closes #464
Changes to make ARDrone2 SDK fly without joystick
Still needs to be properly solved as per issue #201


  Commit: f1b84997d5e704d72e41b0bffcc562082ead203b
      
https://github.com/paparazzi/paparazzi/commit/f1b84997d5e704d72e41b0bffcc562082ead203b
  Author: Dino Hensen <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M conf/control_panel.xml.example

  Log Message:
  -----------
  [conf] update example sessions for ARDrone2

Removed Logitech Joystick because users are not going to have it and it will 
cause error messages when they launch it.
Adding notes in Wiki on how to add joystick yourself.
We now only need one session for ardrone2


  Commit: 877963eaf8ca47718fcf3d3517a62b2b9ad76047
      
https://github.com/paparazzi/paparazzi/commit/877963eaf8ca47718fcf3d3517a62b2b9ad76047
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M CHANGELOG.md
    M paparazzi_version

  Log Message:
  -----------
  [release] v5.0 stable version


  Commit: 09c1c295ebae2ac9f94dca33210ee29b20360195
      
https://github.com/paparazzi/paparazzi/commit/09c1c295ebae2ac9f94dca33210ee29b20360195
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M sw/ext/libopencm3

  Log Message:
  -----------
  Updated to newest locm3


  Commit: b0c1c5d30a09eb0e51e26e9d1877c8e1d888028f
      
https://github.com/paparazzi/paparazzi/commit/b0c1c5d30a09eb0e51e26e9d1877c8e1d888028f
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M sw/ext/luftboot

  Log Message:
  -----------
  Updated luftboot to get support for stdint types only.


  Commit: bf604dd2e803af606157abc4f83efa3dca9114d9
      
https://github.com/paparazzi/paparazzi/commit/bf604dd2e803af606157abc4f83efa3dca9114d9
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    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/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/firmwares/beth/overo_sfb_controller.c

  Log Message:
  -----------
  Removed usage of the kernel style int types.


  Commit: c8ad1dd760d971764a51a404e48286400df3466b
      
https://github.com/paparazzi/paparazzi/commit/c8ad1dd760d971764a51a404e48286400df3466b
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    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/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/firmwares/beth/overo_sfb_controller.c
    M sw/ext/libopencm3
    M sw/ext/luftboot

  Log Message:
  -----------
  Merge pull request #466 from esden/locm3_stylefix_update

Locm3 stylefix update


  Commit: bf9cb65f286160498e39b46058e7cc148ad40d2f
      
https://github.com/paparazzi/paparazzi/commit/bf9cb65f286160498e39b46058e7cc148ad40d2f
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/subsystems/imu/imu_um6.c
    M sw/airborne/subsystems/navigation/traffic_info.c

  Log Message:
  -----------
  [dox] doxygen file header fixes


  Commit: 097c923082226f67d4180d9acb1c3e8e2ce845a6
      
https://github.com/paparazzi/paparazzi/commit/097c923082226f67d4180d9acb1c3e8e2ce845a6
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile

  Log Message:
  -----------
  [conf] add pcre lib to NPS

For some reason this needs to be explicitly specified for Ubuntu 13.04,
while it was working without it on 12.04.


  Commit: e4a3316d8102b0ae27cc4e0843e27cab7426e99a
      
https://github.com/paparazzi/paparazzi/commit/e4a3316d8102b0ae27cc4e0843e27cab7426e99a
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c

  Log Message:
  -----------
  [rotorcraft] add missing include so stabilization_attitude_euler_int can be 
used standalone


  Commit: ca67df9576404b536f49e86398fb07390afcf46f
      
https://github.com/paparazzi/paparazzi/commit/ca67df9576404b536f49e86398fb07390afcf46f
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    A conf/airframes/examples/quadrotor_mlkf.xml
    A conf/settings/control/stabilization_att_float_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h

  Log Message:
  -----------
  [rotorcraft] settings and rough example for float ahrs/stabilization


  Commit: 6d2e303633b454e3877dc0a00ea8c364944f84ae
      
https://github.com/paparazzi/paparazzi/commit/6d2e303633b454e3877dc0a00ea8c364944f84ae
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M conf/joystick/ms_sidewinder.xml
    A conf/joystick/xbox_gamepad.xml
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/joystick/ml_sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.h

  Log Message:
  -----------
  [ground_segment] add joystick hat to input2ivy

You can use the Hat<Position>(<hat_name>) function to trigger events,
where <Position> is one of
Centered/Up/Right/Down/Left/RightUp/RightDown/LeftUp/LeftDown

Only one hat can be used, but the interface will allow multiple ones in
the future.

closes #460


  Commit: 4a54cc2ad0b85510fe203fcb9e48f7d659bea868
      
https://github.com/paparazzi/paparazzi/commit/4a54cc2ad0b85510fe203fcb9e48f7d659bea868
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_ivy.c

  Log Message:
  -----------
  [nps] make radio_control type datalink work


  Commit: 5db634255645adfcf6004914ab98614a6ea2983e
      
https://github.com/paparazzi/paparazzi/commit/5db634255645adfcf6004914ab98614a6ea2983e
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M conf/joystick/ms_sidewinder.xml
    M conf/joystick/xbox_gamepad.xml

  Log Message:
  -----------
  [conf] update xbox and sidewinder joystick examples


  Commit: 04a82bf5e651a0a2f2642f90265a54a62fcefb0a
      
https://github.com/paparazzi/paparazzi/commit/04a82bf5e651a0a2f2642f90265a54a62fcefb0a
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-21 (Fri, 21 Jun 2013)

  Changed paths:
    M sw/airborne/peripherals/mpu60x0_i2c.c

  Log Message:
  -----------
  [peripherals] mpu60x0_i2c: only copy ext data if i2c_bypass is false


  Commit: be9d9d1940a819e7dd60dd38a377761049296062
      
https://github.com/paparazzi/paparazzi/commit/be9d9d1940a819e7dd60dd38a377761049296062
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-21 (Fri, 21 Jun 2013)

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

  Log Message:
  -----------
  [imu] fixes for imu_drotek_10dof_v2

- fix copying of unscaled gyro/accel data
- make i2c addresses of mpu and hmc configurable
- change orientation so z-axis is down when chips face up: define 
IMU_DROTEK_2_ORIENTATION_IC_UP
- silence some warnings


  Commit: a3a594c7f4e80ad084acde6f6373eab1313e8378
      
https://github.com/paparazzi/paparazzi/commit/a3a594c7f4e80ad084acde6f6373eab1313e8378
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-06-21 (Fri, 21 Jun 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_fbw.c

  Log Message:
  -----------
  [fix] Yaw command was overwritten by trim.


  Commit: 80b786f3f1a115b5e0b3f4c39fcae4386f4c735f
      
https://github.com/paparazzi/paparazzi/commit/80b786f3f1a115b5e0b3f4c39fcae4386f4c735f
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-06-21 (Fri, 21 Jun 2013)

  Changed paths:
    M sw/airborne/modules/loggers/high_speed_logger_spi_link.c

  Log Message:
  -----------
  [fix] logging wrong channels


  Commit: 2c31f1e5a35300d86cc7a0732905905770db5cdc
      
https://github.com/paparazzi/paparazzi/commit/2c31f1e5a35300d86cc7a0732905905770db5cdc
  Author: Stephen Dwyer <address@hidden>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  [dfu] Small fix to finddevs timeout


  Commit: 4f5a30b07b211fd4057216549975338a0079cb1e
      
https://github.com/paparazzi/paparazzi/commit/4f5a30b07b211fd4057216549975338a0079cb1e
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    A conf/system/preferences.d/paparazzi-uav-ppa

  Log Message:
  -----------
  [system] add apt preference file for lpc21isp package


  Commit: 0c444a0269ee2d8f20ae5a0231e34967a49f9539
      
https://github.com/paparazzi/paparazzi/commit/0c444a0269ee2d8f20ae5a0231e34967a49f9539
  Author: Tobias Muench <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M conf/modules/airspeed_amsys.xml
    M sw/airborne/modules/sensors/airspeed_amsys.c

  Log Message:
  -----------
  additionals to use amsys sensors to measure airspeed


  Commit: d70a058b1a247459444435064b79124d7c966278
      
https://github.com/paparazzi/paparazzi/commit/d70a058b1a247459444435064b79124d7c966278
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M sw/airborne/math/pprz_geodetic_int.c

  Log Message:
  -----------
  [math] fix ecef_of_[ned|enu]_i


  Commit: 1fb3fbb097678292b49e1e5feb4bf3f9ae385dc3
      
https://github.com/paparazzi/paparazzi/commit/1fb3fbb097678292b49e1e5feb4bf3f9ae385dc3
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_ets.h

  Log Message:
  -----------
  [modules] remove unused baro_x_updated vars


  Commit: ffecd0c1575b52b17b79f0c980460cb65c783a74
      
https://github.com/paparazzi/paparazzi/commit/ffecd0c1575b52b17b79f0c980460cb65c783a74
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M sw/airborne/math/pprz_geodetic_int.c

  Log Message:
  -----------
  [math] buf fix on geodetic function


  Commit: 06c4e842abdca8083dd2b1f20758431a6f8e975e
      
https://github.com/paparazzi/paparazzi/commit/06c4e842abdca8083dd2b1f20758431a6f8e975e
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M conf/airframes/ardrone2_sdk.xml
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  [rotorcraft] add MODE_STARTUP to make flying without RC possible

Based on Freek van Tienen's commit, thx.
closes #467 for now


  Commit: fce87d02e1ae1483d78b8a2cdd9ad509eecd7e40
      
https://github.com/paparazzi/paparazzi/commit/fce87d02e1ae1483d78b8a2cdd9ad509eecd7e40
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c

  Log Message:
  -----------
  [lpc21] print error if trying to use SPI0 with HAL


  Commit: a89aac6894eeb45fb7dcd9d73f43074d8fcf7155
      
https://github.com/paparazzi/paparazzi/commit/a89aac6894eeb45fb7dcd9d73f43074d8fcf7155
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M sw/airborne/boards/krooz_sd.h

  Log Message:
  -----------
  [boards][krooz_sd] fix PPM Capture/Compare InterruptEnable define


  Commit: 72ce97b0da7ef84fb06d311ae9d17c5d1d0a39e6
      
https://github.com/paparazzi/paparazzi/commit/72ce97b0da7ef84fb06d311ae9d17c5d1d0a39e6
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/subsystems/settings_arch.c

  Log Message:
  -----------
  [stm32] include stm32/flash.h instead of f1/4 variants


  Commit: 82707b869b2e64222d2aaec64988276dcdf4e89e
      
https://github.com/paparazzi/paparazzi/commit/82707b869b2e64222d2aaec64988276dcdf4e89e
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/boards/krooz_sd.h

  Log Message:
  -----------
  [stm32] F4: fix ppm input timer frequency for TIM2

- krooz: don't use TIM2 for PWM
- change to 6 ticks per usec to fit all frequencies
- on the F1 we assume to run at 72MHz for HCLK and both timer clocks
  TIM1 -> APB2 = HCLK = 72MHz
  TIM2 -> 2 * APB1 = 2 * 36MHz = 72MHz
- on the F4 we assume 2 * AHB clock:
  TIM1 -> 2 * APB2 = 168MHz
  TIM2 -> 2 * APB1 = 84MHz

closes #470


  Commit: 76ea10470167013fed28751a78ef3b409c591704
      
https://github.com/paparazzi/paparazzi/commit/76ea10470167013fed28751a78ef3b409c591704
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M sw/airborne/subsystems/electrical.c

  Log Message:
  -----------
  [electrical] don't try to use ADC_CHANNEL_CURRENT in SITL


  Commit: 2b3a1da82e60ff081579e0c16d7b90052b876576
      
https://github.com/paparazzi/paparazzi/commit/2b3a1da82e60ff081579e0c16d7b90052b876576
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ardrone2_sdk.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    A conf/airframes/examples/quadrotor_mlkf.xml
    M conf/control_panel.xml.example
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    A conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
    R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    M conf/joystick/ms_sidewinder.xml
    A conf/joystick/xbox_gamepad.xml
    M conf/modules/airspeed_amsys.xml
    A conf/settings/control/stabilization_att_float_quat.xml
    A conf/system/preferences.d/paparazzi-uav-ppa
    M paparazzi_version
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_arch.c
    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/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    M sw/airborne/boards/ardrone/at_com.h
    M sw/airborne/boards/ardrone2_sdk.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/firmwares/beth/overo_sfb_controller.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_ets.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/peripherals/mpu60x0.c
    M sw/airborne/peripherals/mpu60x0.h
    M sw/airborne/peripherals/mpu60x0_i2c.c
    M sw/airborne/peripherals/mpu60x0_i2c.h
    M sw/airborne/peripherals/mpu60x0_regs.h
    M sw/airborne/peripherals/mpu60x0_spi.c
    M sw/airborne/peripherals/mpu60x0_spi.h
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    M sw/airborne/subsystems/electrical.c
    A sw/airborne/subsystems/gps/gps_ardrone2.c
    A sw/airborne/subsystems/gps/gps_ardrone2.h
    R sw/airborne/subsystems/imu/imu_aspirin_2.c
    R sw/airborne/subsystems/imu/imu_aspirin_2.h
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.h
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
    A sw/airborne/subsystems/imu/imu_mpu60x0_defaults.h
    M sw/airborne/subsystems/imu/imu_um6.c
    M sw/airborne/subsystems/ins/ins_ardrone2.c
    M sw/airborne/subsystems/navigation/traffic_info.c
    M sw/ext/libopencm3
    M sw/ext/luftboot
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/joystick/ml_sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_ivy.c
    M sw/tools/dfu/stm32_mem.py

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

Conflicts:
        sw/airborne/firmwares/rotorcraft/autopilot.c


Compare: 
https://github.com/paparazzi/paparazzi/compare/427fe0c45b0b...2b3a1da82e60

reply via email to

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