[paparazzi-commits] [paparazzi/paparazzi] b6ae8c: Paparazzi main branch

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] b6ae8c: Paparazzi main branch

From:	GitHub
Subject:	[paparazzi-commits] [paparazzi/paparazzi] b6ae8c: Paparazzi main branch merge
Date:	Tue, 24 Apr 2012 02:23:33 -0700
  Branch: refs/heads/quadshot_integration
  Home:   https://github.com/paparazzi/paparazzi
  Commit: b6ae8cb9961404ca39c08aa521c13fabdb80ecc0
      
https://github.com/paparazzi/paparazzi/commit/b6ae8cb9961404ca39c08aa521c13fabdb80ecc0
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M .gitignore
    M BUGS
    R README
    A README.md
    A conf/airframes/CDW/LisaAspirin2.xml
    A conf/airframes/CDW/yapa3_aspirin2.xml
    M conf/airframes/ENAC/fixed-wing/twinjet2.xml
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/navgo.xml
    R conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
    R conf/airframes/TU_Delft/MicrojetBR.xml
    R conf/airframes/TU_Delft/MicrojetBRimu.xml
    R conf/airframes/TU_Delft/MicrojetCDW.xml
    R conf/airframes/TU_Delft/Trip50A.xml
    R conf/airframes/TU_Delft/Trip50B.xml
    R conf/airframes/TU_Delft/holiday50.xml
    R conf/airframes/TU_Delft/skywalker.xml
    R conf/airframes/TU_Delft/skywalkerfiber.xml
    R conf/airframes/TU_Delft/yapa_xsens.xml
    A conf/airframes/example_heli_lisam.xml
    A conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/airframes/logger_sd.xml
    M conf/airframes/microjet_example.xml
    M conf/autopilot/logger.makefile
    M conf/autopilot/rotorcraft.makefile
    R conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
    A conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
    M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
    M conf/autopilot/subsystems/shared/imu_navgo.makefile
    M conf/conf.xml.example
    M conf/messages.xml
    R conf/modules/ins_xsens_MTiG_fixedwing.xml
    A conf/modules/nav_catapult.xml
    A conf/modules/openlog.xml
    A conf/radios/R6107SP_7ch_xyz.xml
    M conf/settings/tuning_ins.xml
    R sw/README
    M sw/airborne/ap_downlink.h
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/navgo/baro_board.h
    M sw/airborne/boards/navgo/imu_navgo.c
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
    M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
    M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/stabilization.c
    M sw/airborne/firmwares/rotorcraft/stabilization.h
    A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
    A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
    A sw/airborne/math/Makefile
    A sw/airborne/math/README
    A sw/airborne/math/pprzmath.pc.in
    M sw/airborne/modules/digital_cam/dc.c
    M sw/airborne/modules/digital_cam/led_cam_ctrl.h
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/ins/ins_xsens.h
    A sw/airborne/modules/nav/nav_catapult.c
    A sw/airborne/modules/nav/nav_catapult.h
    A sw/airborne/modules/openlog/openlog.c
    A sw/airborne/modules/openlog/openlog.h
    M sw/airborne/peripherals/mcp355x.c
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h
    M sw/airborne/subsystems/navigation/OSAMNav.c
    M sw/airborne/subsystems/navigation/discsurvey.c
    M sw/airborne/subsystems/navigation/poly_survey_adv.c
    M sw/airborne/subsystems/navigation/spiral.c
    M sw/ground_segment/cockpit/gcs.ml
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/live.mli
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/misc/Makefile
    M sw/lib/ocaml/ivy/Makefile
    M sw/lib/ocaml/mapTrack.ml
    M sw/logalizer/Makefile
    A sw/logalizer/openlog2tlm.c
    M sw/logalizer/plotter.ml
    M sw/simulator/old_booz/tests/Makefile

  Log Message:
  -----------
  Paparazzi main branch merge


  Commit: e93b99c772fdf16247ba1928d0000e25f4b5270e
      
https://github.com/paparazzi/paparazzi/commit/e93b99c772fdf16247ba1928d0000e25f4b5270e
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    A sw/airborne/firmwares/rotorcraft/autopilot.h.orig
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h.orig

  Log Message:
  -----------
  Original files post merge


  Commit: 94fc8a38b62763e11ca56cf5d897acf3deaffa91
      
https://github.com/paparazzi/paparazzi/commit/94fc8a38b62763e11ca56cf5d897acf3deaffa91
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

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

