Commit Graph

202 Commits

Author SHA1 Message Date
Thomas Gubler 96db9e8188 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	src/platforms/px4_middleware.h
2015-01-15 12:42:28 +01:00
Lorenz Meier 6203c73ccc Perf counter fixes 2015-01-11 11:03:56 +01:00
Lorenz Meier 172dbf3707 Performance counters: Add option to set otherwise estimated time interval 2015-01-11 11:03:56 +01:00
Lorenz Meier a3bce71b97 Performance counters: Estimate RMS for elapsed counters. Allow to use a perf counter across processes, deal with overruns and other resulting inconsistencies from cross-process use. 2015-01-11 11:03:55 +01:00
Thomas Gubler b2366aaa22 Merge remote-tracking branch 'upstream/master' into ros 2015-01-09 08:07:00 +01:00
Anton Matosov 7d528330d5 Implemented SK450 DeadCat frame support
Implemented the way to specify motor output scale which is required for SK450 DeadCat as it has asymetrical arms (front arms are longer than back ones)
2015-01-08 13:58:46 +02:00
Thomas Gubler 94b9251a69 Merge remote-tracking branch 'upstream/multitablespython3' into dev_ros 2015-01-06 10:34:53 +01:00
Thomas Gubler a42febc993 remove output of multi_tables script 2015-01-06 10:29:36 +01:00
Thomas Gubler 0d571458f5 improve multi_tables makefile 2015-01-06 10:27:40 +01:00
Thomas Gubler cd11c4d81c make multi_tables script python3 compatible
The script still works with python2, I also added a file ending
2015-01-06 10:26:17 +01:00
Thomas Gubler 462a5fae90 Merge remote-tracking branch 'upstream/master' into dev_ros 2015-01-06 08:56:39 +01:00
Anton Matosov fbf51360b3 Merged with px4/multitables
Conflicts:
	src/modules/systemlib/mixer/multi_tables
2015-01-06 00:30:23 +02:00
Lorenz Meier 6e144e6e42 Multi-tables: Adjust shebang, add missing include guards 2015-01-05 23:07:41 +01:00
Anton Matosov b04559e5fa Removed include that couses compilation failure 2015-01-05 23:48:18 +02:00
Anton Matosov e466e10d23 using type aliases are not supported by g++ 4.6 2015-01-05 23:33:19 +02:00
Anton Matosov 29d0754df6 std::underlying_type is not supported by the g++ 4.6 used by CI server 2015-01-05 23:22:43 +02:00
Anton Matosov 117d43067f Switched to enum class out of class definition 2015-01-05 23:15:12 +02:00
Anton Matosov 18bf501992 Added output of the generated multi_tables to the terminal as well as to the file
Changed compiler C++0x enabling flag to check if it is a cuase
Updated copyrights
2015-01-05 21:59:56 +02:00
Anton Matosov 3bf5dd416e Fixed compilation 2015-01-05 13:22:53 +02:00
Anton Matosov 6ba0b75804 Replaced tabs with spaces as it is critical for some python builds 2015-01-05 12:41:25 +02:00
Anton Matosov 1bc6c44a0e Fixed compilation of tests target in clean checkout
Moved mixer_multirotor.generated.h generation to the standalone makefile to prevent copypaste
2015-01-05 12:37:05 +02:00
Anton Matosov 21b45ae86b Removed extension for multi_tables to not affect its users
Fixed dependencies for the mixer_multirotor.cpp from all the modules
2015-01-05 12:02:32 +02:00
Anton Matosov 2daf30fb25 Rewrote multi_tables with python 2015-01-05 12:02:32 +02:00
Anton Matosov 8fadbdcf2f Automated generation of the Geometry enum to make addition of the new multirotor a really simple task 2015-01-05 12:02:32 +02:00
Anton Matosov 388833a1fa Added explicit dependency into makefile, as implicit one doesn't work often. 2015-01-05 12:02:32 +02:00
Anton Matosov 59fa170e54 Automated updates of the C++ code generated by the multi_tables script, now it is placed into the mixer_multirotor.generated.h file which is generated by makefile 2015-01-05 12:02:31 +02:00
Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h
2015-01-05 10:02:07 +01:00
Anton Matosov c4471d77d7 Moved quad_v and twin_engine to the multi_tables in order to make all the tables been generated automatically 2015-01-04 19:46:29 +02:00
Anton Matosov 55741be473 Made it possible to specify yaw scale for the copter 2015-01-04 19:34:28 +02:00
Thomas Gubler f4e0dc2857 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitmodules
2014-12-29 08:00:12 +01:00
Lorenz Meier b097b13ba6 Companion computer interface: Add SYS_COMPANION parameter. Setting it to 921600 enables the companion interface. 2014-12-26 18:01:52 +01:00
Lorenz Meier 6fae021a00 Merge pull request #1527 from dagar/Werror
turn on -Werror and fix resulting errors
2014-12-25 17:44:44 +01:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitignore
	src/lib/uavcan
2014-12-25 09:48:15 +01:00
Mark Whitehorn 9292c8f405 add interrupt latency printout command and mean/variance to interval performance counter 2014-12-24 14:06:05 -07:00
Daniel Agar d511e39ea7 turn on -Werror and fix resulting errors 2014-12-22 17:56:59 -05:00
Thomas Gubler 16618f1ada Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/examples/subscriber/subscriber_params.c
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
	src/modules/uORB/topics/vehicle_attitude_setpoint.h
	src/platforms/px4_middleware.h
2014-12-18 12:11:05 +01:00
Thomas Gubler 4402d7106b improve and fix multiplatform param by name macro 2014-12-17 16:31:40 +01:00
Thomas Gubler 0a1e94d504 circuit breaker: move to cpp, all platforms use the same file 2014-12-17 15:50:01 +01:00
Thomas Gubler 9520983e08 lots' of header juggling and small changes to make mc att control compile for NuttX and ROS 2014-12-16 08:24:51 +01:00
tumbili 89e2e08de0 removed white space noise 2014-12-15 22:47:10 +01:00
tumbili 736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
Thomas Gubler 1c0f850fac add sched.h to systemlib includes
SCHED_RR and SCHED_FIFO are defined in sched.h
2014-12-10 15:11:49 +01:00
Thomas Gubler cb77c16601 add sched.h to systemlib includes
SCHED_RR and SCHED_FIFO are defined in sched.h
2014-12-10 15:06:45 +01:00
Roman Bapst 285a0e7be9 added more mixer geometries and took v-mixer out of multi_tables script 2014-12-02 10:36:30 +01:00
Lorenz Meier 00c7cc019c Optimize size of system lib 2014-11-15 16:20:44 +01:00
Lorenz Meier 2a37d274b1 Systemlib: Add MCU version command. ver commandline tool: Add support for MCU version command 2014-11-15 15:51:55 +01:00
Lorenz Meier a869105ba2 Systemlib: Optimize for size 2014-11-15 13:52:34 +01:00
Andrew Tridgell 3f3353f2c4 mixer: fixed stream handle leakage 2014-11-07 11:43:59 +11:00
Thomas Gubler d4c0dc2ba0 add and activate circuit breaker for gps failure detection 2014-09-30 11:20:30 +02:00
Thomas Gubler 1072a3380c enable engine failure circuit breaker 2014-09-30 11:11:46 +02:00