Commit Graph

51 Commits

Author SHA1 Message Date
Mark Charlebois 36f5d47ed9 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/gyro_calibration.cpp
	src/modules/mavlink/mavlink_ftp.cpp
2015-05-16 15:04:38 -07:00
tumbili b6441d2966 implemented new mixer strategy 2015-05-10 00:42:53 +02:00
Mark Charlebois 9758112e31 Use px4_config.h instead of nuttx/config.h
Modified code to use OS independent header file for config settings.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 10:55:41 -07:00
Roman Bapst 555e96a37a fixed publication of mixer limit flags 2015-04-10 20:26:38 +02:00
Daniel Agar 8aae66b893 trivial code style cleanup round 2 2015-03-27 23:38:58 -04:00
Anton Babushkin 95be7c2289 Fix limiting in mc mixer 2015-03-21 16:12:33 +01:00
Trent Lukaczyk af8e76ee7e tricopter initial commit 2015-02-05 20:18:00 -08: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 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
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
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
tumbili 89e2e08de0 removed white space noise 2014-12-15 22:47:10 +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
Andrew Tridgell 3f3353f2c4 mixer: fixed stream handle leakage 2014-11-07 11:43:59 +11:00
Holger Steinhaus 5aafa1b021 mixer_multirotor: motor limit notification for PX4FMU 2014-08-26 20:36:02 +02:00
Lorenz Meier 654aaa0ca8 Mixer: forbid copy constructors due to ptr data members 2014-07-16 09:05:50 +02:00
Don Gagne 92adbe9216 Fix compiler warnings 2014-06-29 17:47:24 -07:00
Anton Babushkin 635a7533b4 mc mixer: additional safe limiting of mixed out 2014-05-22 19:04:04 +02:00
John Hiesey 56a8f3de0a Add mixer config for hexa coax frame 2014-05-20 01:01:09 -07:00
Anton Babushkin d9a7e528b0 Multirotor mixer: idle_speed (aka deadband) fixed 2014-05-15 15:44:56 +02:00
Anton Babushkin bc3ca8db56 Multirotor mixer: yaw limiting bug fixed 2014-05-15 14:26:32 +02:00
Anton Babushkin b9b84b08b7 Multirotor mixer: limit yaw first, then roll/pitch 2014-05-15 14:01:55 +02:00
Anton Babushkin ae1faa6de6 MC mixer input limiting implemented. 2014-05-14 13:45:43 +02:00
Anton Babushkin b60964eb9c Multirotor mixer: more careful limiting 2014-05-14 13:27:53 +02:00
Lorenz Meier da525f29f1 Add missing header in mixer load command 2014-04-28 19:25:13 +02:00
Julian Oes 3392086f8f Mixer load: don't upload empty mixers from non-existing files 2014-02-05 21:19:25 +01:00
Lorenz Meier d114ff1ac9 Remove unused variable 2014-01-05 15:21:30 +01:00
runepx4 eac640739b Added 8 rotor Coaxial Rotor mixer 2013-10-31 10:23:58 +01:00
Lorenz Meier 1dc9569e31 Fixed mixer chunk load and line ending detection for good. 2013-10-13 11:44:26 +02:00
Lorenz Meier c5b890e87d Moved mixer file load / compression into mixer library. 2013-10-12 20:17:59 +02:00
Lorenz Meier 9424728af9 Fix a whole bunch of sanity checks across all mixers 2013-09-22 14:20:19 +02:00
Lorenz Meier f62aeba420 Cover last potential corner case with mixers, should be totally safe now 2013-09-22 11:16:19 +02:00
Lorenz Meier 13110e0a1f ROMFS wide quad mixer addition and cleanup 2013-05-05 11:35:56 +02:00