Conflicts:
        sw/airborne/firmwares/rotorcraft/autopilot.h
        sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h


  Commit: de757e2f46f9365f5be065de7925c764a9d2a067
      
https://github.com/paparazzi/paparazzi/commit/de757e2f46f9365f5be065de7925c764a9d2a067
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h

  Log Message:
  -----------
   Added #define GUIDANCE_H_MODE_TOYTRONICS_HOVER  to autopilot.h and 
guidance_h.h to enable stock toytronics code to work post merge. Needs to be 
taken out soon.


  Commit: 299cfef06c3b79d65a8642716313be7cd525f818
      
https://github.com/paparazzi/paparazzi/commit/299cfef06c3b79d65a8642716313be7cd525f818
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M conf/airframes/CDW/LisaAspirin2.xml
    A conf/autopilot/subsystems/fixedwing/imu_aspirin2_i2c.makefile
    A conf/autopilot/subsystems/shared/imu_aspirin_v2.0.makefile
    M conf/settings/tuning_ctl_new.xml
    M conf/settings/tuning_ins.xml
    A sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    A sw/airborne/arch/stm32/mcu_periph/spi_arch.h
    A sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.c
    A sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.h
    M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
    M sw/airborne/mcu_periph/spi.h
    A sw/airborne/modules/sensors/imu_aspirin2.c
    A sw/airborne/modules/sensors/imu_aspirin2.h
    A sw/airborne/peripherals/mpu60X0.h
    A sw/airborne/subsystems/imu/imu_aspirin2.c
    A sw/airborne/subsystems/imu/imu_aspirin2.h

  Log Message:
  -----------
  Merge branch 'aspirin2' of https://github.com/paparazzi/paparazzi into 
toytronics


  Commit: 55cd25a4c0e64dbd4d36296916a559c22421a50e
      
https://github.com/paparazzi/paparazzi/commit/55cd25a4c0e64dbd4d36296916a559c22421a50e
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    A conf/airframes/esden/calib/asp21-default.xml

  Log Message:
  -----------
  Added default calib file for Asp2.1


  Commit: 92baf28d66a99dec6f3cde60c609055a6505f7be
      
https://github.com/paparazzi/paparazzi/commit/92baf28d66a99dec6f3cde60c609055a6505f7be
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  Re-config'd QS airframe file to work with Asp2.1. Also reverted to the switch 
based instant start.


  Commit: e1fe75b06805668f2633e9c798d3c36c6b8db358
      
https://github.com/paparazzi/paparazzi/commit/e1fe75b06805668f2633e9c798d3c36c6b8db358
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile

  Log Message:
  -----------
  Added I2C2 flag to rotorcraft makefile to allow baro ops on lisam with Asp 
2.1.


  Commit: 446c14b10af5246f5e29ba35bf1f9c95ddbe70b4
      
https://github.com/paparazzi/paparazzi/commit/446c14b10af5246f5e29ba35bf1f9c95ddbe70b4
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/main.c

  Log Message:
  -----------
  Enabled delay prior to imu_init in main.c to prevent mpu6000 freeze issue due 
to init happening before full power-up is achieved.


  Commit: 2eb9ff0e136932ed51520b3ac10d2e649d963c15
      
https://github.com/paparazzi/paparazzi/commit/2eb9ff0e136932ed51520b3ac10d2e649d963c15
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c

  Log Message:
  -----------
  Re-implemented setpoint quat calculation in a slightly better manner for 
toytronics_incremental 


  Commit: 8fa2d049404c1c5d7f861839fd2c56a531051060
      
https://github.com/paparazzi/paparazzi/commit/8fa2d049404c1c5d7f861839fd2c56a531051060
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c

  Log Message:
  -----------
  Added a deadband in the setpoint decay to estimate to prevent the setpoint 
being dragged about in incremental mode.


  Commit: acc32b0473b9a9956d33e67e0fbad58558fde858
      
https://github.com/paparazzi/paparazzi/commit/acc32b0473b9a9956d33e67e0fbad58558fde858
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    A conf/airframes/esden/qs4_lisam2_a21.xml

  Log Message:
  -----------
  Airframe file for Quadshot with Lisa/M 2.0 with Aspirin 2.1


  Commit: 5273adb48b87cd18068c837fb04e6398fcf5bc13
      
