paparazzi-commits
[Top][All Lists]
Advanced

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

[paparazzi-commits] [paparazzi/paparazzi] 9cdd26: Include arch header fi


From: noreply
Subject: [paparazzi-commits] [paparazzi/paparazzi] 9cdd26: Include arch header file in can_arch to prevent wa...
Date: Tue, 22 Mar 2011 13:09:51 -0700

Branch: refs/heads/new-state-interface
Home:   https://github.com/paparazzi/paparazzi

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

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

Log Message:
-----------
Include arch header file in can_arch to prevent warnings


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

Changed paths:
  M conf/modules/ins_arduimu.xml
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/ADC.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Compass.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/DCM.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_EM406.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_NMEA.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_UBLOX.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Output.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Vector.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/arduimu_modified.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/matrix.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/press_alt.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/timing.pde
  A sw/airborne/modules/ins/ins_arduimu_modified.c
  A sw/airborne/modules/ins/ins_arduimu_modified.h

Log Message:
-----------
modified version of arduimu firmware and driver


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

Changed paths:
  M conf/modules/ins_arduimu.xml
  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/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

Log Message:
-----------
simulation works with arduimu module


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

Changed paths:
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_UBLOX.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Output.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/arduimu_modified.pde
  M sw/airborne/modules/ins/ins_arduimu_modified.c
  M sw/airborne/modules/ins/ins_arduimu_modified.h

Log Message:
-----------
clean arduino driver and firmware on modified version


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

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

Log Message:
-----------
Pass i2c periph as argument into i2c status handlers


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

Changed paths:
  M conf/modules/ins_arduimu.xml
  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/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

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


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

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

Log Message:
-----------
Move I2C_BUSY, SUPURIOUS_INTERRUPT, and OUT_OF_SYNC_STATE_MACHINE
defines out of I2C2 ifdef


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

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

Log Message:
-----------
STM32 I2c arch: more generic i2c event handling (actually use periph parameter 
to access
    hardware intstead of hardcode for I2C2), still needs a bit more


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

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

Log Message:
-----------
Convert END_OF_TRANSACTION define into static inline with takes periph
as argument


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

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

Log Message:
-----------
Convert I2C2_ABORT_AND_RESET into generic static inline abort_and_reset


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

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

Log Message:
-----------
Replace I2C2_APPLY_CONFIG macro with generic static inline
i2c_apply_config


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

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

Log Message:
-----------
Convert i2c2_hard_reset to i2c_hard_reset taking parameter for reg addr


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

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

Log Message:
-----------
Move i2c_hard_reset outside I2C2 ifdef


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

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/mcu_periph/i2c.h

Log Message:
-----------
Store init struct and gpio pins into i2c_periph struct, use them to make
hard reset function generic


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

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

Log Message:
-----------
Add i2c_delay, replace copy/paste for loop with it


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

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

Log Message:
-----------
Convert I2C1 to use i2c_apply_config


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

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

Log Message:
-----------
Convert I2C1 to use end_of_transaction


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

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

Log Message:
-----------
Remove a couple hard coded references to i2c2


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

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

Log Message:
-----------
STM32 i2c_arch Finish making I2C register access generic in reset and
event functions


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

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

Log Message:
-----------
wrap I2C_InitStructs around ifdef USE_I2C[12]


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

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

Log Message:
-----------
STM32 I2C2: Don't need to configure GPIO pins for AF in hw init, as the hard 
reset
will take care of that


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

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

Log Message:
-----------
STM32 arch i2c2 Consolidate init tasks into common helper function


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

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

Log Message:
-----------
Remove some I2C debug bits from stm32 arch i2c code


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

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

Log Message:
-----------
STM32 arch i2c: Fix hard coded references to I2C2 in generic reset_init
code


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

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/mcu_periph/i2c.h

Log Message:
-----------
I2C: Store pointer to i2c errors in i2c_periph struct


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

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

Log Message:
-----------
STM32 I2C arch  move i2c2 event handler into generic function


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

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

