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

[paparazzi-commits] [paparazzi/paparazzi] 972d4a: Use usart_set_baudrate

From: noreply
Subject: [paparazzi-commits] [paparazzi/paparazzi] 972d4a: Use usart_set_baudrate to get correct bitrate for ...
Date: Tue, 22 Mar 2011 12:57:20 -0700 
Branch: refs/heads/dev
Home:   https://github.com/paparazzi/paparazzi

Commit: 972d4a72fdd2b4ea146fe72f0c981874b512405c
    
https://github.com/paparazzi/paparazzi/commit/972d4a72fdd2b4ea146fe72f0c981874b512405c
Author: Allen <address@hidden>
Date:   2011-03-15 (Tue, 15 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c

Log Message:
-----------
Use usart_set_baudrate to get correct bitrate for lis/m


Commit: 660a802d828841d9db6f80d12927610279df21e7
    
https://github.com/paparazzi/paparazzi/commit/660a802d828841d9db6f80d12927610279df21e7
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

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

Log Message:
-----------
remove startup delay


Commit: 59ae731649c04b9237a2f8359d12ce041b4eaf16
    
https://github.com/paparazzi/paparazzi/commit/59ae731649c04b9237a2f8359d12ce041b4eaf16
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  A conf/settings/pbn.xml
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h

Log Message:
-----------
update pressure board sensor and settings


Commit: 418745863ef3ec376282e9a3000b52df436cb0ff
    
https://github.com/paparazzi/paparazzi/commit/418745863ef3ec376282e9a3000b52df436cb0ff
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/Makefile.stm32
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/boards/lisa_m_1.0.h

Log Message:
-----------
Merge remote branch 'paparazzi/master'


Commit: dab24945b8f73b2bf016a54ae862d3980c87dd74
    
https://github.com/paparazzi/paparazzi/commit/dab24945b8f73b2bf016a54ae862d3980c87dd74
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/settings/fw_ctl_n.xml
  M conf/telemetry/fw_h_ctl_a.xml
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h

Log Message:
-----------
update adaptive control loops
traj ref is not used by default
airspeed ratio is used whith USE_AIRSPEED

Conflicts:

        conf/settings/fw_ctl_n.xml


Commit: 7aab04c094d22e4ac3fd109c0d316dbe1f535c32
    
https://github.com/paparazzi/paparazzi/commit/7aab04c094d22e4ac3fd109c0d316dbe1f535c32
Author: Felix Ruess <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/Makefile.stm32
  M conf/boards/lisa_m_1.0.makefile

Log Message:
-----------
only link against opencm3_stm32 for lisa/m right now


Commit: 57a81a203f7cbc1d8fb6937602f86f13b35abfc8
    
https://github.com/paparazzi/paparazzi/commit/57a81a203f7cbc1d8fb6937602f86f13b35abfc8
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c

Log Message:
-----------
Be sure to enable GPIO banks relevant to uart during init (reported by
    antoine)


Commit: e276182ab51ff151531700e5e4bb887d09ad60e1
    
https://github.com/paparazzi/paparazzi/commit/e276182ab51ff151531700e5e4bb887d09ad60e1
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c

Log Message:
-----------
Add declaration for set_baudrate function to silence warning for now


Commit: da30664b231f7c6fca049f2dd31c5a78b3daa581
    
https://github.com/paparazzi/paparazzi/commit/da30664b231f7c6fca049f2dd31c5a78b3daa581
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/mcu_periph/uart.h

Log Message:
-----------
Add support for UART5 (for lisa/m)


Commit: 4ee1023c825e3c992043391dd6c1d99c066265d6
    
https://github.com/paparazzi/paparazzi/commit/4ee1023c825e3c992043391dd6c1d99c066265d6
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/autopilot/lisa_m_test_progs.makefile
  M sw/airborne/lisa/test_uart_lisam.c

Log Message:
-----------
Add UART5 to lisa/m uart test program


Commit: 64a7cdff211cf8b67c20505a5cc770d455867e1e
    
https://github.com/paparazzi/paparazzi/commit/64a7cdff211cf8b67c20505a5cc770d455867e1e
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/lisa/test_servos.c

Log Message:
-----------
Use ACTUATORS_PWM_NB in test_servos (to deal with varying number of
    servos)


Commit: c2e745b1f9c0e7bb7c37e42accc85fbeae7203d5
    
https://github.com/paparazzi/paparazzi/commit/c2e745b1f9c0e7bb7c37e42accc85fbeae7203d5
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/lisa_m_test_progs.makefile

Log Message:
-----------
Enable test_servos for lisa_m


Commit: 87c9cf7ee57031be8ef7b3a7c100c52e93116477
    
https://github.com/paparazzi/paparazzi/commit/87c9cf7ee57031be8ef7b3a7c100c52e93116477
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h

Log Message:
-----------
Add option to enable servos 7/8 for lisa_m, and move timer assignment
for servos 5/6 into board specific header file


Commit: 654ac19a18912ccd7d35135f2339cd866ffa0e8b
    
https://github.com/paparazzi/paparazzi/commit/654ac19a18912ccd7d35135f2339cd866ffa0e8b
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c

Log Message:
-----------
Generalize PWM5/6 output channel number via #define


Commit: 0de267d3564036d62d01a50fb3bac236ca57813c
    
https://github.com/paparazzi/paparazzi/commit/0de267d3564036d62d01a50fb3bac236ca57813c
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

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

Log Message:
-----------
Set PWM5/6 on timer channels 1/2 for lisa_m


Commit: 950b8b53139fe438756e2ae520ad4ce3fbc5a0fe
    
https://github.com/paparazzi/paparazzi/commit/950b8b53139fe438756e2ae520ad4ce3fbc5a0fe
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c

Log Message:
-----------
Move GPIO setup for PWM5/6 into board config


Commit: 2d8df816ced15e114e32eba4fd79cda90071110b
    
https://github.com/paparazzi/paparazzi/commit/2d8df816ced15e114e32eba4fd79cda90071110b
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/autopilot/lisa_m_test_progs.makefile
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c

Log Message:
-----------
Enable PWM 7/8 for lisa/m test servos


Commit: 45ceef1ef132fc675a49d91fa0de3712b487d1b9
    
https://github.com/paparazzi/paparazzi/commit/45ceef1ef132fc675a49d91fa0de3712b487d1b9
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c

Log Message:
-----------
Fix types in set_baudrate prototype for stm32 uart_arch.c


Commit: 0e9b09ad501ab39acbba9793bc6badc1837a5c7f
    
https://github.com/paparazzi/paparazzi/commit/0e9b09ad501ab39acbba9793bc6badc1837a5c7f
Author: Allen <address@hidden>
Date:   2011-03-16 (Wed, 16 Mar 2011)

Changed paths:
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/lisa_m_test_progs.makefile

Log Message:
-----------
Enable test_telemetry test program for lisa/m


Commit: 1ec2d78c47c91c56b87b012401c57e7ba8dbdb7c
    
https://github.com/paparazzi/paparazzi/commit/1ec2d78c47c91c56b87b012401c57e7ba8dbdb7c
Author: Antoine Drouin <address@hidden>
Date:   2011-03-17 (Thu, 17 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m_1.0.h

Log Message:
-----------
nammed ADC lines to make driver work with lisa/M and lisa/L


Commit: 3e1fcb4a8cb4474297dbce204abb5b96971568ec
    
https://github.com/paparazzi/paparazzi/commit/3e1fcb4a8cb4474297dbce204abb5b96971568ec
Author: Antoine Drouin <address@hidden>
Date:   2011-03-17 (Thu, 17 Mar 2011)

Changed paths:
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  A conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  A conf/autopilot/lisa_m_test_progs.makefile
  A conf/autopilot/lisa_m_test_progs.xml
  M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/modules/ins_arduimu.xml
  M conf/settings/fw_ctl_n.xml
  A conf/settings/pbn.xml
  M conf/telemetry/fw_h_ctl_a.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  A sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/stm32/led_hw.h
  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/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/boards/lisa_l_1.0.h
  A sw/airborne/boards/lisa_m/baro_board.c
  A sw/airborne/boards/lisa_m/baro_board.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  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/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/lisa/test_led.c
  M sw/airborne/lisa/test_servos.c
  A sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.h
  M sw/airborne/math/pprz_geodetic_int.h
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/peripherals/ami601.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_geodetic.c
  M sw/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

Log Message:
-----------
solved conflict with LED
Merge branch 'master' of github.com:paparazzi/paparazzi

Conflicts:
        sw/airborne/boards/lisa_m_1.0.h


Commit: 370a21f9be5ffa7bf5cbb90727196b913c2dc96d
    
https://github.com/paparazzi/paparazzi/commit/370a21f9be5ffa7bf5cbb90727196b913c2dc96d
Author: lamestllama <address@hidden>
Date:   2011-03-17 (Thu, 17 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c

Log Message:
-----------
update spektrum parser to suit lisa m


Commit: e69ea20d4b5b62bad891996e7b8269823738d050
    
https://github.com/paparazzi/paparazzi/commit/e69ea20d4b5b62bad891996e7b8269823738d050
Author: lamestllama <address@hidden>
Date:   2011-03-17 (Thu, 17 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c

Log Message:
-----------
updated spektrum_arch.c to use pprz_usart_set_baudrate


Commit: e408d4e8afe1c500b529aba34f50564d23a6258c
    
https://github.com/paparazzi/paparazzi/commit/e408d4e8afe1c500b529aba34f50564d23a6258c
Author: lamestllama <address@hidden>
Date:   2011-03-17 (Thu, 17 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h

Log Message:
-----------
updated spektrum_arch.c to use pprz_usart_set_baudrate


Commit: 3c75e02ab04fa17f9a14ec1baae96a0fd1c96049
    
https://github.com/paparazzi/paparazzi/commit/3c75e02ab04fa17f9a14ec1baae96a0fd1c96049
Author: lamestllama <address@hidden>
Date:   2011-03-17 (Thu, 17 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m_1.0.h

Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi


Commit: d7d3fcb61963c2048338c47a64fcee746e32a7cd
    
https://github.com/paparazzi/paparazzi/commit/d7d3fcb61963c2048338c47a64fcee746e32a7cd
Author: Felix Ruess <address@hidden>
Date:   2011-03-18 (Fri, 18 Mar 2011)

Changed paths:
  R TODO

Log Message:
-----------
removed old TODO as it is from 2006


Commit: 4a69358e972218ef4ef33712f1f9351a79cbfec4
    
https://github.com/paparazzi/paparazzi/commit/4a69358e972218ef4ef33712f1f9351a79cbfec4
Author: Allen <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/lisa_m_test_progs.makefile

Log Message:
-----------
Enable imu_aspirin test for lisa/m


Commit: 2b3f67bfd993ca5e2d27dfd547d6a73aa6e57aa7
    
https://github.com/paparazzi/paparazzi/commit/2b3f67bfd993ca5e2d27dfd547d6a73aa6e57aa7
Author: Allen <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M sw/airborne/booz/test/booz_test_imu.c

Log Message:
-----------
Update booz_test_imu for testing aspirin on lisa/m


Commit: 295c459aa293a822bfd7177b565786be5645d3ed
    
https://github.com/paparazzi/paparazzi/commit/295c459aa293a822bfd7177b565786be5645d3ed
Author: Allen <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/lisa_m_test_progs.makefile

Log Message:
-----------
Enable test_rc_spektrum test for lisa/m


Commit: a14c75b73ee9e3282ceaeacd90423850596e7b95
    
https://github.com/paparazzi/paparazzi/commit/a14c75b73ee9e3282ceaeacd90423850596e7b95
Author: Allen <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M conf/autopilot/lisa_m_test_progs.makefile

Log Message:
-----------
Enable secondary RX for rc_spektrum test program on lisa/m


Commit: 4aadad5cbef609f9b9c6cfc816a247644ec91973
    
https://github.com/paparazzi/paparazzi/commit/4aadad5cbef609f9b9c6cfc816a247644ec91973
Author: Allen <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  A sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c

Log Message:
-----------
Move pprz_baudrate into it's own header file to share b/t uart_arch and
spektrum_arch, also change type of first arugement to silence compiler
warning


Commit: 83fc4552b844db487df7c6999898863db1d74d1d
    
https://github.com/paparazzi/paparazzi/commit/83fc4552b844db487df7c6999898863db1d74d1d
Author: Antoine Drouin <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  A sw/airborne/test/ahrs/run_ahrs_on_synth.c

Log Message:
-----------
adding a test programm for ahrs


Commit: 88c54f6e8b3b0aa944ef5915af831d55134554d0
    
https://github.com/paparazzi/paparazzi/commit/88c54f6e8b3b0aa944ef5915af831d55134554d0
Author: Antoine Drouin <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  R TODO
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  A conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  A conf/autopilot/lisa_m_test_progs.makefile
  A conf/autopilot/lisa_m_test_progs.xml
  M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/modules/ins_arduimu.xml
  M conf/settings/fw_ctl_n.xml
  A conf/settings/pbn.xml
  M conf/telemetry/fw_h_ctl_a.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  A sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/stm32/led_hw.h
  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/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  A sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/boards/lisa_l_1.0.h
  A sw/airborne/boards/lisa_m/baro_board.c
  A sw/airborne/boards/lisa_m/baro_board.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  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/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/lisa/test_led.c
  M sw/airborne/lisa/test_servos.c
  A sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.h
  M sw/airborne/math/pprz_geodetic_int.h
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/peripherals/ami601.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_geodetic.c
  M sw/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

Log Message:
-----------
Merge remote branch 'paparazzi/master'


Commit: d733952721ad2e5f382610031f009b287fdbbd83
    
https://github.com/paparazzi/paparazzi/commit/d733952721ad2e5f382610031f009b287fdbbd83
Author: Antoine Drouin <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/subsystems/ahrs/ahrs_aligner.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  A sw/airborne/subsystems/imu/imu_dummy.c
  M sw/airborne/test/ahrs/Makefile
  A sw/airborne/test/ahrs/ahrs_on_synth.c
  A sw/airborne/test/ahrs/ahrs_on_synth.h
  A sw/airborne/test/ahrs/ahrs_utils.py
  A sw/airborne/test/ahrs/compare_ahrs.py
  A sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/pprz_algebra_print.h
  A sw/airborne/test/subsystems/test_ahrs.c
  A sw/airborne/test/subsystems/test_imu.c
  M sw/simulator/nps/nps_random.c
  M sw/simulator/nps/nps_random.h

Log Message:
-----------
adding a new AHRS and ahrs test programs


Commit: 83f22da57ceb35d425dd2c39dc0d698c02159e59
    
https://github.com/paparazzi/paparazzi/commit/83f22da57ceb35d425dd2c39dc0d698c02159e59
Author: Antoine Drouin <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

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

Log Message:
-----------
fixing spelling mistake in NORMALIZE


Commit: 2c3e0a3892d6642518c784de80273d5a69db9ae4
    
https://github.com/paparazzi/paparazzi/commit/2c3e0a3892d6642518c784de80273d5a69db9ae4
Author: Antoine Drouin <address@hidden>
Date:   2011-03-21 (Mon, 21 Mar 2011)

Changed paths:
  A conf/autopilot/subsystems/shared/ahrs_ic.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin.makefile

Log Message:
-----------
adding makefiles for aspirin and new ahrs


Commit: 8dcd9c7f409df1d8cae7d01c1be38dadc40fea79
    
https://github.com/paparazzi/paparazzi/commit/8dcd9c7f409df1d8cae7d01c1be38dadc40fea79
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  A conf/settings/flight_params.xml
  M conf/settings/fw_ctl_n.xml
  A conf/settings/infrared.xml
  A conf/settings/ins_basic.xml
  M conf/settings/ir_i2c.xml
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h

Log Message:
-----------
update the adaptive control for fixedwing and split some of the settings
files


Commit: 4c804a1dcaa613c114c97fe79904720ca51ff04c
    
https://github.com/paparazzi/paparazzi/commit/4c804a1dcaa613c114c97fe79904720ca51ff04c
Author: Antoine Drouin <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/rotorcraft.makefile
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h
  M sw/airborne/boards/booz_1.0.h
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_analog_hw.c
  R sw/airborne/booz/arch/sim/booz2_analog_hw.h
  R sw/airborne/booz/arch/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/mcu.c
  A sw/airborne/mcu_periph/dac.h

Log Message:
-----------
rotorcraft uses electrical subsystem like fixedwing - both for lpc21 and stm32


Commit: 86fff9fb4c14ff994a227552163aab530922274e
    
https://github.com/paparazzi/paparazzi/commit/86fff9fb4c14ff994a227552163aab530922274e
Author: Antoine Drouin <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/fixedwing.makefile

Log Message:
-----------
servos on fixedwing lisa/M


Commit: cd7bf6077ef401cff80fb153fec41e8dcf087544
    
https://github.com/paparazzi/paparazzi/commit/cd7bf6077ef401cff80fb153fec41e8dcf087544
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h

Log Message:
-----------
use the new DAC driver


Commit: 3dd321ec11ce225cf9289655bb0c0e7c6f229387
    
https://github.com/paparazzi/paparazzi/commit/3dd321ec11ce225cf9289655bb0c0e7c6f229387
Author: Antoine Drouin <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  A conf/airframes/Poine/test_settings.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/settings/settings.dtd
  A sw/airborne/subsystems/settings.c
  A sw/airborne/subsystems/settings.h
  A sw/airborne/test/subsystems/test_settings.c
  A sw/airborne/test/subsystems/test_settings.h

Log Message:
-----------
added a test program for persistent settings


Commit: b6094b4add910b864eb11b27d273b9717ab11316
    
https://github.com/paparazzi/paparazzi/commit/b6094b4add910b864eb11b27d273b9717ab11316
Author: Antoine Drouin <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  A conf/settings/settings_test.xml

Log Message:
-----------
forgoten file for the setting test program


Commit: c8bbac704c355419b47176b490f9faf47b4be156
    
https://github.com/paparazzi/paparazzi/commit/c8bbac704c355419b47176b490f9faf47b4be156
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/rotorcraft.makefile
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h
  M sw/airborne/boards/booz_1.0.h
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_analog_hw.c
  R sw/airborne/booz/arch/sim/booz2_analog_hw.h
  R sw/airborne/booz/arch/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/mcu.c
  A sw/airborne/mcu_periph/dac.h

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


Commit: 49a6a0e6b4a72607060c5e53b169fc1c0fda4455
    
https://github.com/paparazzi/paparazzi/commit/49a6a0e6b4a72607060c5e53b169fc1c0fda4455
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  A conf/airframes/Poine/test_settings.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/settings/settings.dtd
  A conf/settings/settings_test.xml
  A sw/airborne/subsystems/settings.c
  A sw/airborne/subsystems/settings.h
  A sw/airborne/test/subsystems/test_settings.c
  A sw/airborne/test/subsystems/test_settings.h

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


Commit: 94ed2a831d526fcd6df7ecfb12b6f59d4fc13433
    
https://github.com/paparazzi/paparazzi/commit/94ed2a831d526fcd6df7ecfb12b6f59d4fc13433
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  R TODO
  M conf/airframes/ENAC/quadrotor/blender.xml
  A conf/airframes/Poine/test_settings.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  A conf/autopilot/subsystems/shared/ahrs_ic.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M conf/boards/lisa_m_1.0.makefile
  A conf/settings/flight_params.xml
  M conf/settings/fw_ctl_n.xml
  A conf/settings/infrared.xml
  A conf/settings/ins_basic.xml
  M conf/settings/ir_i2c.xml
  A conf/settings/pbn.xml
  M conf/settings/settings.dtd
  A conf/settings/settings_test.xml
  M conf/telemetry/fw_h_ctl_a.xml
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_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/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  A sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m_1.0.h
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_analog_hw.c
  R sw/airborne/booz/arch/sim/booz2_analog_hw.h
  R sw/airborne/booz/arch/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  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/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/mcu.c
  A sw/airborne/mcu_periph/dac.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/subsystems/ahrs/ahrs_aligner.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  M sw/airborne/subsystems/imu.c
  A sw/airborne/subsystems/imu/imu_dummy.c
  A sw/airborne/subsystems/settings.c
  A sw/airborne/subsystems/settings.h
  M sw/airborne/test/ahrs/Makefile
  A sw/airborne/test/ahrs/ahrs_on_synth.c
  A sw/airborne/test/ahrs/ahrs_on_synth.h
  A sw/airborne/test/ahrs/ahrs_utils.py
  A sw/airborne/test/ahrs/compare_ahrs.py
  A sw/airborne/test/ahrs/run_ahrs_on_synth.c
  A sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/pprz_algebra_print.h
  A sw/airborne/test/subsystems/test_ahrs.c
  A sw/airborne/test/subsystems/test_imu.c
  A sw/airborne/test/subsystems/test_settings.c
  A sw/airborne/test/subsystems/test_settings.h
  M sw/simulator/nps/nps_random.c
  M sw/simulator/nps/nps_random.h

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


Commit: d61179852146db5ad94555aac1d8b568bfc780f2
    
https://github.com/paparazzi/paparazzi/commit/d61179852146db5ad94555aac1d8b568bfc780f2
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/modules/ins_arduimu.xml
  A conf/modules/ins_arduimu_basic.xml
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_EM406.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_NMEA.pde

Log Message:
-----------
remove unused GPS files and add module conf file for arduimu basic
version


Commit: eeae7ce9f3d0a2666b79507e3fd9e58415aa7564
    
https://github.com/paparazzi/paparazzi/commit/eeae7ce9f3d0a2666b79507e3fd9e58415aa7564
Author: Felix Ruess <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  R TODO
  M conf/Makefile.stm32
  M conf/airframes/ENAC/quadrotor/blender.xml
  A conf/airframes/Poine/test_settings.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  A conf/autopilot/subsystems/shared/ahrs_ic.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M conf/boards/lisa_m_1.0.makefile
  A conf/modules/ins_arduimu_basic.xml
  A conf/settings/flight_params.xml
  M conf/settings/fw_ctl_n.xml
  A conf/settings/infrared.xml
  A conf/settings/ins_basic.xml
  M conf/settings/ir_i2c.xml
  A conf/settings/pbn.xml
  M conf/settings/settings.dtd
  A conf/settings/settings_test.xml
  M conf/telemetry/fw_h_ctl_a.xml
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  A sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m_1.0.h
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_analog_hw.c
  R sw/airborne/booz/arch/sim/booz2_analog_hw.h
  R sw/airborne/booz/arch/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
  A sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/ADC.pde
  A sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/DCM.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_pprz.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/Output.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/Vector.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/arduimu_basic.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/matrix.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/timing.pde
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  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/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/mcu.c
  A sw/airborne/mcu_periph/dac.h
  M sw/airborne/mcu_periph/uart.h
  A sw/airborne/modules/ins/ins_arduimu_basic.c
  A sw/airborne/modules/ins/ins_arduimu_basic.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/subsystems/ahrs/ahrs_aligner.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  M sw/airborne/subsystems/imu.c
  A sw/airborne/subsystems/imu/imu_dummy.c
  A sw/airborne/subsystems/settings.c
  A sw/airborne/subsystems/settings.h
  M sw/airborne/test/ahrs/Makefile
  A sw/airborne/test/ahrs/ahrs_on_synth.c
  A sw/airborne/test/ahrs/ahrs_on_synth.h
  A sw/airborne/test/ahrs/ahrs_utils.py
  A sw/airborne/test/ahrs/compare_ahrs.py
  A sw/airborne/test/ahrs/run_ahrs_on_synth.c
  A sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/pprz_algebra_print.h
  A sw/airborne/test/subsystems/test_ahrs.c
  A sw/airborne/test/subsystems/test_imu.c
  A sw/airborne/test/subsystems/test_settings.c
  A sw/airborne/test/subsystems/test_settings.h
  M sw/simulator/nps/nps_random.c
  M sw/simulator/nps/nps_random.h

Log Message:
-----------
Merge branch 'master' into dev and resolve conflicts


Commit: 45f8aba7fbac1e547e2555c90f9d63c2388b4215
    
https://github.com/paparazzi/paparazzi/commit/45f8aba7fbac1e547e2555c90f9d63c2388b4215
Author: Felix Ruess <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile

Log Message:
-----------
comment out UARTx_VIC_SLOT for lpc21 in gps makefile. should not be needed


Commit: b4a6eb94276d0c39e71d3743ca51e5672b4ebb27
    
https://github.com/paparazzi/paparazzi/commit/b4a6eb94276d0c39e71d3743ca51e5672b4ebb27
Author: Felix Ruess <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  R sw/airborne/booz/arch/sim/booz2_unsimulated_peripherals.c
  M sw/simulator/nps/nps_autopilot_booz.c

Log Message:
-----------
removed booz2_unsimulated_peripherals and updated nps makefile to use 
electrical and adc instead of battery and booz2_analog.


Commit: 2ba6d96a7eb08eaab4fb2ef40271992332fb8b89
    
https://github.com/paparazzi/paparazzi/commit/2ba6d96a7eb08eaab4fb2ef40271992332fb8b89
Author: Felix Ruess <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  R sw/airborne/booz/arch/sim/booz2_unsimulated_peripherals.c
  M sw/simulator/nps/nps_autopilot_booz.c

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


Commit: e3f4548e8bd3ab6b39a3996831f85537a142d9c4
    
https://github.com/paparazzi/paparazzi/commit/e3f4548e8bd3ab6b39a3996831f85537a142d9c4
Author: Felix Ruess <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

Log Message:
-----------
added common_flight_plan to nps makefile


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