https://github.com/paparazzi/paparazzi/commit/5273adb48b87cd18068c837fb04e6398fcf5bc13
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M conf/airframes/esden/qs4_lisam.xml
    M conf/airframes/esden/qs4_lisam2.xml

  Log Message:
  -----------
  General airframe file cleanup - removed unused comments etc.


  Commit: 1ce476493187bdb1ac01d0cc3582055a882ebc40
      
https://github.com/paparazzi/paparazzi/commit/1ce476493187bdb1ac01d0cc3582055a882ebc40
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M conf/autopilot/logger.makefile
    A conf/boards/sdlog_1.0.makefile
    A conf/modules/bat_checker.xml
    M conf/mtk.dtd
    M sw/airborne/arch/lpc21/test/bootloader/crt.S
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_m_1.0.h
    A sw/airborne/boards/sdlog_1.0.h
    M sw/airborne/firmwares/logger/main_logger.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    A sw/airborne/modules/bat_checker/bat_checker.c
    A sw/airborne/modules/bat_checker/bat_checker.h
    M sw/airborne/modules/benchmark/flight_benchmark.h
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/nav/nav_catapult.h
    M sw/ground_segment/cockpit/live.ml

  Log Message:
  -----------
  Merge with Paparazzi main branch


  Commit: 1f2514be1f1a920804c902ab0cedca9d3f1e21b6
      
https://github.com/paparazzi/paparazzi/commit/1f2514be1f1a920804c902ab0cedca9d3f1e21b6
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M conf/autopilot/logger.makefile
    R conf/boards/sdlog_1.0.makefile
    R conf/modules/bat_checker.xml
    M conf/mtk.dtd
    M sw/airborne/arch/lpc21/test/bootloader/crt.S
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_m_1.0.h
    R sw/airborne/boards/sdlog_1.0.h
    M sw/airborne/firmwares/logger/main_logger.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    R sw/airborne/modules/bat_checker/bat_checker.c
    R sw/airborne/modules/bat_checker/bat_checker.h
    M sw/airborne/modules/benchmark/flight_benchmark.h
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/nav/nav_catapult.h
    M sw/ground_segment/cockpit/live.ml

  Log Message:
  -----------
  Revert "Merge with Paparazzi main branch"

This reverts commit 1ce476493187bdb1ac01d0cc3582055a882ebc40.


  Commit: f58ae8584a483949f5057701c1fa045a77c5c372
      
https://github.com/paparazzi/paparazzi/commit/f58ae8584a483949f5057701c1fa045a77c5c372
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    M conf/Makefile.stm32

  Log Message:
  -----------
  Added Black Magic Probe support to the stm32 platform.

Just add BMP_PORT=/dev/ttyACM0 to the ap.upload make call. The script
will try to flash the device using GDB and the BMP.


  Commit: 4136687e87f456bdd51b7e368c8d2eb0146c691a
      
https://github.com/paparazzi/paparazzi/commit/4136687e87f456bdd51b7e368c8d2eb0146c691a
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    M conf/Makefile.stm32
    M conf/boards/lisa_m_1.0.makefile
    M conf/boards/lisa_m_2.0.makefile
    A sw/airborne/arch/stm32/lisa_m_2.0_luftboot.ld
    M sw/airborne/arch/stm32/mcu_arch.c

  Log Message:
  -----------
  Added preliminary support for luftboot.

By default all lisa/m 2.0 firmware will end up at address 0x8002000 and
jtag will put it there without erasing the bootloader. If you intend to
not use Luftboot you have to set
<configure name="NO_LUFTBOOT" value="1"/>
in your airframe file.

Using DFU for flashing firmware still needs to be added.

Conflicts:

        conf/Makefile.stm32
        conf/boards/lisa_m_2.0.makefile


  Commit: faba743a4c9cb6dd6888a23120eb22e933e67baa
      
https://github.com/paparazzi/paparazzi/commit/faba743a4c9cb6dd6888a23120eb22e933e67baa
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    M conf/Makefile.stm32
    A sw/tools/dfu/dfu.py
    A sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  Added the dfu flashing script. Lisa/m 2.0 board is now by default using the 
DFU flashing mode.

As paparazzi (payload) does not contain a way to switch to the
bootloader yet you need to connect ADC2 pin to ground on power up to
force the bootloader mode.


  Commit: 4912ad13c3bff1efc9e27584c8c305c22d432c64
      
