[paparazzi-commits] [paparazzi/paparazzi] 1ec2d7: nammed ADC lines to make driver work with lisa/M a...

[noreply]

Branch: refs/heads/master
Home:   https://github.com/paparazzi/paparazzi

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


Compare: https://github.com/paparazzi/paparazzi/compare/0e9b09a...3e1fcb4