Commit Graph

44 Commits

Author SHA1 Message Date
Julian Oes 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
Lorenz Meier aebdd6e059 Merged master 2013-08-14 22:53:42 +02:00
px4dev c33048b521 Add the ability to cancel a begin/end perf counter if the begin turns out to have been in error. 2013-08-04 19:42:16 -07:00
px4dev 97e4909d9e Improvements to the HX stream protocol implementation. 2013-08-04 19:40:57 -07:00
px4dev e931d3b9cd Add an option to the systemreset() call and to the reboot command (-b) to reboot into the bootloader.
The system will remain in the bootloader until it's reset, or until an upload is completed.
2013-08-03 22:35:18 -07:00
px4dev 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
Lorenz Meier 4e5eb9740b Fixed led and reboot linker challenges in C++ environments 2013-07-28 14:50:27 +02:00
Lorenz Meier 68ab69de01 moved commander to C++, preparation for better gyro scale calibration respecting the current attitude for more accurate results 2013-07-20 13:47:51 +02:00
Lorenz Meier c88e8e335c Merged master 2013-07-20 08:30:20 +02:00
Lorenz Meier 1575da4390 Merge branch 'master' of github.com:PX4/Firmware into new_state_machine 2013-07-19 12:53:37 +02:00
Lorenz Meier a4d0594bd7 Merge branch 'master' into autostart 2013-07-18 13:18:42 +02:00
Lorenz Meier 41b51bdb88 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-07-16 08:57:40 +02:00
Lorenz Meier bf2ff98856 Merged master 2013-07-15 15:02:45 +02:00
Lorenz Meier 17338ca61a Removed unneccesary casts in airspeed calculation to double precision 2013-07-15 13:59:23 +02:00
Lorenz Meier 0b47ed86e0 Implemented new, simple system boot config and sane default value system based on two parameters evaluated at boot time 2013-07-15 13:58:43 +02:00
Lorenz Meier f27491d2e5 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-07-10 11:58:48 +02:00
Lorenz Meier 82c13efad1 Merged CPU load changes by freddie chopin 2013-07-09 13:27:17 +02:00
Julian Oes 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
px4dev 43f1843cc7 Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup 2013-07-07 12:22:56 -07:00
px4dev 6871d2909b Add a mechanism for cancelling begin/end perf counters. 2013-07-05 22:53:57 -07:00
Lorenz Meier cefebb9699 Small improvements in system lib 2013-07-04 15:48:01 +02:00
Lorenz Meier e9290e7fc0 Merge branch 'master' of github.com:PX4/Firmware into origin_integration 2013-07-02 16:40:26 +02:00
px4dev d1562f926f More implementation for the serial side on IO; fix a couple of bugs on the FMU side.
Still needs serial init and some more testing/config on the FMU side, but closer to being ready to test.
2013-06-28 23:39:35 -07:00
px4dev 90c458cb61 Checkpoint: interface abstraction for px4io driver 2013-06-25 23:08:34 -07:00
Anton Babushkin 72694825de Copyright fixes 2013-06-22 11:28:21 +04:00
Anton Babushkin 5cb1f4662f multirotor_attitude_control performance improved, tested in flight. PID library new functionality and bugfixes. 2013-06-20 19:25:37 +04:00
Anton Babushkin bf0de77532 Critical bugfix in PID 2013-06-20 12:33:35 +04:00
Anton Babushkin 3bfc4ed517 Att rate PID fix 2013-06-20 11:38:19 +04:00
Julian Oes c189ac1c85 Added possibility to log pid control values
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
	src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 15:22:20 +02:00
Julian Oes 303694f5f7 Fixed pid bug, attitude was not controlled 2013-06-16 15:22:10 +02:00
Julian Oes 8559315f4f Added a filter parameter to the pid function
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
2013-06-15 20:06:13 +02:00
Julian Oes 2b9fa731ef Use the pid library in the rate controller and change de implementation of the D part
Conflicts:
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
2013-06-15 20:05:03 +02:00
Lorenz Meier 9444def5f8 Merge branch 'master' into fmuv2_bringup 2013-06-10 15:01:44 +02:00
Lorenz Meier 8ad3aa315f Merged master 2013-06-06 07:57:31 +02:00
Simon Wilks 82c7e58122 Removed some debugging code 2013-06-04 01:03:16 +02:00
Simon Wilks f435025d26 Completed main implementation and debugging 2013-06-04 00:10:58 +02:00
px4dev 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
Lorenz Meier 63d460160c Adjusted to renaming of TCB in NuttX 2013-06-01 12:00:33 +02:00
Lorenz Meier 4db739b5e1 Integration WIP with current NuttX version 2013-06-01 01:48:42 +02:00
px4dev 437d9e4180 Merge branch 'fmuv2_bringup' into fmuv2_bringup_io2 2013-05-22 21:39:30 +02:00
Lorenz Meier 614bbb1510 Merged ETS airspeed driver 2013-05-09 15:58:23 +02:00
Lorenz Meier 13110e0a1f ROMFS wide quad mixer addition and cleanup 2013-05-05 11:35:56 +02:00
px4dev e67022f874 Serial interface for IOv2 2013-04-28 18:14:46 -07:00
Lorenz Meier 13fc670386 Moved last libs, drivers and headers, cleaned up IO build 2013-04-28 09:54:11 +02:00