https://github.com/paparazzi/paparazzi/commit/4912ad13c3bff1efc9e27584c8c305c22d432c64
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    M conf/boards/lisa_m_2.0.makefile

  Log Message:
  -----------
  Reverted lisa m 2.0 makefile to the old style from master.


  Commit: e76cdc88c6e05e2c430b88aef7fd58a5d3b23a13
      
https://github.com/paparazzi/paparazzi/commit/e76cdc88c6e05e2c430b88aef7fd58a5d3b23a13
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-13 (Fri, 13 Apr 2012)

  Changed paths:
    A sw/airborne/boards/lisa_m_2.0.h

  Log Message:
  -----------
  Added lisa/m 2.0 board header file.


  Commit: 355ce68fa88279a88223a1df62fbf51c1e399cb7
      
https://github.com/paparazzi/paparazzi/commit/355ce68fa88279a88223a1df62fbf51c1e399cb7
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M conf/airframes/esden/calib/asp21-default.xml

  Log Message:
  -----------
  Removed body to imu statements from the default aspirin 2.1 calibration file. 
They belong into the airframe file.


  Commit: e59d7178a00770d0d4face71362792def9d60cfc
      
https://github.com/paparazzi/paparazzi/commit/e59d7178a00770d0d4face71362792def9d60cfc
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/subsystems/imu/imu_aspirin2.c
    M sw/airborne/subsystems/imu/imu_aspirin2.h

  Log Message:
  -----------
  Added transaction in progress checking in spi_rw.

When submitting an SPI transaction we are now checking if there is
already a transaction in progress. If so we ignore the transaction.

Seems to fix the issue with the driver goirg crazy when switching modes
on Quadshot.

TODO: A failed transaction submission still needs to be reported back to
higher levels.


  Commit: 62644ccda29a115cad1b4bc72611648534ab0e89
      
https://github.com/paparazzi/paparazzi/commit/62644ccda29a115cad1b4bc72611648534ab0e89
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.h
    M sw/airborne/subsystems/imu/imu_aspirin2.c

  Log Message:
  -----------
  spi_rw is now reporting submission success/failure.

This way drivers can make sure that a transaction got submitted
correctly or decide to ignore it.


  Commit: 887f50e9de9de16ed5c0222f475605d13dae1334
      
https://github.com/paparazzi/paparazzi/commit/887f50e9de9de16ed5c0222f475605d13dae1334
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M conf/Makefile.stm32
    M conf/airframes/esden/calib/asp21-default.xml
    M conf/boards/lisa_m_1.0.makefile
    M conf/boards/lisa_m_2.0.makefile
    A sw/airborne/arch/stm32/lisa_m_2.0_luftboot.ld
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.h
    A sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/subsystems/imu/imu_aspirin2.c
    M sw/airborne/subsystems/imu/imu_aspirin2.h
    A sw/tools/dfu/dfu.py
    A sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  Merge branch 'toytronics' of https://github.com/esden/paparazzi into 
toytronics


  Commit: 97990158f71f118ef0851dbd8b89b5f82eccc1ac
      
https://github.com/paparazzi/paparazzi/commit/97990158f71f118ef0851dbd8b89b5f82eccc1ac
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

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

  Log Message:
  -----------
  Re-enabled autopilot instant start with safeties on throttle stick only


  Commit: 741385dbd521b6f9e80fd30938438ee060ef7a08
      
https://github.com/paparazzi/paparazzi/commit/741385dbd521b6f9e80fd30938438ee060ef7a08
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  Mode hover_forward is now on Mode_Auto2 and mode_aerobatic is now on 
Mode_Manual, so that the recovery mode 1 is with the flap stick positioned 
closer to the pilot; more natural response.


  Commit: 08a756a4918e9cee7a51a56ad21368b3052c54b1
      
https://github.com/paparazzi/paparazzi/commit/08a756a4918e9cee7a51a56ad21368b3052c54b1
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

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

  Log Message:
  -----------
  Mode (flap) stick closer to the pilot is now hover and mode stick pushed out 
is now aerobatic for lisa/M 1.0 aircraft.


  Commit: d6e86f10ec7a35cbfef23ae37b136039dabc6d7e
      
https://github.com/paparazzi/paparazzi/commit/d6e86f10ec7a35cbfef23ae37b136039dabc6d7e
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c

  Log Message:
  -----------
  Implemented heading decay in Mode Hover_forward using the exponential decay 
function  as in the aerobatic mode instead of having another separate function 
for this.


  Commit: 12a20148d183a6cac1cbd6e1738465b9ef19522b
      
