Commit Graph

10367 Commits

Author SHA1 Message Date
Thomas Gubler 2760d64a00 Merge remote-tracking branch 'upstream/master' into dev_ros 2014-11-28 09:47:29 +01:00
Thomas Gubler 946d1203cf remove unnecessary variable 2014-11-28 09:45:39 +01:00
Thomas Gubler 36bf0c04c8 WIP, c++11 style callbacks for px4 2014-11-28 08:58:44 +01:00
Thomas Gubler 486d81cb95 NuttX submodule: header changes 2014-11-28 08:12:46 +01:00
Friedemann Ludwig 8e8b622f4f Implemented altitude and velocity hold mode 2014-11-28 04:11:39 +01:00
Lorenz Meier 22a247ca67 Disable the BlinkM driver, code style fixes for other disabled drivers 2014-11-27 23:19:53 +01:00
Lorenz Meier 9d986f5df3 HMC5883: Better status reporting 2014-11-26 18:22:18 +01:00
Lorenz Meier 2a9a649adb Make boot less verbose to not hide the important status messages 2014-11-26 18:21:54 +01:00
Thomas Gubler ee534b827a move spin functions to nodehandle 2014-11-26 13:18:28 +01:00
Thomas Gubler 818a49b5a8 fix ros compile errors 2014-11-26 12:45:03 +01:00
Thomas Gubler 0474908e1c reenable task flag 2014-11-26 11:55:48 +01:00
Thomas Gubler e7c1e5b1ff wip, working on the nuttx wrapper 2014-11-26 11:36:23 +01:00
Lorenz Meier 32835757de Remove uncommon modules from FMU-v2 build 2014-11-26 08:24:11 +01:00
Lorenz Meier 6200a3e3a5 Added TeraRanger one sensor 2014-11-26 07:56:54 +01:00
Lorenz Meier cbcd1ea1d1 Merged PX4Flow driver changes 2014-11-26 07:43:19 +01:00
Andrew Tridgell 4724c05047 airspeed: use _retries=2 for I2C retries once initialised
airspeed sensors often need to be on longer cables due to having to be
outside the prop wash.
2014-11-26 07:35:32 +01:00
Andrew Tridgell 8e932cec10 systemcmds: added reflect command for USB testing 2014-11-26 07:35:06 +01:00
Lorenz Meier ef76a7cf27 Merge branch 'pullrequest-px4io' of github.com:tridge/Firmware 2014-11-26 07:32:06 +01:00
Andrew Tridgell c906c21238 px4io: prevent use of uninitialised memory in io_set_arming_state()
the vehicle may not have setup a control_mode. We need to check the
return of orb_copy() to ensure we are getting initialised values
2014-11-26 11:39:41 +11:00
Andrew Tridgell c0b47d6a74 px4io: only check SAFETY_OFF for allowing RC config changes and reboot
If we check OUTPUTS_ARMED then we can't update trim values and scaling
in flight, as there is no way to clear OUTPUTS_ARMED.

If safety is on then it should be perfectly safe to update the mixer
and RC config or reboot for fw update
2014-11-26 11:39:41 +11:00
Andrew Tridgell 29f000dc31 px4io: fixed error returns to be negative
follow standard conventions
2014-11-26 11:39:41 +11:00
Andrew Tridgell 809500cfcd px4io: fixed RC_CONFIG channel limit check
number of channels is the right test, not number of actuators
2014-11-26 11:39:41 +11:00
Andrew Tridgell 7ae4f6d97e uavcan: added add_poll_fd() helper function
this makes the code clearer and avoids repeated code
2014-11-26 08:41:32 +11:00
Andrew Tridgell a7a68c88a2 uavcan: show ESC output values in uavcan status, and add arm/disarm
this makes "uavcan status" show the current output values, which is
useful for debugging. It also adds "uavcan arm" and "uavcan disarm"
commands, which are very useful for re-arming after a motor test.
2014-11-26 08:32:47 +11:00
Andrew Tridgell 724ec0ec8b uavcan: handle all ESC output in one place
moving all the ESC output handling to one place allows the limits on
actuator values to apply to all types of inputs, and will make it
easier to expand "uavcan status" to show actuator values
2014-11-26 08:32:47 +11:00
Andrew Tridgell 8e44ec2e3b uavcan: prevent crash in ESC driver
passing in more than 8 actuators would crash the ESC driver. We need
to check again the array size of the _esc_status.esc, which is
CONNECTED_ESC_MAX
2014-11-26 08:32:47 +11:00
Andrew Tridgell ead0458e97 uavcan: don't force motors to keep spinning at zero throttle
Forcing motors to keep spinning when armed should be a policy decision
up at the vehicle type level, not hard coded down in the ESC
driver. It isn't appropriate for fixed wing or ground vehicles for
example.

