[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 9fd0e6: Merge branch 'master'
|
From: |
noreply |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 9fd0e6: Merge branch 'master' into dev |
|
Date: |
Mon, 11 Apr 2011 15:27:33 -0700 |
Branch: refs/heads/new-state-interface
Home: https://github.com/paparazzi/paparazzi
Commit: 9fd0e69c81519ff51ca862fa2947b162102b9354
https://github.com/paparazzi/paparazzi/commit/9fd0e69c81519ff51ca862fa2947b162102b9354
Author: Felix Ruess <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
M conf/messages.xml
M conf/telemetry/telemetry_booz2.xml
M sw/airborne/booz/test/booz2_test_crista.c
M sw/airborne/booz/test/booz_test_imu.c
M sw/airborne/csc/mercury_xsens.h
M sw/airborne/firmwares/beth/main_overo.c
M sw/airborne/firmwares/beth/main_stm32.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/test/subsystems/test_ahrs.c
M sw/airborne/test/subsystems/test_imu.c
M sw/ground_segment/joystick/input2ivy.ml
M sw/lib/ocaml/expr_lexer.mll
M sw/lib/ocaml/expr_parser.mly
M sw/lib/ocaml/expr_syntax.ml
M sw/lib/ocaml/expr_syntax.mli
M sw/lib/ocaml/papget.ml
M sw/tools/fp_proc.ml
Log Message:
-----------
Merge branch 'master' into dev
Commit: 8ac9a5f2f0ec502bba700b724d4f6d501038e26c
https://github.com/paparazzi/paparazzi/commit/8ac9a5f2f0ec502bba700b724d4f6d501038e26c
Author: Antoine Drouin <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/airframes/Poine/booz2_a7.xml
Log Message:
-----------
couple of gain changes
Commit: a1b0cab01cd9bcaf04834354cae11b9952026f1b
https://github.com/paparazzi/paparazzi/commit/a1b0cab01cd9bcaf04834354cae11b9952026f1b
Author: Antoine Drouin <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/airframes/booz2_flixr.xml
M conf/autopilot/booz2_test_progs.makefile
M conf/autopilot/rotorcraft.makefile
M conf/autopilot/setup.makefile
M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
M conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile
M conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
A conf/autopilot/subsystems/rotorcraft/actuators_dummy.makefile
M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.makefile
M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile
M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile
M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
M conf/autopilot/subsystems/rotorcraft/imu_crista.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_transparent.makefile
A conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_xbee_api.makefile
M conf/boards/lisa_m_1.0.makefile
M conf/flight_plans/EMAV2008.xml
M conf/flight_plans/IS.xml
M conf/flight_plans/basic.xml
M conf/flight_plans/ccc_gl.xml
M conf/flight_plans/fp_tp_auto.xml
M conf/flight_plans/grosslobke_demo.xml
M conf/flight_plans/joystick.xml
M conf/flight_plans/landing.xml
M conf/flight_plans/mav07.xml
M conf/flight_plans/mav08.xml
M conf/flight_plans/nordlys.xml
M conf/flight_plans/poles.xml
M conf/flight_plans/slayer_training.xml
M conf/flight_plans/snav.xml
M conf/flight_plans/standard.xml
M conf/flight_plans/tcas.xml
M conf/flight_plans/versatile.xml
M conf/flight_plans/xsens_cachejunction.xml
M conf/gps/rotorcraft_ublox6.txt
M conf/messages.xml
M conf/telemetry/telemetry_booz2.xml
R conf/telemetry/telemetry_booz2_flixr.xml
M doc/pprz_algebra/quaternion.tex
R sw/airborne/arch/lpc21/vic_slots.txt
A sw/airborne/arch/lpc21/vic_slots_fw.txt
A sw/airborne/arch/lpc21/vic_slots_rotorcrafts.txt
A sw/airborne/arch/sim/subsystems/settings_arch.c
M sw/airborne/booz/test/booz2_test_crista.c
M sw/airborne/booz/test/booz_test_imu.c
M sw/airborne/csc/mercury_xsens.h
M sw/airborne/downlink.c
M sw/airborne/downlink.h
M sw/airborne/firmwares/beth/main_overo.c
M sw/airborne/firmwares/beth/main_stm32.c
M sw/airborne/firmwares/fixedwing/datalink.c
A sw/airborne/firmwares/rotorcraft/actuators/actuators_dummy.c
R sw/airborne/firmwares/rotorcraft/battery.c
R sw/airborne/firmwares/rotorcraft/battery.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/fms/fms_spi_autopilot_msg.c
R sw/airborne/lisa/lisa_analog_plug.c
M sw/airborne/math/pprz_algebra_float.h
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
M sw/airborne/subsystems/imu.c
M sw/airborne/test/subsystems/test_ahrs.c
M sw/airborne/test/subsystems/test_imu.c
M sw/airborne/test/test_algebra.c
M sw/ground_segment/joystick/input2ivy.ml
M sw/lib/ocaml/expr_lexer.mll
M sw/lib/ocaml/expr_parser.mly
M sw/lib/ocaml/expr_syntax.ml
M sw/lib/ocaml/expr_syntax.mli
M sw/lib/ocaml/papget.ml
M sw/tools/fp_proc.ml
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi
Commit: ac8b9d9926e3396ed97282e25f46e93cda5ccf0c
https://github.com/paparazzi/paparazzi/commit/ac8b9d9926e3396ed97282e25f46e93cda5ccf0c
Author: Antoine Drouin <address@hidden>
Date: 2011-03-29 (Tue, 29 Mar 2011)
Changed paths:
M conf/airframes/Poine/booz2_a7.xml
Log Message:
-----------
no pers settings for the demo
Commit: 8c6a3077a31df5610d66b7de1271a985b06a6a98
https://github.com/paparazzi/paparazzi/commit/8c6a3077a31df5610d66b7de1271a985b06a6a98
Author: Felix Ruess <address@hidden>
Date: 2011-03-31 (Thu, 31 Mar 2011)
Changed paths:
M conf/airframes/Poine/booz2_a7.xml
M conf/autopilot/lisa_l_test_progs.makefile
M conf/settings/settings_test.xml
M sw/airborne/subsystems/settings.c
M sw/airborne/subsystems/settings.h
M sw/tools/gen_settings.ml
Log Message:
-----------
Merge branch 'master' into dev-state-interface
Commit: 2c971b4db40626cc40375e0b7ade06a3621abd50
https://github.com/paparazzi/paparazzi/commit/2c971b4db40626cc40375e0b7ade06a3621abd50
Author: Felix Ruess <address@hidden>
Date: 2011-03-31 (Thu, 31 Mar 2011)
Changed paths:
M sw/airborne/firmwares/rotorcraft/autopilot.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/navigation.c
Log Message:
-----------
use state interface in guidance_v and reset origin on nav_reset_alt
Commit: b7ff440883b62e8c504b15718891bd389ca5c649
https://github.com/paparazzi/paparazzi/commit/b7ff440883b62e8c504b15718891bd389ca5c649
Author: Felix Ruess <address@hidden>
Date: 2011-03-31 (Thu, 31 Mar 2011)
Changed paths:
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
Log Message:
-----------
state interface: use get functions in guidance_h, definitely not so nice where
the VECT2_x macros are used....
Commit: 1aafda872af6679e369f51f65db70bf16e938c53
https://github.com/paparazzi/paparazzi/commit/1aafda872af6679e369f51f65db70bf16e938c53
Author: Allen <address@hidden>
Date: 2011-03-31 (Thu, 31 Mar 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Start of skeleton for BMP085 baro sensor on lisa/m
Commit: 81d95eec98acd1a52e2fae935e788e4f4e602013
https://github.com/paparazzi/paparazzi/commit/81d95eec98acd1a52e2fae935e788e4f4e602013
Author: Allen <address@hidden>
Date: 2011-03-31 (Thu, 31 Mar 2011)
Changed paths:
M conf/airframes/esden/lisa_m_pwm.xml
M conf/autopilot/lisa_m_test_progs.makefile
A sw/airborne/boards/lisa_m/test_baro.c
Log Message:
-----------
Add/enable lisa_m test_baro test program
Commit: ed568625afa64df883dc9a0a8ac65187a30bde7b
https://github.com/paparazzi/paparazzi/commit/ed568625afa64df883dc9a0a8ac65187a30bde7b
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M conf/modules/servo_switch.xml
M sw/airborne/subsystems/navigation/spiral.c
Log Message:
-----------
fix spiral for compilation with g++ (jsbsim target) and add jsbsim to
servo_switch targets
Commit: 15761b85376ebeb950283ba6ae8a288ec7558bf2
https://github.com/paparazzi/paparazzi/commit/15761b85376ebeb950283ba6ae8a288ec7558bf2
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
A conf/airframes/AirborneCodeReorg/ChimuLisaFw.xml
M conf/airframes/TU_Delft/yapa_xsens.xml
A conf/modules/ins_chimu.xml
A conf/radios/R617FS_5ch_neg.xml
A sw/airborne/modules/ins/endian_functions.c
A sw/airborne/modules/ins/endian_functions.h
A sw/airborne/modules/ins/imu_chimu.c
A sw/airborne/modules/ins/imu_chimu.h
Log Message:
-----------
CHIMU
Commit: 23573cd2fa0f40c2db8c0b8f6930690bc6a3e007
https://github.com/paparazzi/paparazzi/commit/23573cd2fa0f40c2db8c0b8f6930690bc6a3e007
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
R TODO
M conf/Makefile.stm32
M conf/airframes/ENAC/quadrotor/blender.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/Poine/booz2_a7.xml
A conf/airframes/Poine/test_settings.xml
M conf/airframes/booz2_flixr.xml
M conf/airframes/esden/lisa_m_pwm.xml
M conf/airframes/esden/lisa_pwm_aspirin.xml
M conf/airframes/twinjet_example.xml
M conf/autopilot/booz2_test_progs.makefile
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/setup.makefile
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M conf/autopilot/subsystems/fixedwing/control_new.makefile
M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
M conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile
M conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
A conf/autopilot/subsystems/rotorcraft/actuators_dummy.makefile
M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.makefile
M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile
M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile
M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
M conf/autopilot/subsystems/rotorcraft/imu_crista.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_transparent.makefile
A conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
M conf/autopilot/subsystems/rotorcraft/telemetry_xbee_api.makefile
A conf/autopilot/subsystems/shared/ahrs_ic.makefile
A conf/autopilot/subsystems/shared/imu_aspirin.makefile
M conf/flight_plans/EMAV2008.xml
M conf/flight_plans/IS.xml
M conf/flight_plans/basic.xml
M conf/flight_plans/ccc_gl.xml
M conf/flight_plans/fp_tp_auto.xml
M conf/flight_plans/grosslobke_demo.xml
M conf/flight_plans/joystick.xml
M conf/flight_plans/landing.xml
M conf/flight_plans/mav07.xml
M conf/flight_plans/mav08.xml
M conf/flight_plans/nordlys.xml
M conf/flight_plans/poles.xml
M conf/flight_plans/slayer_training.xml
M conf/flight_plans/snav.xml
M conf/flight_plans/standard.xml
M conf/flight_plans/tcas.xml
M conf/flight_plans/versatile.xml
M conf/flight_plans/xsens_cachejunction.xml
A conf/gps/rotorcraft_ublox6.txt
M conf/messages.xml
A conf/modules/ins_arduimu_basic.xml
M conf/modules/servo_switch.xml
M conf/modules/sonar_maxbotix_booz.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 conf/telemetry/telemetry_booz2.xml
R conf/telemetry/telemetry_booz2_flixr.xml
M doc/pprz_algebra/quaternion.tex
M sw/airborne/arch/lpc21/mcu_periph/adc_arch.h
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/lpc21/subsystems/settings_arch.c
R sw/airborne/arch/lpc21/vic_slots.txt
A sw/airborne/arch/lpc21/vic_slots_fw.txt
A sw/airborne/arch/lpc21/vic_slots_rotorcrafts.txt
A sw/airborne/arch/sim/subsystems/settings_arch.c
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
A sw/airborne/arch/stm32/subsystems/settings_arch.c
A sw/airborne/arch/stm32/subsystems/settings_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
M sw/airborne/boards/lisa_l_1.0.h
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
A sw/airborne/boards/lisa_m/test_baro.c
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/booz2_test_crista.c
M sw/airborne/booz/test/booz_test_imu.c
M sw/airborne/csc/mercury_xsens.h
M sw/airborne/downlink.c
M sw/airborne/downlink.h
M sw/airborne/firmwares/beth/main_overo.c
M sw/airborne/firmwares/beth/main_stm32.c
M sw/airborne/firmwares/fixedwing/datalink.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
A sw/airborne/firmwares/rotorcraft/actuators/actuators_dummy.c
M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
R sw/airborne/firmwares/rotorcraft/battery.c
R sw/airborne/firmwares/rotorcraft/battery.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/main.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/fms/fms_spi_autopilot_msg.c
R sw/airborne/lisa/lisa_analog_plug.c
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/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
A sw/airborne/modules/sonar/sonar_maxbotix.c
A sw/airborne/modules/sonar/sonar_maxbotix.h
R sw/airborne/modules/sonar/sonar_maxbotix_booz.c
R sw/airborne/modules/sonar/sonar_maxbotix_booz.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_lkf.c
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
M sw/airborne/subsystems/ins.c
M sw/airborne/subsystems/ins.h
M sw/airborne/subsystems/navigation/spiral.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_algebra.c
M sw/airborne/test/test_esc_mkk_simple.c
M sw/ground_segment/joystick/input2ivy.ml
M sw/lib/ocaml/expr_lexer.mll
M sw/lib/ocaml/expr_parser.mly
M sw/lib/ocaml/expr_syntax.ml
M sw/lib/ocaml/expr_syntax.mli
M sw/lib/ocaml/papget.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/tools/fp_proc.ml
M sw/tools/gen_settings.ml
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi into CHIMU
Commit: b324250622a12e53b85d901efaae743eff44fe5a
https://github.com/paparazzi/paparazzi/commit/b324250622a12e53b85d901efaae743eff44fe5a
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M sw/airborne/modules/digital_cam/dc.h
Log Message:
-----------
fix typo in digital cam module
Commit: 03bb0e67bfe6426d534a4425c1cc7015a76812b6
https://github.com/paparazzi/paparazzi/commit/03bb0e67bfe6426d534a4425c1cc7015a76812b6
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M sw/airborne/modules/ins/ins_xsens.c
Log Message:
-----------
fix bracket in ins_xsens
Commit: 32661f972cf6fa082e4f6a500ce47f8955231f08
https://github.com/paparazzi/paparazzi/commit/32661f972cf6fa082e4f6a500ce47f8955231f08
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M conf/airframes/Poine/booz2_a7.xml
M conf/airframes/esden/lisa_m_pwm.xml
M conf/autopilot/lisa_l_test_progs.makefile
M conf/autopilot/lisa_m_test_progs.makefile
M conf/settings/settings_test.xml
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
A sw/airborne/boards/lisa_m/test_baro.c
M sw/airborne/subsystems/navigation/spiral.c
M sw/airborne/subsystems/settings.c
M sw/airborne/subsystems/settings.h
M sw/tools/gen_settings.ml
Log Message:
-----------
Merge branch 'master' into dev
resolved conflicts:
sw/airborne/subsystems/navigation/spiral.c
Commit: 721ff7484cf5397401eb2a6cabd3814287337980
https://github.com/paparazzi/paparazzi/commit/721ff7484cf5397401eb2a6cabd3814287337980
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
A conf/airframes/AirborneCodeReorg/ChimuLisaFw.xml
M conf/airframes/TU_Delft/yapa_xsens.xml
A conf/modules/ins_chimu.xml
A conf/radios/R617FS_5ch_neg.xml
A sw/airborne/modules/ins/endian_functions.c
A sw/airborne/modules/ins/endian_functions.h
A sw/airborne/modules/ins/imu_chimu.c
A sw/airborne/modules/ins/imu_chimu.h
Log Message:
-----------
Merge remote branch 'paparazzi/CHIMU' into dev
Commit: 9ab9ccb7606082f19ea28b2f6a229dba025dbb74
https://github.com/paparazzi/paparazzi/commit/9ab9ccb7606082f19ea28b2f6a229dba025dbb74
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M sw/airborne/modules/ins/endian_functions.c
M sw/airborne/modules/ins/endian_functions.h
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
Log Message:
-----------
fix line endings
Commit: e7b4f05037a64cef01514c9f7afa814f48ee861d
https://github.com/paparazzi/paparazzi/commit/e7b4f05037a64cef01514c9f7afa814f48ee861d
Author: Felix Ruess <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M sw/airborne/modules/ins/ins_xsens.c
Log Message:
-----------
include common_nav.h in ins_xsens for nav_utm_zone0
Commit: 6418f71d5878be6093100a169c21d83fc5fa8f4d
https://github.com/paparazzi/paparazzi/commit/6418f71d5878be6093100a169c21d83fc5fa8f4d
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
M sw/airborne/modules/ins/ins_xsens.c
Log Message:
-----------
gps_xsens
Commit: 65953a69d6516fd994cd85068ce7e9f7440acd22
https://github.com/paparazzi/paparazzi/commit/65953a69d6516fd994cd85068ce7e9f7440acd22
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-01 (Fri, 01 Apr 2011)
Changed paths:
M sw/airborne/modules/ins/ins_xsens.c
Log Message:
-----------
Merge branch 'dev' of github.com:paparazzi/paparazzi into dev
Commit: 17e6d4bb1c5a7f0a40dcb526585a706d6de7ad2e
https://github.com/paparazzi/paparazzi/commit/17e6d4bb1c5a7f0a40dcb526585a706d6de7ad2e
Author: Martin Mueller <address@hidden>
Date: 2011-04-02 (Sat, 02 Apr 2011)
Changed paths:
M conf/airframes/Poine/test_settings.xml
M conf/airframes/mm/extra/probe_t.xml
M conf/airframes/mm/extra/turbine_trigger.xml
M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
M conf/settings/settings_test.xml
M sw/airborne/arch/stm32/stm32f103rb_flash.ld
M sw/airborne/arch/stm32/stm32f103re_flash.ld
M sw/airborne/arch/stm32/subsystems/settings_arch.c
M sw/airborne/arch/stm32/subsystems/settings_arch.h
Log Message:
-----------
some stm32 persistent settings fixes
Commit: 3c6e649a889af444e8230e89b4b56e9e3d726f95
https://github.com/paparazzi/paparazzi/commit/3c6e649a889af444e8230e89b4b56e9e3d726f95
Author: Martin Mueller <address@hidden>
Date: 2011-04-03 (Sun, 03 Apr 2011)
Changed paths:
M conf/airframes/mm/fixed-wing/funjetmm.xml
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
A conf/settings/tuning_pers.xml
M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
M sw/airborne/arch/lpc21/subsystems/settings_arch.c
A sw/airborne/arch/lpc21/subsystems/settings_arch.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/ground_segment/lpc21iap/lpc21iap.c
Log Message:
-----------
add lpc21 persistent settings in flash
Commit: 6b6c61081e9f2c81d47a6b5658a006600de0b64d
https://github.com/paparazzi/paparazzi/commit/6b6c61081e9f2c81d47a6b5658a006600de0b64d
Author: Martin Mueller <address@hidden>
Date: 2011-04-03 (Sun, 03 Apr 2011)
Changed paths:
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M sw/airborne/arch/sim/subsystems/settings_arch.c
Log Message:
-----------
add fixedwing persistent settings for simulation
Commit: 4195119d2d2c56ff869d44a71d0e12fa4076f5c5
https://github.com/paparazzi/paparazzi/commit/4195119d2d2c56ff869d44a71d0e12fa4076f5c5
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-04 (Mon, 04 Apr 2011)
Changed paths:
M conf/airframes/TU_Delft/yapa_xsens.xml
M conf/modules/ins_xsens_MTiG_fixedwing.xml
M conf/settings/basic.xml
M conf/settings/lisa.xml
M conf/settings/tuning.xml
M conf/settings/tuningJH.xml
M conf/settings/tuning_basic_ins.xml
M conf/settings/tuning_ctl_new.xml
M conf/settings/tuning_ins.xml
M conf/settings/tuning_loiter.xml
M conf/settings/tuning_tp_auto.xml
M conf/settings/ugv.xml
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/ins/ins_xsens.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
GPS Reset common for all devices
Commit: c0ff379f9e709a8e84d10ed8d441f6adb7941aa7
https://github.com/paparazzi/paparazzi/commit/c0ff379f9e709a8e84d10ed8d441f6adb7941aa7
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-04 (Mon, 04 Apr 2011)
Changed paths:
M conf/airframes/Poine/test_settings.xml
M conf/airframes/mm/extra/probe_t.xml
M conf/airframes/mm/extra/turbine_trigger.xml
M conf/airframes/mm/fixed-wing/funjetmm.xml
M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M conf/settings/settings_test.xml
A conf/settings/tuning_pers.xml
M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
M sw/airborne/arch/lpc21/subsystems/settings_arch.c
A sw/airborne/arch/lpc21/subsystems/settings_arch.h
M sw/airborne/arch/sim/subsystems/settings_arch.c
M sw/airborne/arch/stm32/stm32f103rb_flash.ld
M sw/airborne/arch/stm32/stm32f103re_flash.ld
M sw/airborne/arch/stm32/subsystems/settings_arch.c
M sw/airborne/arch/stm32/subsystems/settings_arch.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/ground_segment/lpc21iap/lpc21iap.c
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi into CHIMU
Commit: ce0983a143fe831cc0bf4a1280202c0a6971cad5
https://github.com/paparazzi/paparazzi/commit/ce0983a143fe831cc0bf4a1280202c0a6971cad5
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-04 (Mon, 04 Apr 2011)
Changed paths:
M sw/airborne/modules/ins/endian_functions.c
M sw/airborne/modules/ins/endian_functions.h
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
Log Message:
-----------
line endings
Commit: 382d6a1c1b4d66a002dd3d533b44852e7b44f101
https://github.com/paparazzi/paparazzi/commit/382d6a1c1b4d66a002dd3d533b44852e7b44f101
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-04 (Mon, 04 Apr 2011)
Changed paths:
M conf/airframes/AirborneCodeReorg/ChimuLisaFw.xml
A conf/airframes/AirborneCodeReorg/ChimuTinyFw.xml
M conf/modules/gps_i2c.xml
M conf/modules/ins_chimu.xml
M sw/airborne/modules/gps_i2c/gps_i2c.c
M sw/airborne/modules/ins/endian_functions.c
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
A sw/airborne/modules/ins/ins_chimu_uart.c
M sw/airborne/modules/ins/ins_module.h
Log Message:
-----------
CHIMU_UART works
Commit: 3c9e00c424c9db5939dc0e5318000417de0ce785
https://github.com/paparazzi/paparazzi/commit/3c9e00c424c9db5939dc0e5318000417de0ce785
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M conf/airframes/AirborneCodeReorg/ChimuTinyFw.xml
R conf/modules/ins_chimu.xml
A conf/modules/ins_chimu_uart.xml
M sw/airborne/modules/gps_i2c/gps_i2c.c
R sw/airborne/modules/ins/endian_functions.c
R sw/airborne/modules/ins/endian_functions.h
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/ins_chimu_uart.c
Log Message:
-----------
Checksum + Swap Func included
Commit: 497b2e721dd4bfd3992e8278740e98a21ed7f116
https://github.com/paparazzi/paparazzi/commit/497b2e721dd4bfd3992e8278740e98a21ed7f116
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
R conf/airframes/AirborneCodeReorg/ChimuLisaFw.xml
R conf/airframes/AirborneCodeReorg/ChimuTinyFw.xml
R conf/airframes/AirborneCodeReorg/LisaFw.xml
R conf/airframes/AirborneCodeReorg/TinyFw.xml
A conf/airframes/CDW/ChimuLisaFw.xml
A conf/airframes/CDW/ChimuTinyFw.xml
A conf/airframes/CDW/LisaFw.xml
A conf/airframes/CDW/TinyFw.xml
A conf/modules/ins_chimu_spi.xml
M conf/modules/ins_chimu_uart.xml
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
A sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
M sw/airborne/modules/ins/ins_module.h
Log Message:
-----------
Time Sync Between the AHRS data reception and the Main loop
Commit: 7e58875e8d834782434152f08293850a11914b16
https://github.com/paparazzi/paparazzi/commit/7e58875e8d834782434152f08293850a11914b16
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_fbw.c
Log Message:
-----------
Removed delay in FBW command -> actuator copy
Commit: 2104dbf83571b743f74c519bf1c996c03f1cccdb
https://github.com/paparazzi/paparazzi/commit/2104dbf83571b743f74c519bf1c996c03f1cccdb
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
M sw/airborne/modules/ins/ins_chimu_uart.c
Log Message:
-----------
50Hz no double data ultrasmooth
Commit: f699c78bb8cda66025f9679fed68e874b3702bae
https://github.com/paparazzi/paparazzi/commit/f699c78bb8cda66025f9679fed68e874b3702bae
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
minor commenting in lisa_m baro board header
Commit: 8007c46d07319e5da10d3137c61f6f2a31bcbbd6
https://github.com/paparazzi/paparazzi/commit/8007c46d07319e5da10d3137c61f6f2a31bcbbd6
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
Log Message:
-----------
Initial version of lisa_m baro, need to read calibration/temp
Commit: 6c298e05c75b664a7e82110c21b2d342aa2e04b3
https://github.com/paparazzi/paparazzi/commit/6c298e05c75b664a7e82110c21b2d342aa2e04b3
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
Log Message:
-----------
Check i2c busy before checking prescaler for lisa_m baro
Commit: 454e7b34f2372f5dd457e9c2b4fea140abbd8390
https://github.com/paparazzi/paparazzi/commit/454e7b34f2372f5dd457e9c2b4fea140abbd8390
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Lisa/M baro cleanups
Commit: e773f0def4d3e5230d164451098ffac996fcf984
https://github.com/paparazzi/paparazzi/commit/e773f0def4d3e5230d164451098ffac996fcf984
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Add reading of calibration for lisa/m baro
Commit: d2ed683638c1ece22c2c4a3700fa5f2c1b287138
https://github.com/paparazzi/paparazzi/commit/d2ed683638c1ece22c2c4a3700fa5f2c1b287138
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Working on Lisa/M baro code
Commit: b0eadaf8f9ccc087cb98e212d3d66bd532eb2e4b
https://github.com/paparazzi/paparazzi/commit/b0eadaf8f9ccc087cb98e212d3d66bd532eb2e4b
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
Log Message:
-----------
Fix read_reg16 bug
Commit: e39580b1abf12ca8dc5abd773db0943bb282d46a
https://github.com/paparazzi/paparazzi/commit/e39580b1abf12ca8dc5abd773db0943bb282d46a
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Lisa/M baro temp seems to be reading
Commit: 570efe69f1487ea3ccfb809d018bdf3f71514477
https://github.com/paparazzi/paparazzi/commit/570efe69f1487ea3ccfb809d018bdf3f71514477
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Lisa/M baro: broken calibration calc
Commit: 742e9bcb68fe4a36e8dfe62048842d67b0c8e08c
https://github.com/paparazzi/paparazzi/commit/742e9bcb68fe4a36e8dfe62048842d67b0c8e08c
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Apply BMP085 calibration for lisa/m
Commit: 13785b6ce8042cc6924ed25c6bdb637b3be5cc1f
https://github.com/paparazzi/paparazzi/commit/13785b6ce8042cc6924ed25c6bdb637b3be5cc1f
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
Log Message:
-----------
LIsa/M baro Use DRDY line to detect EOC, only read when conversion is
done
Commit: 3e0e35461d00030a73e88232f1c67fb4ed73912f
https://github.com/paparazzi/paparazzi/commit/3e0e35461d00030a73e88232f1c67fb4ed73912f
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
Log Message:
-----------
Run lisa/m baro at full speed (remove prescaler)
Commit: e1a35ee1e5f7588a2b39df16d47a51355437638a
https://github.com/paparazzi/paparazzi/commit/e1a35ee1e5f7588a2b39df16d47a51355437638a
Author: Allen <address@hidden>
Date: 2011-04-05 (Tue, 05 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
Log Message:
-----------
Lisa/M baro - minor baro comments update
Commit: cc17f5fb81d92f4ac213b0d64432afe1acb2cbff
https://github.com/paparazzi/paparazzi/commit/cc17f5fb81d92f4ac213b0d64432afe1acb2cbff
Author: Felix Ruess <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M conf/airframes/Poine/test_settings.xml
M conf/airframes/mm/extra/probe_t.xml
M conf/airframes/mm/extra/turbine_trigger.xml
M conf/airframes/mm/fixed-wing/funjetmm.xml
M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M conf/settings/settings_test.xml
A conf/settings/tuning_pers.xml
M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
M sw/airborne/arch/lpc21/subsystems/settings_arch.c
A sw/airborne/arch/lpc21/subsystems/settings_arch.h
M sw/airborne/arch/sim/subsystems/settings_arch.c
M sw/airborne/arch/stm32/stm32f103rb_flash.ld
M sw/airborne/arch/stm32/stm32f103re_flash.ld
M sw/airborne/arch/stm32/subsystems/settings_arch.c
M sw/airborne/arch/stm32/subsystems/settings_arch.h
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/ground_segment/lpc21iap/lpc21iap.c
Log Message:
-----------
Merge remote branch 'paparazzi/master' into dev
Commit: 7305c90c9ac5c6a7e8a779a47f32a7c5271cae7d
https://github.com/paparazzi/paparazzi/commit/7305c90c9ac5c6a7e8a779a47f32a7c5271cae7d
Author: Felix Ruess <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M conf/airframes/Poine/test_settings.xml
M conf/airframes/esden/lisa_m_pwm.xml
M conf/airframes/mm/extra/probe_t.xml
M conf/airframes/mm/extra/turbine_trigger.xml
M conf/airframes/mm/fixed-wing/funjetmm.xml
M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
M conf/autopilot/lisa_m_test_progs.makefile
M conf/autopilot/subsystems/fixedwing/autopilot.makefile
M conf/settings/settings_test.xml
A conf/settings/tuning_pers.xml
M sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld
M sw/airborne/arch/lpc21/subsystems/settings_arch.c
A sw/airborne/arch/lpc21/subsystems/settings_arch.h
M sw/airborne/arch/sim/subsystems/settings_arch.c
M sw/airborne/arch/stm32/stm32f103rb_flash.ld
M sw/airborne/arch/stm32/stm32f103re_flash.ld
M sw/airborne/arch/stm32/subsystems/settings_arch.c
M sw/airborne/arch/stm32/subsystems/settings_arch.h
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
A sw/airborne/boards/lisa_m/test_baro.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/subsystems/navigation/spiral.c
M sw/ground_segment/lpc21iap/lpc21iap.c
Log Message:
-----------
Merge remote branch 'paparazzi/master' into dev-state-interface
Commit: a4c561b1998e72d9675bbe96a9a3370cc75586fd
https://github.com/paparazzi/paparazzi/commit/a4c561b1998e72d9675bbe96a9a3370cc75586fd
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
A conf/airframes/CDW/ChimuTinyFwSpi.xml
A conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
A sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
A sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.h
M sw/airborne/modules/ins/ins_chimu_spi.c
Log Message:
-----------
First evidence of highspeed SPI slave data entering the circular buffer
Commit: a43b0ffe7ef775fd6f25e3493a2a29140e9546a9
https://github.com/paparazzi/paparazzi/commit/a43b0ffe7ef775fd6f25e3493a2a29140e9546a9
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
Log Message:
-----------
CHIMU Works in SPI mode now...
Commit: 19ee2fe45cbc9ad25217c93f22f9b9686b901af3
https://github.com/paparazzi/paparazzi/commit/19ee2fe45cbc9ad25217c93f22f9b9686b901af3
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi into CHIMU
Commit: 5125399414073338d8cc879c09e82f3b6c1049cc
https://github.com/paparazzi/paparazzi/commit/5125399414073338d8cc879c09e82f3b6c1049cc
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M conf/modules/ins_chimu_spi.xml
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.h
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_module.h
Log Message:
-----------
2-way SPI-Slave: Chimu receives config and corrections over SPI
Commit: 6c8c1f438bb7a2f80dd9c7f2b86d572ca1454e63
https://github.com/paparazzi/paparazzi/commit/6c8c1f438bb7a2f80dd9c7f2b86d572ca1454e63
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M conf/modules/ins_chimu_spi.xml
M sw/airborne/modules/ins/ins_chimu_spi.c
Log Message:
-----------
Bringing the SPI and UART drivers closer together
Commit: 3c601a7cc6a635ab531479707f2a5914cceab0fc
https://github.com/paparazzi/paparazzi/commit/3c601a7cc6a635ab531479707f2a5914cceab0fc
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.h
Log Message:
-----------
Bugfix: Typo in circular buffer + buff size change
Commit: 9446b9acebffd04734480558d8508844ae287f6f
https://github.com/paparazzi/paparazzi/commit/9446b9acebffd04734480558d8508844ae287f6f
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
M sw/airborne/modules/ins/ins_chimu_spi.c
Log Message:
-----------
Centripedal Upload via SPI
Commit: a04935bee13632214ae8df3e5c7ca59375f1b94f
https://github.com/paparazzi/paparazzi/commit/a04935bee13632214ae8df3e5c7ca59375f1b94f
Author: Christophe De Wagter <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M conf/airframes/CDW/ChimuTinyFw.xml
M conf/airframes/CDW/ChimuTinyFwSpi.xml
M conf/modules/ins_chimu_spi.xml
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
Log Message:
-----------
Performance Testing
Commit: 5dc9204684cb5463a825847d39324571b7e6f3c2
https://github.com/paparazzi/paparazzi/commit/5dc9204684cb5463a825847d39324571b7e6f3c2
Author: Allen <address@hidden>
Date: 2011-04-06 (Wed, 06 Apr 2011)
Changed paths:
M conf/airframes/esden/lisa_m_pwm.xml
Log Message:
-----------
Initial baro/hover tuning for Lisa/M
Commit: 6a7d5767dd839eccb9c7358b22c0ba6929ad9f9c
https://github.com/paparazzi/paparazzi/commit/6a7d5767dd839eccb9c7358b22c0ba6929ad9f9c
Author: Antoine Drouin <address@hidden>
Date: 2011-04-09 (Sat, 09 Apr 2011)
Changed paths:
M sw/airborne/arch/stm32/mcu_arch.c
Log Message:
-----------
enabling all clock after startup on stm32
Commit: c0269944c6782b004c98a641eb367d75cc9438ed
https://github.com/paparazzi/paparazzi/commit/c0269944c6782b004c98a641eb367d75cc9438ed
Author: Antoine Drouin <address@hidden>
Date: 2011-04-10 (Sun, 10 Apr 2011)
Changed paths:
R conf/airframes/Poine/booz2_a6.xml
A conf/airframes/Poine/h_hex.xml
Log Message:
-----------
trying to find better names
Commit: 4cf1c3161524e3546d0dc6f7cc856f73ba34d523
https://github.com/paparazzi/paparazzi/commit/4cf1c3161524e3546d0dc6f7cc856f73ba34d523
Author: Antoine Drouin <address@hidden>
Date: 2011-04-10 (Sun, 10 Apr 2011)
Changed paths:
R conf/flight_plans/basic_booz.xml
A conf/flight_plans/rotorcraft_basic.xml
Log Message:
-----------
trying to find better names for flight plans too
Commit: 61dae0cede8b037dfc72f3836f4f3c7c227d82bf
https://github.com/paparazzi/paparazzi/commit/61dae0cede8b037dfc72f3836f4f3c7c227d82bf
Author: Antoine Drouin <address@hidden>
Date: 2011-04-10 (Sun, 10 Apr 2011)
Changed paths:
M sw/airborne/arch/stm32/mcu_arch.c
Log Message:
-----------
conditionned starting of all clock on stm32
Commit: b32a16c41d58a5778e694e054fbd146c71655538
https://github.com/paparazzi/paparazzi/commit/b32a16c41d58a5778e694e054fbd146c71655538
Author: Antoine Drouin <address@hidden>
Date: 2011-04-10 (Sun, 10 Apr 2011)
Changed paths:
A sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
Log Message:
-----------
adding a file to use the same driver for both i2c on stm32 - added i2c reset on
different errors
Commit: 7663d55a119048a48eb9a7e3e6d050870d64d4c8
https://github.com/paparazzi/paparazzi/commit/7663d55a119048a48eb9a7e3e6d050870d64d4c8
Author: Antoine Drouin <address@hidden>
Date: 2011-04-11 (Mon, 11 Apr 2011)
Changed paths:
M sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
Log Message:
-----------
only reset i2c peripheral on spurious_interrupt(I2CAddrWrSent) - this is a test
for trying to understand what happens on Stephen's quad
Commit: e6241768b356acab129d02cf32c266fcc22453d9
https://github.com/paparazzi/paparazzi/commit/e6241768b356acab129d02cf32c266fcc22453d9
Author: Felix Ruess <address@hidden>
Date: 2011-04-11 (Mon, 11 Apr 2011)
Changed paths:
M Makefile
Log Message:
-----------
fix top level makefile when testing for ARMGCC to build usb_lib, thx Olri
Commit: f88a75d6209b05b2a5f165e6777d8d4db7df9de1
https://github.com/paparazzi/paparazzi/commit/f88a75d6209b05b2a5f165e6777d8d4db7df9de1
Author: Felix Ruess <address@hidden>
Date: 2011-04-11 (Mon, 11 Apr 2011)
Changed paths:
M Makefile
R conf/airframes/Poine/booz2_a6.xml
A conf/airframes/Poine/h_hex.xml
M conf/airframes/esden/lisa_m_pwm.xml
R conf/flight_plans/basic_booz.xml
A conf/flight_plans/rotorcraft_basic.xml
M sw/airborne/arch/stm32/mcu_arch.c
A sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
Log Message:
-----------
Merge branch 'master' into dev
Commit: 2b55a3149fa9186f8c71ae8dbf940dc1422da441
https://github.com/paparazzi/paparazzi/commit/2b55a3149fa9186f8c71ae8dbf940dc1422da441
Author: Felix Ruess <address@hidden>
Date: 2011-04-11 (Mon, 11 Apr 2011)
Changed paths:
R conf/airframes/AirborneCodeReorg/ChimuLisaFw.xml
R conf/airframes/AirborneCodeReorg/LisaFw.xml
R conf/airframes/AirborneCodeReorg/TinyFw.xml
A conf/airframes/CDW/ChimuLisaFw.xml
A conf/airframes/CDW/ChimuTinyFw.xml
A conf/airframes/CDW/ChimuTinyFwSpi.xml
A conf/airframes/CDW/LisaFw.xml
A conf/airframes/CDW/TinyFw.xml
A conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
M conf/modules/gps_i2c.xml
R conf/modules/ins_chimu.xml
A conf/modules/ins_chimu_spi.xml
A conf/modules/ins_chimu_uart.xml
A sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
A sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/modules/gps_i2c/gps_i2c.c
R sw/airborne/modules/ins/endian_functions.c
R sw/airborne/modules/ins/endian_functions.h
M sw/airborne/modules/ins/imu_chimu.c
M sw/airborne/modules/ins/imu_chimu.h
A sw/airborne/modules/ins/ins_chimu_spi.c
A sw/airborne/modules/ins/ins_chimu_uart.c
M sw/airborne/modules/ins/ins_module.h
Log Message:
-----------
Merge remote branch 'paparazzi/CHIMU' into dev
resolved conflicts:
sw/airborne/modules/ins/endian_functions.c
sw/airborne/modules/ins/endian_functions.h
sw/airborne/modules/ins/imu_chimu.c
sw/airborne/modules/ins/imu_chimu.h
Commit: 6adfb340d3fe6cf9015d81e64c239085f2c6d258
https://github.com/paparazzi/paparazzi/commit/6adfb340d3fe6cf9015d81e64c239085f2c6d258
Author: Felix Ruess <address@hidden>
Date: 2011-04-11 (Mon, 11 Apr 2011)
Changed paths:
M Makefile
R conf/airframes/AirborneCodeReorg/LisaFw.xml
R conf/airframes/AirborneCodeReorg/TinyFw.xml
A conf/airframes/CDW/ChimuLisaFw.xml
A conf/airframes/CDW/ChimuTinyFw.xml
A conf/airframes/CDW/ChimuTinyFwSpi.xml
A conf/airframes/CDW/LisaFw.xml
A conf/airframes/CDW/TinyFw.xml
R conf/airframes/Poine/booz2_a6.xml
A conf/airframes/Poine/h_hex.xml
M conf/airframes/TU_Delft/yapa_xsens.xml
M conf/airframes/esden/lisa_m_pwm.xml
M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
A conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
R conf/flight_plans/basic_booz.xml
A conf/flight_plans/rotorcraft_basic.xml
M conf/modules/gps_i2c.xml
A conf/modules/ins_chimu_spi.xml
A conf/modules/ins_chimu_uart.xml
M conf/modules/ins_xsens_MTiG_fixedwing.xml
A conf/radios/R617FS_5ch_neg.xml
M conf/settings/basic.xml
M conf/settings/lisa.xml
M conf/settings/tuning.xml
M conf/settings/tuningJH.xml
M conf/settings/tuning_basic_ins.xml
M conf/settings/tuning_ctl_new.xml
M conf/settings/tuning_ins.xml
M conf/settings/tuning_loiter.xml
M conf/settings/tuning_tp_auto.xml
M conf/settings/ugv.xml
A sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
A sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.h
M sw/airborne/arch/stm32/mcu_arch.c
A sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/modules/digital_cam/dc.h
M sw/airborne/modules/gps_i2c/gps_i2c.c
A sw/airborne/modules/ins/imu_chimu.c
A sw/airborne/modules/ins/imu_chimu.h
A sw/airborne/modules/ins/ins_chimu_spi.c
A sw/airborne/modules/ins/ins_chimu_uart.c
M sw/airborne/modules/ins/ins_module.h
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/ins/ins_xsens.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
Merge branch 'dev' into dev-state-interface
Compare: https://github.com/paparazzi/paparazzi/compare/163aa1d...6adfb34
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [paparazzi/paparazzi] 9fd0e6: Merge branch 'master' into dev,
noreply <=