[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 8bc0e9: Merge branch 'dev' of
From: |
GitHub |
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 8bc0e9: Merge branch 'dev' of github.com:paparazzi/paparaz... |
Date: |
Thu, 22 Mar 2012 01:16:50 -0700 |
Branch: refs/heads/dev_i2c
Home: https://github.com/paparazzi/paparazzi
Commit: 8bc0e9f0956cfa244c90d647e1084a4c4b00fe0b
https://github.com/paparazzi/paparazzi/commit/8bc0e9f0956cfa244c90d647e1084a4c4b00fe0b
Author: Christophe De Wagter <address@hidden>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M conf/messages.xml
A conf/radios/TGY9x_jeti.xml
M sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_mtk.c
M sw/airborne/subsystems/gps/gps_mtk.h
M sw/airborne/subsystems/gps/gps_nmea.h
M sw/airborne/subsystems/gps/gps_sim.h
M sw/airborne/subsystems/gps/gps_sim_nps.h
M sw/airborne/subsystems/gps/gps_skytraq.c
M sw/airborne/subsystems/gps/gps_skytraq.h
M sw/airborne/subsystems/gps/gps_ubx.h
Log Message:
-----------
Merge branch 'dev' of github.com:paparazzi/paparazzi into dev
Commit: 3c3e5eb699d568d9fa3e928ca8211c464bebb0c8
https://github.com/paparazzi/paparazzi/commit/3c3e5eb699d568d9fa3e928ca8211c464bebb0c8
Author: Christophe De Wagter <address@hidden>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M conf/autopilot/logger.makefile
Log Message:
-----------
SD Logger Init Uarts
Commit: e666b29c504bc18b74b252f8174e5ac62d17edb5
https://github.com/paparazzi/paparazzi/commit/e666b29c504bc18b74b252f8174e5ac62d17edb5
Author: Felix Ruess <address@hidden>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M sw/airborne/modules/ins/ins_xsens.h
Log Message:
-----------
ins_xsens module: removed GPS_FIX defines again, they are back in gps.h...
sorry...
Commit: 64fc319ab554e3d472a969653f405a8f4f8c7962
https://github.com/paparazzi/paparazzi/commit/64fc319ab554e3d472a969653f405a8f4f8c7962
Author: Simon Wilks <address@hidden>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
Log Message:
-----------
Some PWM ESC controllers such as the UltraPWM ESCs from XAircraft
operate with a pusle width range of 200 - 1200. If you specify
OFF_MOTOR in the SUPERVISION section you can override the default
of 1000. As a result your motors will not start up when power is
applied.
Commit: 8a09d7a6efeab85f8dc8390bc408a07e173cd76d
https://github.com/paparazzi/paparazzi/commit/8a09d7a6efeab85f8dc8390bc408a07e173cd76d
Author: Simon Wilks <address@hidden>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
Log Message:
-----------
Changed ZERO_MOTOR to OFF_MOTOR.
Commit: 4ea20ba259232aed508a3a07a2bfd7b44613d8ff
https://github.com/paparazzi/paparazzi/commit/4ea20ba259232aed508a3a07a2bfd7b44613d8ff
Author: Simon Wilks <address@hidden>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
Log Message:
-----------
Changed from OFF_MOTOR to STOP_MOTOR.
Commit: f6e510d63a3f265de79403dfe78ac75900b7bb22
https://github.com/paparazzi/paparazzi/commit/f6e510d63a3f265de79403dfe78ac75900b7bb22
Author: Bernard Davison <address@hidden>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M Doxyfile
M conf/airframes/CDW/LisaAspirin2.xml
M conf/airframes/ENAC/quadrotor/navgo.xml
M conf/airframes/booz2_flixr.xml
M conf/airframes/example_heli_lisam.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
A conf/airframes/logomatic.xml
A conf/airframes/mm/extra/logger_sd_twog.xml
M conf/autopilot/logger.makefile
A conf/autopilot/subsystems/fixedwing/gps_skytraq.makefile
M conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
M conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
M conf/boards/lisa_m_1.0.makefile
M conf/boards/lisa_m_2.0.makefile
A conf/boards/logom_2.6.makefile
M conf/messages.xml
M conf/modules/demo_module.xml
M conf/modules/ins_chimu_spi.xml
M conf/modules/ins_chimu_uart.xml
A conf/modules/nav_catapult.xml
M conf/modules/sonar_maxbotix_booz.xml
A conf/radios/TGY9x_jeti.xml
M conf/settings/tuning_ctl_new.xml
M conf/settings/tuning_ins.xml
M sw/airborne/arch/lpc21/peripherals/ms2100_arch.c
M sw/airborne/arch/lpc21/peripherals/ms2100_arch.h
M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
M sw/airborne/arch/lpc21/test/bootloader/Makefile
M sw/airborne/arch/stm32/peripherals/ms2100_arch.c
M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
M sw/airborne/arch/stm32/subsystems/imu/imu_b2_arch.c
A sw/airborne/boards/logom_2.6.h
M sw/airborne/booz/test/booz2_test_micromag.c
A sw/airborne/firmwares/beth/rcv_telemetry.c
R sw/airborne/firmwares/beth/rcv_telemetry.c
M sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/motor_bench/main_motor_bench.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/firmwares/tutorial/main_demo3.c
M sw/airborne/firmwares/tutorial/main_demo4.c
M sw/airborne/firmwares/tutorial/main_demo5.c
M sw/airborne/firmwares/tutorial/main_demo6.c
A sw/airborne/firmwares/vor/lo.h
R sw/airborne/firmwares/vor/lo.h
R sw/airborne/firmwares/vor/vor_int_demod_decim.c
A sw/airborne/firmwares/vor/vor_int_demod_decim.c
A sw/airborne/firmwares/vor/vor_int_demod_decim.h
R sw/airborne/firmwares/vor/vor_int_demod_decim.h
A sw/airborne/firmwares/vor/vor_int_filters_decim.h
R sw/airborne/firmwares/vor/vor_int_filters_decim.h
M sw/airborne/lisa/test/lisa_test_max1168.c
M sw/airborne/lisa/test/lisa_test_ms2100.c
M sw/airborne/lisa/test_adc.c
M sw/airborne/lisa/test_spi_slave.c
M sw/airborne/lisa/test_spi_slave2.c
R sw/airborne/modules/ins/ins_chimu.h
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
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
R sw/airborne/modules/openlog/openlog.c
R sw/airborne/modules/openlog/openlog.h
A sw/airborne/modules/openlog/openlog.h
R sw/airborne/modules/sensors/airspeed_amsys.c
A sw/airborne/modules/sensors/airspeed_amsys.c
R sw/airborne/modules/sensors/airspeed_amsys.h
A sw/airborne/modules/sensors/airspeed_amsys.h
A sw/airborne/modules/sensors/baro_amsys.c
R sw/airborne/modules/sensors/baro_amsys.c
R sw/airborne/modules/sensors/baro_amsys.h
A sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_mtk.c
M sw/airborne/subsystems/gps/gps_mtk.h
M sw/airborne/subsystems/gps/gps_nmea.c
M sw/airborne/subsystems/gps/gps_nmea.h
M sw/airborne/subsystems/gps/gps_sim.h
M sw/airborne/subsystems/gps/gps_sim_nps.h
M sw/airborne/subsystems/gps/gps_skytraq.c
M sw/airborne/subsystems/gps/gps_skytraq.h
M sw/airborne/subsystems/gps/gps_ubx.c
M sw/airborne/subsystems/gps/gps_ubx.h
M sw/airborne/subsystems/imu/imu_aspirin2.c
M sw/airborne/subsystems/imu/imu_aspirin2.h
M sw/airborne/subsystems/ins.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/airborne/test/nova_test_imu.c
M sw/airborne/test/subsystems/test_radio_control.c
M sw/ground_segment/cockpit/gcs.ml
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/cockpit/live.mli
A sw/logalizer/openlog2tlm.c
R sw/logalizer/openlog2tlm.c
Log Message:
-----------
Merge branch 'dev' of github.com:paparazzi/paparazzi into hardware_test
Commit: cc050c4781dfc1aa3b10932ceb0abcef9b228d9e
https://github.com/paparazzi/paparazzi/commit/cc050c4781dfc1aa3b10932ceb0abcef9b228d9e
Author: Bernard Davison <address@hidden>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M tests/examples/01_compile_all_example_targets.t
Log Message:
-----------
Commenting out tests that are known to fail on Mac due to JSBSim.
Commit: 90bdc9344c98b706528eac14fd6d66e2400c291b
https://github.com/paparazzi/paparazzi/commit/90bdc9344c98b706528eac14fd6d66e2400c291b
Author: Felix Ruess <address@hidden>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M .gitignore
M Makefile
M conf/Makefile.stm32
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/conf.xml.example
A tests/LisaL/01_upload.t
A tests/Makefile
A tests/examples/01_compile_all_example_targets.t
A tests/lib/Ivy.pm
A tests/lib/Proc/Background.pm
A tests/lib/Proc/Background/Unix.pm
A tests/lib/Proc/Background/Win32.pm
A tests/lib/Program.pm
A tests/lib/XML/NamespaceSupport.pm
A tests/lib/XML/SAX.pm
A tests/lib/XML/SAX/Base.pm
A tests/lib/XML/SAX/BuildSAXBase.pl
A tests/lib/XML/SAX/DocumentLocator.pm
A tests/lib/XML/SAX/Exception.pm
A tests/lib/XML/SAX/Intro.pod
A tests/lib/XML/SAX/ParserFactory.pm
A tests/lib/XML/SAX/PurePerl.pm
A tests/lib/XML/SAX/PurePerl/DTDDecls.pm
A tests/lib/XML/SAX/PurePerl/DebugHandler.pm
A tests/lib/XML/SAX/PurePerl/DocType.pm
A tests/lib/XML/SAX/PurePerl/EncodingDetect.pm
A tests/lib/XML/SAX/PurePerl/Exception.pm
A tests/lib/XML/SAX/PurePerl/NoUnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/Productions.pm
A tests/lib/XML/SAX/PurePerl/Reader.pm
A tests/lib/XML/SAX/PurePerl/Reader/NoUnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/Reader/Stream.pm
A tests/lib/XML/SAX/PurePerl/Reader/String.pm
A tests/lib/XML/SAX/PurePerl/Reader/URI.pm
A tests/lib/XML/SAX/PurePerl/Reader/UnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/UnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/XMLDecl.pm
A tests/lib/XML/Simple.pm
A tests/lib/XML/Simple/FAQ.pod
Log Message:
-----------
Merge branch 'hardware_test' into dev
Commit: c2bc03e6fd7f29b6bf2353cb04768afb5913a95a
https://github.com/paparazzi/paparazzi/commit/c2bc03e6fd7f29b6bf2353cb04768afb5913a95a
Author: Felix Ruess <address@hidden>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
Log Message:
-----------
rotorcraft guidance_h: also compute quaternion setpoint from euler setpoint
Commit: e459b77a33d46f7823128e87a3bd936d5985aa8b
https://github.com/paparazzi/paparazzi/commit/e459b77a33d46f7823128e87a3bd936d5985aa8b
Author: Simon Wilks <address@hidden>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
Log Message:
-----------
Rename SUPERVISION_STOP_MOTOR to SUPERVISION_PWM_OFF.
Commit: 58b842d47269f06c63720b4f3731594fc5cc14fd
https://github.com/paparazzi/paparazzi/commit/58b842d47269f06c63720b4f3731594fc5cc14fd
Author: Felix Ruess <address@hidden>
Date: 2012-03-19 (Mon, 19 Mar 2012)
Changed paths:
M conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
M
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
Log Message:
-----------
rotorcraft guidance_h: only compute quaternion setpoint if we actually have a
quaternion version
added a STABILISATION_ATTITUDE_TYPE_QUAT define... maybe not the best way to
go, but works for now...
Commit: fc851c6c08f82a53887ac62bb32db1663e692e8a
https://github.com/paparazzi/paparazzi/commit/fc851c6c08f82a53887ac62bb32db1663e692e8a
Author: Felix Ruess <address@hidden>
Date: 2012-03-20 (Tue, 20 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
Log Message:
-----------
Merge pull request #165 from sjwilks/dev
Make it possible to define the PWM for motors off in the airframe file.
Commit: 243dc8600476ef14e40c701e79865b441ef05f51
https://github.com/paparazzi/paparazzi/commit/243dc8600476ef14e40c701e79865b441ef05f51
Author: Felix Ruess <address@hidden>
Date: 2012-03-20 (Tue, 20 Mar 2012)
Changed paths:
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
Log Message:
-----------
rotorcraft supervision: if motors are off use generic SUPERVISION_STOP_MOTOR
value instead of only SUPERVISION_PWM_OFF in case of pwm_supervision
Commit: 0f6c179101dedff3cf21a3c046b614cc38fd1fd7
https://github.com/paparazzi/paparazzi/commit/0f6c179101dedff3cf21a3c046b614cc38fd1fd7
Author: Bernard Davison <address@hidden>
Date: 2012-03-20 (Tue, 20 Mar 2012)
Changed paths:
M tests/LisaL/01_upload.t
M tests/examples/01_compile_all_example_targets.t
Log Message:
-----------
Making the /Error/ regex match on word boundries so it won't match i2c_error
for example.
Commit: e134fba9dc1dc1b91088b19001807abd597b4ad6
https://github.com/paparazzi/paparazzi/commit/e134fba9dc1dc1b91088b19001807abd597b4ad6
Author: Felix Ruess <address@hidden>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Changed paths:
M sw/simulator/flightModel.ml
Log Message:
-----------
ocaml simulator: limit max roll angle to ROLL_MAX_SETPOINT (Auto2) from
airframe file instead of hardcoding the limit to 0.7 rad
Commit: 3229ec5b6cb74d0df14acff16c00ec04800ac5d1
https://github.com/paparazzi/paparazzi/commit/3229ec5b6cb74d0df14acff16c00ec04800ac5d1
Author: Christophe De Wagter <address@hidden>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Changed paths:
M conf/mtk.dtd
M sw/airborne/modules/benchmark/flight_benchmark.h
Log Message:
-----------
Long lasting Line Ending Error
Commit: 1a203a04b6be6e51df7322d76249a6b30f50258e
https://github.com/paparazzi/paparazzi/commit/1a203a04b6be6e51df7322d76249a6b30f50258e
Author: Felix Ruess <address@hidden>
Date: 2012-03-22 (Thu, 22 Mar 2012)
Changed paths:
M .gitignore
M Makefile
M conf/Makefile.stm32
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/example_heli_lisam.xml
M conf/autopilot/logger.makefile
M conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
M conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
M conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
M
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
M conf/conf.xml.example
M conf/messages.xml
M conf/modules/ins_chimu_spi.xml
M conf/modules/ins_chimu_uart.xml
M conf/mtk.dtd
M sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/modules/benchmark/flight_benchmark.h
R sw/airborne/modules/ins/ins_chimu.h
M sw/airborne/modules/ins/ins_chimu_spi.c
M sw/airborne/modules/ins/ins_chimu_uart.c
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/ins/ins_xsens.h
M sw/airborne/modules/nav/nav_catapult.c
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_mtk.c
M sw/airborne/subsystems/gps/gps_mtk.h
M sw/airborne/subsystems/gps/gps_nmea.h
M sw/airborne/subsystems/gps/gps_sim.h
M sw/airborne/subsystems/gps/gps_sim_nps.h
M sw/airborne/subsystems/gps/gps_skytraq.c
M sw/airborne/subsystems/gps/gps_skytraq.h
M sw/airborne/subsystems/gps/gps_ubx.h
M sw/simulator/flightModel.ml
A tests/LisaL/01_upload.t
A tests/Makefile
A tests/examples/01_compile_all_example_targets.t
A tests/lib/Ivy.pm
A tests/lib/Proc/Background.pm
A tests/lib/Proc/Background/Unix.pm
A tests/lib/Proc/Background/Win32.pm
A tests/lib/Program.pm
A tests/lib/XML/NamespaceSupport.pm
A tests/lib/XML/SAX.pm
A tests/lib/XML/SAX/Base.pm
A tests/lib/XML/SAX/BuildSAXBase.pl
A tests/lib/XML/SAX/DocumentLocator.pm
A tests/lib/XML/SAX/Exception.pm
A tests/lib/XML/SAX/Intro.pod
A tests/lib/XML/SAX/ParserFactory.pm
A tests/lib/XML/SAX/PurePerl.pm
A tests/lib/XML/SAX/PurePerl/DTDDecls.pm
A tests/lib/XML/SAX/PurePerl/DebugHandler.pm
A tests/lib/XML/SAX/PurePerl/DocType.pm
A tests/lib/XML/SAX/PurePerl/EncodingDetect.pm
A tests/lib/XML/SAX/PurePerl/Exception.pm
A tests/lib/XML/SAX/PurePerl/NoUnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/Productions.pm
A tests/lib/XML/SAX/PurePerl/Reader.pm
A tests/lib/XML/SAX/PurePerl/Reader/NoUnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/Reader/Stream.pm
A tests/lib/XML/SAX/PurePerl/Reader/String.pm
A tests/lib/XML/SAX/PurePerl/Reader/URI.pm
A tests/lib/XML/SAX/PurePerl/Reader/UnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/UnicodeExt.pm
A tests/lib/XML/SAX/PurePerl/XMLDecl.pm
A tests/lib/XML/Simple.pm
A tests/lib/XML/Simple/FAQ.pod
Log Message:
-----------
Merge branch 'dev' into dev_i2c
Compare: https://github.com/paparazzi/paparazzi/compare/eeb266d...1a203a0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [paparazzi/paparazzi] 8bc0e9: Merge branch 'dev' of github.com:paparazzi/paparaz...,
GitHub <=