56575eb068
Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
...
Conflicts:
src/drivers/blinkm/blinkm.cpp
src/drivers/px4io/px4io.cpp
src/modules/commander/state_machine_helper.c
src/modules/px4iofirmware/protocol.h
src/modules/px4iofirmware/registers.c
src/modules/systemlib/systemlib.h
src/systemcmds/reboot/reboot.c
2013-08-15 14:04:46 +02:00
9d6ec6b365
Restructure things so that the PX4 configs move out of the NuttX tree, and most of the PX4-specific board configuration data moves out of the config and into the board driver.
...
Rename some directories that got left behind in the great board renaming.
2013-08-02 22:34:55 -07:00
f3764d0b5a
px4fmu: expanded "fmu test"
...
this now does testing in a similar manner as "px4io test", except that
it tests both ioctl and write based setting of servos
2013-08-02 12:44:47 +02:00
1b38cf715d
Renamed actuator_safety back to actuator_armed, compiling but untested
2013-07-15 22:15:15 +02:00
bf2ff98856
Merged master
2013-07-15 15:02:45 +02:00
dca9019f75
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
2013-07-14 13:04:44 -07:00
f5b91e109d
More GPIO and general pin assignment fixes.
2013-07-10 23:50:37 -07: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
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
b4029dd824
Pull v2 pieces up to build with the merge
2013-07-07 17:53:55 -07:00
43f1843cc7
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
2013-07-07 12:22:56 -07:00
90f5e30f2a
Introduced new actuator_safety topic
2013-06-14 13:53:26 +02:00
23a6234235
Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own version of task_spawn that's different.
2013-06-01 23:31:53 +02:00
b7d430e3c0
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
...
Fix px4iov2 build issue by selecting the correct NuttX config.
2013-05-19 21:51:35 +02:00
fa816d0fd6
arming: added PWM_SERVO_SET_ARM_OK and PWM_SERVO_CLEAR_ARM_OK
...
these new ioctls allow for the flight code to tell the IO board that
arming can proceed
2013-05-16 08:39:24 +02:00
44df8db984
Merge branch 'master' of github.com:PX4/Firmware into export-build
2013-05-06 23:50:23 +02:00
01e427b17c
Merge working changes into export-build branch.
2013-04-26 16:14:32 -07:00
2557f0d2de
Rename the 'device' directory back to 'drivers', it's less confusing that way.
...
Move the fmuv2 board driver out into the new world.
2013-04-06 23:04:32 -07:00
Julian Oes