https://github.com/paparazzi/paparazzi/commit/12a20148d183a6cac1cbd6e1738465b9ef19522b
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/autopilot/logger.makefile
    A conf/boards/sdlog_1.0.makefile
    A conf/modules/bat_checker.xml
    M conf/mtk.dtd
    M sw/airborne/arch/lpc21/test/bootloader/crt.S
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_m_1.0.h
    A sw/airborne/boards/sdlog_1.0.h
    M sw/airborne/firmwares/logger/main_logger.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/autopilot.h.orig
    A sw/airborne/modules/bat_checker/bat_checker.c
    A sw/airborne/modules/bat_checker/bat_checker.h
    M sw/airborne/modules/benchmark/flight_benchmark.h
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/nav/nav_catapult.h
    M sw/ground_segment/cockpit/live.ml
    M sw/tools/gen_modules.ml

  Log Message:
  -----------
  Merge with paparazzi main branch; sorting out merge confilct in autopilot.h


  Commit: 93e712cb565aee80f528f4e60d3c5f50e267ae87
      
https://github.com/paparazzi/paparazzi/commit/93e712cb565aee80f528f4e60d3c5f50e267ae87
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.h.orig

  Log Message:
  -----------
  Original autopilot.h file


  Commit: 6239dcca12322b130d4cc2f138a73197acb4e0e6
      
https://github.com/paparazzi/paparazzi/commit/6239dcca12322b130d4cc2f138a73197acb4e0e6
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

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

  Log Message:
  -----------
  autopilot.h from paparazzi master branch


  Commit: 7d2ef7b705243f1bf12ed02ac67aa66211076576
      
https://github.com/paparazzi/paparazzi/commit/7d2ef7b705243f1bf12ed02ac67aa66211076576
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

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


  Commit: fd5d3c3d171822ad287887d4d92bcd4cf93d703b
      
https://github.com/paparazzi/paparazzi/commit/fd5d3c3d171822ad287887d4d92bcd4cf93d703b
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    R sw/airborne/firmwares/rotorcraft/autopilot.h.orig

  Log Message:
  -----------
  And hopefully this will be the last of git's merge antics today


  Commit: 085c4906e354ff2fb7cf8d2d455f79fb3ca1c8a6
      
https://github.com/paparazzi/paparazzi/commit/085c4906e354ff2fb7cf8d2d455f79fb3ca1c8a6
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M conf/airframes/esden/toytronics/setpoint/QS4_setpoint.xml
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c

  Log Message:
  -----------
  Moved aerobatic decay time setting to setpoint xml file instead of hardcoded 
hack


  Commit: d9769e13574894ec9645abfa20e29885569db7cc
      
https://github.com/paparazzi/paparazzi/commit/d9769e13574894ec9645abfa20e29885569db7cc
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M conf/airframes/esden/toytronics/setpoint/QS4_setpoint.xml

  Log Message:
  -----------
  Fixed typo in aerobatic_decay_time_Y declaration.


  Commit: 83cac1b516f878ec1eecb3a7512aeecab6b06ff6
      
https://github.com/paparazzi/paparazzi/commit/83cac1b516f878ec1eecb3a7512aeecab6b06ff6
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

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

  Log Message:
  -----------
  Set modes to match Quadshot flysky tx labels. Also removed gear switch as 
kill switch.


  Commit: 5dc992bf39edbe85ea3fbe56df1ebbd1ca05c24a
      
https://github.com/paparazzi/paparazzi/commit/5dc992bf39edbe85ea3fbe56df1ebbd1ca05c24a
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

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

  Log Message:
  -----------
  Set modes to match Quadshot flysky labels in lisa/M w/ asp1.5 aircraft.


  Commit: 8178fc9dd637621a875b47c742307e10252d8ed8
      
https://github.com/paparazzi/paparazzi/commit/8178fc9dd637621a875b47c742307e10252d8ed8
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  Changed modes to match Quadshot flysky labels.


  Commit: f8cd1fcbd1e63111005591051820ad3e272763da
      
https://github.com/paparazzi/paparazzi/commit/f8cd1fcbd1e63111005591051820ad3e272763da
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M conf/airframes/esden/toytronics/setpoint/QS4_setpoint.xml
    M conf/settings/settings_booz2_qs4m.xml
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.h

  Log Message:
  -----------
  Added an RC stick sensitivity adjustment option for Toytronics setpoint. The 