Log Message:
-----------
STM32 I2C2 arch: move i2c2 error handler into generic function


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

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

Log Message:
-----------
STM32 I2C move some generic code to top of file


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

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

Log Message:
-----------
STM32 arch i2c wrap generic functions at top of file in ifdef USE_I2C2 to 
prevent
warnings when only using I2C1


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

Changed paths:
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/ADC.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/DCM.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_UBLOX.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Output.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/arduimu_modified.pde
  M sw/airborne/modules/ins/ins_arduimu_modified.c

Log Message:
-----------
remove some of the data sent to arduimu


Commit: be9fc10e844b136e44efc875a89dd1b27a6455da
    
https://github.com/paparazzi/paparazzi/commit/be9fc10e844b136e44efc875a89dd1b27a6455da
Author: Piotr Esden-Tempski <address@hidden>
Date:   2011-03-06 (Sun, 06 Mar 2011)

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

Log Message:
-----------
Added #warning output to indicate the use of secondary spektrum receiver.


Commit: 185bfc9da53caa4c6f65e32e9939e1a00065b585
    
https://github.com/paparazzi/paparazzi/commit/185bfc9da53caa4c6f65e32e9939e1a00065b585
Author: Piotr Esden-Tempski <address@hidden>
Date:   2011-03-06 (Sun, 06 Mar 2011)

Changed paths:
  M conf/airframes/esden/lisa_pwm_aspirin.xml

Log Message:
-----------
Evabled secondary spektrum receiver in lisa_pwm_aspirin airframe file.


Commit: da5444acaedb340012d538851602f9b77e82c113
    
https://github.com/paparazzi/paparazzi/commit/da5444acaedb340012d538851602f9b77e82c113
Author: Piotr Esden-Tempski <address@hidden>
Date:   2011-03-07 (Mon, 07 Mar 2011)

Changed paths:
  A conf/airframes/esden/lisa_m_pwm.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 sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_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/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/lisa/test_led.c

Log Message:
-----------
Merge remote-tracking branch 'esden/lisa_m'


Commit: 14f4c2d31ea1cbb8d11b422b8d9b876d8f4cd5cc
    
https://github.com/paparazzi/paparazzi/commit/14f4c2d31ea1cbb8d11b422b8d9b876d8f4cd5cc
Author: Piotr Esden-Tempski <address@hidden>
Date:   2011-03-08 (Tue, 08 Mar 2011)

Changed paths:
  M conf/Makefile.stm32

Log Message:
-----------
Added gcc and oocd version outputs to the stm32 makefile.


Commit: 19fb54c42be4e9c9d3aa7b6cbc1fe3ef32c5465f
    
https://github.com/paparazzi/paparazzi/commit/19fb54c42be4e9c9d3aa7b6cbc1fe3ef32c5465f
Author: Piotr Esden-Tempski <address@hidden>
Date:   2011-03-08 (Tue, 08 Mar 2011)

Changed paths:
  M conf/Makefile.stm32

Log Message:
-----------
Now checking if the compiler supports multilib instead of checking for OS.


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

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

Log Message:
-----------
Move clock type/PLL multiplier into board config, and setup lisa_m for
12Mhz crystal instead of oscillator


Commit: 8ba2e00b040453406b62d373c18d03a417a8623d
    
https://github.com/paparazzi/paparazzi/commit/8ba2e00b040453406b62d373c18d03a417a8623d
Author: Allen <address@hidden>
Date:   2011-03-10 (Thu, 10 Mar 2011)

Changed paths:
  M conf/autopilot/lisa_m_test_progs.xml

Log Message:
-----------
Set lisa_m_test_progs board attribute to lisa_m instead of lisa_l


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

Changed paths:
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/lisa_m_test_progs.makefile
  A sw/airborne/lisa/test_uart_lisam.c

Log Message:
-----------
Add test_uart_lisam for testing uarts on lisa_m (based on test_uart, but
    uses fewer leds - not complete yet)


