56e74ad19e
Merge branch 'master' into vector_control
2013-07-13 18:35:10 +02:00
1ccfb623ee
Merge remote-tracking branch 'upstream/master' into hott-esc
2013-07-13 01:08:45 +02:00
b500cce31e
Major refactor of HoTT drivers and finished sensor read implementation.
2013-07-13 01:08:06 +02:00
8778230050
multirotor_pos_control fixes, systemlib/pid now accepts limit = 0.0, means no limit
2013-07-12 21:59:49 +04:00
eb5af244b9
sdlog2: GVSP (global velocity setpoint) message added, cleanup
2013-07-12 21:57:46 +04:00
5937c3a31b
uORB topic vehicle_global_velocity_setpoint added
2013-07-12 16:30:11 +04:00
77add4b511
Merge branch 'master' into seatbelt_multirotor
2013-07-12 13:23:31 +04:00
d4c6ebde33
multirotor_pos_control: global_position_setpoint support in AUTO mode
2013-07-12 13:17:42 +04:00
3b9c306d64
Hotfix for relative altitude waypoints
2013-07-12 11:11:26 +02:00
9a6bf91b93
More comments
2013-07-12 09:10:58 +02:00
f6b3692696
Minor fixes and cleanups, ready for first bench tests
2013-07-12 09:09:11 +02:00
babbcea3b6
Merge branch 'sdlog2_GPSP' into seatbelt_multirotor
2013-07-12 10:11:08 +04:00
1d986d6c04
sdlog2: Global Position Set Point message added, vehicle_global_position_setpoint topic fixed
2013-07-12 10:09:38 +04:00
c51c211bba
position_estimator_inav: global position altitude fixed
2013-07-12 08:45:49 +04:00
9b7ee09d43
Merge branch 'master' into vector_control
2013-07-11 23:25:31 +02:00
28f536dc44
Hotfix: fixed compile warnings
2013-07-11 23:25:08 +02:00
d999a376da
Enabled imax params
2013-07-11 23:23:55 +02:00
02d918b46d
Removed airspeed
2013-07-11 23:22:56 +02:00
feddb618c4
Added rotation matrix based vector controller
2013-07-11 23:12:06 +02:00
c291c4482a
Merge branch 'master' into seatbelt_multirotor
2013-07-11 20:49:28 +04:00
3a76162b08
Merge pull request #317 from DrTon/arm_safe_fix
...
Arm/disarm and SAS modes order safety fixes
2013-07-10 22:53:45 -07:00
dc600e7d65
First stab at IOCTL driven offset handling (in PA) for all airspeed sensors. Untested
2013-07-10 20:58:47 +02:00
f27491d2e5
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
2013-07-10 11:58:48 +02:00
897b541b12
General cleanup of /dev/px4io and /dev/px4fmu
...
- Use distinct common symbols for px4io and px4fmu device files, and use
instead of hardcoded filenames
- Use common symbols defining px4io bits consistently between px4fmu and
px4io builds.
2013-07-09 20:37:00 -04:00
c264267814
Merge remote-tracking branch 'upstream/master'
2013-07-09 17:10:49 -04:00
33c7c2c32e
Merge branch 'master' of github.com:PX4/Firmware
2013-07-09 13:34:12 +02:00
82c13efad1
Merged CPU load changes by freddie chopin
2013-07-09 13:27:17 +02:00
9c6cca8b9b
Merge pull request #310 from PX4/att_fix
...
fixed attitude estimator params
2013-07-09 04:11:38 -07:00
04fbed493a
multirotor_pos_control: use separate PID controllers for position and velocity
2013-07-09 14:09:48 +04:00
bbe6615884
Merge pull request #324 from DrTon/gpio_led_io_relay
...
gpio_led: PX4IO RELAY and ACC outputs support
2013-07-09 02:09:30 -07:00
a9b327b1fe
Merge remote-tracking branch 'upstream/master'
2013-07-08 17:13:41 -04:00
ced2871263
Merged mkblctrl
2013-07-08 20:48:30 +02:00
6436e2e350
Updated mavlink_onboard as well (Hotfix)
2013-07-08 14:43:27 +02:00
040b8f3802
Cleaned up MAVLink include hierarchy
2013-07-08 14:16:46 +02:00
88389ea255
Merge branch 'master' into new_state_machine
...
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
2013-07-08 10:31:32 +02:00
320a5b7579
Merge branch 'master' into seatbelt_multirotor
2013-07-08 12:18:32 +04:00
e2458677c9
Tweak IO serial packet error handling slightly; on reception of a serial error send a line break back to FMU. This should cause FMU to stop sending immediately.
...
Flag these cases and discard the packet rather than processing it, rather than simply dropping the received packet and letting FMU time out.
2013-07-07 20:42:03 -07:00
b4029dd824
Pull v2 pieces up to build with the merge
2013-07-07 17:53:55 -07:00
dab652faf6
Prevent RELAY1 control via IOCTL if DSM bind feature is enabled
2013-07-07 19:04:30 -04:00
43f1843cc7
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
2013-07-07 12:22:56 -07:00
35711280df
Merge remote-tracking branch 'upstream/master'
2013-07-07 14:29:30 -04:00
c4dfc345a1
Version from esc_status topic added to sdlog2
2013-07-07 18:27:08 +02:00
8fa226c909
Tweak protocol register assignments and add new registers to accommodate differences in IOv2.
2013-07-06 23:59:35 -07:00
4d400aa7e7
Enable UART error handling on PX4IO.
2013-07-06 12:27:37 -07:00
369e6d1eea
gpio_led: minor usage fix
2013-07-06 18:37:02 +04:00
8d0784af61
gpio_led: PX4IO RELAY and ACC outputs support, some fixes
2013-07-06 18:30:09 +04:00
87a4f1507a
Move the common definitions for the PX4IO serial protocol into the shared header.
2013-07-06 00:16:37 -07:00
19b2e1de85
Copy the correct number of bytes back for register read operations. Basic PX4IO comms are working now.
2013-07-06 00:00:44 -07:00
6871d2909b
Add a mechanism for cancelling begin/end perf counters.
2013-07-05 22:53:57 -07:00
3c8c596ac7
Enable handling for short-packet reception on FMU using the line-idle interrupt from the UART. Enable short packets at both ends.
2013-07-05 20:37:05 -07:00
Lorenz Meier