sensitivity option just allows the user to raise the normalized stick input to 
a set power thereby obtaining a pseudo linear, logarithmic or expo response.


  Commit: a8f501b72eb1367b2541f0a4710f4cc667b7e185
      
https://github.com/paparazzi/paparazzi/commit/a8f501b72eb1367b2541f0a4710f4cc667b7e185
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-18 (Wed, 18 Apr 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c

  Log Message:
  -----------
  Fixed sensitivity function such that rc stick command signs are not lost in 
the exponential operation.


  Commit: c5441840fa62e556df0f708a14561d4900341d66
      
https://github.com/paparazzi/paparazzi/commit/c5441840fa62e556df0f708a14561d4900341d66
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
    M conf/boards/lisa_m_2.0.makefile
    M sw/airborne/boards/lisa_m_2.0.h

  Log Message:
  -----------
  Added LED6 which are the quadshot body LED's. Lisa/M 2 board is using this 
led as AHRS alignment LED for now.


  Commit: f410d808ca476714e2d98d6185330124a30b4a67
      
https://github.com/paparazzi/paparazzi/commit/f410d808ca476714e2d98d6185330124a30b4a67
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M conf/airframes/esden/qs4_lisam_quad.xml
    M conf/airframes/esden/toytronics/setpoint/QS4_Q_setpoint.xml

  Log Message:
  -----------
  Updated setup for quads using toytronics setpoint code.


  Commit: fe57f8bf36b53bdb0d020a111e2480832ef055c8
      
https://github.com/paparazzi/paparazzi/commit/fe57f8bf36b53bdb0d020a111e2480832ef055c8
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
    M conf/boards/lisa_m_2.0.makefile
    M sw/airborne/boards/lisa_m_2.0.h

  Log Message:
  -----------
  Merge branch 'toytronics' of https://github.com/esden/paparazzi into 
toytronics


  Commit: 4bcc4ff5d873fbeb36894e6c104293489ab96361
      
https://github.com/paparazzi/paparazzi/commit/4bcc4ff5d873fbeb36894e6c104293489ab96361
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/boards/lisa_m_2.0.h

  Log Message:
  -----------
  Reenabled battery voltage sensing.


  Commit: c221cb92f27d806f908b03256783a03ce4e3a055
      
https://github.com/paparazzi/paparazzi/commit/c221cb92f27d806f908b03256783a03ce4e3a055
  Author: Pranay Sinha <address@hidden(none)>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/boards/lisa_m_2.0.h

  Log Message:
  -----------
  Merge branch 'toytronics' of https://github.com/esden/paparazzi into 
toytronics


  Commit: c4a60f117f16c94c1efe69e0ce91777b9ce2a413
      
https://github.com/paparazzi/paparazzi/commit/c4a60f117f16c94c1efe69e0ce91777b9ce2a413
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M conf/airframes/esden/calib/asp21-default.xml
    M conf/airframes/esden/qs4_lisam.xml
    M conf/airframes/esden/qs4_lisam2.xml
    M conf/airframes/esden/qs4_lisam2_a21.xml
    M conf/airframes/esden/qs4_lisam_quad.xml
    M conf/airframes/esden/toytronics/setpoint/QS4_Q_setpoint.xml
    M conf/airframes/esden/toytronics/setpoint/QS4_setpoint.xml
    M conf/settings/settings_booz2_qs4m.xml
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.c
    M sw/airborne/firmwares/rotorcraft/toytronics/toytronics_setpoint.h
    M sw/airborne/subsystems/imu/imu_aspirin2.c

  Log Message:
  -----------
  Merge pranay's toytronics improvements into quadshot_integration
* adjustable AEROBATIC_DECAY_TIME
* power sensitivity functin for rc sticks
* spi_rw is now reporting submission success/failure


Compare: https://github.com/paparazzi/paparazzi/compare/a92365a...c4a60f1
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [paparazzi/paparazzi] b6ae8c: Paparazzi main branch merge, GitHub <=
Prev by Date: [paparazzi-commits] [paparazzi/paparazzi] bcaba7: [modules documentation] Add a doc node to module
Next by Date: [paparazzi-commits] [paparazzi/paparazzi] ce7778: Updated to the newest locm3 revision.
Previous by thread: [paparazzi-commits] [paparazzi/paparazzi] bcaba7: [modules documentation] Add a doc node to module
Next by thread: [paparazzi-commits] [paparazzi/paparazzi] ce7778: Updated to the newest locm3 revision.
Index(es):
- Date
- Thread