We could add an ioctl to enable "spin when armed" if just setting a
small value in the vehicle code is inconvenient
2014-11-26 08:32:47 +11:00
Andrew Tridgell ecc7a3cbb4 motor_test: prevent use of uninitialised test_motor orb handle
stack variables are not initialised to zero
2014-11-26 08:32:47 +11:00
Andrew Tridgell b830137ec8 uavcan: added support for actuator_direct ORB topic
this watches the actuator_direct topic and uses it to allow for direct
output of actuator values, bypassing the mixer
2014-11-26 08:32:46 +11:00
Andrew Tridgell f6b0a3e07f uORB: added actuator_direct topic
this topic will be used to allow direct output of actuator values for
uavcan, bypassing the mixer.
2014-11-26 08:32:46 +11:00
Andrew Tridgell 2dae1bc542 uavcan: break the link between poll fd indexes and controls
this linkage was fragile and makes it harder to add new orb
subscriptions to the uavcan code
2014-11-26 08:32:46 +11:00
Thomas Gubler 3c6f6618e8 Merge remote-tracking branch 'upstream/uorbtinymerge' into dev_ros 2014-11-25 15:58:27 +01:00
Thomas Gubler 579ec36c28 fix order of arguments (merge fix) 2014-11-25 15:56:05 +01:00
Thomas Gubler 55cf2fc61c WIP, towards more px4 compatibility, first macros 2014-11-25 11:50:35 +01:00
Thomas Gubler 5b80a2ae38 Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge
Conflicts:
	mavlink/include/mavlink/v1.0
	src/modules/mc_att_control/mc_att_control_main.cpp
2014-11-25 10:49:29 +01:00
Thomas Gubler c167df9038 ros wrapper: small reordering 2014-11-25 10:19:18 +01:00
Thomas Gubler 978013bbb8 px4 wrapper for ros publisher 2014-11-25 09:56:18 +01:00
Thomas Gubler 0a3492fc32 define default queue size 2014-11-25 09:20:57 +01:00
Thomas Gubler bb8375e1f6 Merge remote-tracking branch 'upstream/master' into dev_ros 2014-11-25 09:03:06 +01:00
Thomas Gubler e2f846ee2f create list of subscribers 2014-11-24 18:53:08 +01:00
Thomas Gubler 1826fa5d39 improve subsciber api 2014-11-24 17:38:27 +01:00
Thomas Gubler 3f36d30a34 wrapped subscriber 2014-11-24 15:58:06 +01:00
Thomas Gubler 1e36de6157 ignore build folder 2014-11-24 15:57:48 +01:00
Thomas Gubler c37ff71e62 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	makefiles/config_px4fmu-v2_test.mk
2014-11-24 07:41:26 +01:00
Lorenz Meier 7cb613bb26 Merge pull request #1398 from philipoe/master
Addition of rc-loss duration to the mavlink warning messages
2014-11-23 21:32:13 +01:00
philipoe 08d6cbe6bf commander: Decrease RC-signal-regained message length to stay within 50 character length limit at all times 2014-11-23 21:23:01 +01:00
Lorenz Meier 2f271888d2 Added performance counter for SD log performance of write() call 2014-11-23 19:22:55 +01:00
Lorenz Meier 8ff4da67d5 Merge pull request #1399 from PX4/safety
Enable IO safety parameter to disable safety on boot
2014-11-23 19:07:29 +01:00
Lorenz Meier 512779907e Update NuttX version, MD5 fix 2014-11-23 13:01:00 +01:00
Lorenz Meier 68bf7e90e5 Merge branch 'master' into safety 2014-11-22 16:34:54 +01:00