Commit: 5f8646dedc93794789672de36d89272046f09110
    
https://github.com/paparazzi/paparazzi/commit/5f8646dedc93794789672de36d89272046f09110
Author: lamestllama <address@hidden>
Date:   2011-03-12 (Sat, 12 Mar 2011)

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

Log Message:
-----------
fixed typo in ami601 magnetometer driver


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

Changed paths:
  M conf/Makefile.stm32
  A conf/airframes/esden/lisa_m_pwm.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 sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_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/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/lisa/test_led.c
  A sw/airborne/lisa/test_uart_lisam.c

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


Commit: 4115c24c0d950afbcf4f3395622d34075377d79b
    
https://github.com/paparazzi/paparazzi/commit/4115c24c0d950afbcf4f3395622d34075377d79b
Author: lamestllama <address@hidden>
Date:   2011-03-14 (Mon, 14 Mar 2011)

Changed paths:
  M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld

Log Message:
-----------
added .ARM.exidx section to LPC2148-ROM-bl.ld to allow build with eabi compilers


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

Changed paths:
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/peripherals/ami601.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/test/test_esc_mkk_simple.c

Log Message:
-----------
remove i2c stop_after_transmit flag
always do a stop after transmit (previous default behavior)


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

Changed paths:
  M conf/Makefile.stm32
  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 sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
  M sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_arch.c
  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/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/lisa/test_led.c
  A sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/peripherals/ami601.c

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


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

Changed paths:
  M conf/Makefile.stm32

Log Message:
-----------
Add libopenstm32/libopencm3 to libraries for stm32 makefile


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

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

Log Message:
-----------
return a fail on i2c error


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

Changed paths:
  M conf/Makefile.stm32
  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 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/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/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/lisa/test_led.c
  A sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/peripherals/ami601.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/simulator/hitl.ml
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

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


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

Changed paths:
  M conf/modules/ins_arduimu.xml
  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_EM406.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_NMEA.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
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/ADC.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Compass.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/DCM.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_EM406.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_NMEA.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/GPS_UBLOX.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Output.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/Vector.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/arduimu_modified.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/matrix.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/press_alt.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_modified/timing.pde
  A sw/airborne/modules/ins/ins_arduimu_basic.c
  A sw/airborne/modules/ins/ins_arduimu_basic.h
  R sw/airborne/modules/ins/ins_arduimu_modified.c
  R sw/airborne/modules/ins/ins_arduimu_modified.h

Log Message:
-----------
basic version of the arduimu firmware
returns angles rates and accels
gps velocities and status are send
no baro or magneto support


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

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

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


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

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

Log Message:
-----------
Use libopenstm32 RCC setup for lisa_m


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

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

Log Message:
-----------
Include the opencm3 version of rcc.h when requested


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

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

Log Message:
-----------
Include board config first in mcu_arch


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: 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: 597ad5bdb4b702fdef1f2cfe2daf6443ea02e362
    
https://github.com/paparazzi/paparazzi/commit/597ad5bdb4b702fdef1f2cfe2daf6443ea02e362
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
  A conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  A conf/autopilot/lisa_m_test_progs.makefile
  A conf/autopilot/lisa_m_test_progs.xml
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.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
  M conf/modules/ins_arduimu.xml
  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
  M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  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/adc_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/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
  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
  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/sim/booz2_unsimulated_peripherals.c
  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_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/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.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_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/i2c.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/peripherals/ami601.c
  M sw/airborne/peripherals/hmc5843.c
  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/airborne/test/test_esc_mkk_simple.c
  M sw/simulator/hitl.ml
  M sw/simulator/nps/nps_autopilot_booz.c
  M sw/simulator/nps/nps_random.c
  M sw/simulator/nps/nps_random.h
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sitl.ml

Log Message:
-----------
Merge branch 'master' into new-state-interface


Compare: https://github.com/paparazzi/paparazzi/compare/dff6b5d...597ad5b



reply via email to

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