Commit Graph

4143 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
Johan Jansen ddf65bae04 Commander: Play tune on disarm and when safety switch is toggled 2015-01-15 11:09:31 +01:00
Lorenz Meier ae6198b0ba sdlog2: Made sdlog writer performance available in log fiiles, reduced telemetry messages 2015-01-11 11:41:29 +01:00
Lorenz Meier 6203c73ccc Perf counter fixes 2015-01-11 11:03:56 +01:00
Lorenz Meier 7d56ae4ed6 mc attitude control: Log sensor time stamp in actuator output 2015-01-11 11:03:56 +01:00
Lorenz Meier 1bee73af22 Latency measurements: Estimate latency based on sensor timestamp through full system 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 7682160713 mc attitude controller: Log the controller latency 2015-01-11 11:03:55 +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
Lorenz Meier 1507d479e0 commander: Refresh safety tests to avoid false positives in unit tests. 2015-01-10 19:50:44 +01:00
Thomas Gubler c2cc247e76 renamed mc_att_control_multiplatform to mc_att_control_m 2015-01-09 09:39:21 +01:00
Lorenz Meier d351772a46 mavlink app: Be less chatty on startup 2015-01-09 09:09:40 +01:00
Lorenz Meier bb1e082781 Commander: be less chatty 2015-01-09 09:09:24 +01:00
Lorenz Meier 69a7e31077 Att EKF: Adjust stack size to larger requirement 2015-01-09 09:09:11 +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 f960bbf529 bring back switch_pos_t 2015-01-08 10:54:09 +01:00
Thomas Gubler f86c0ed892 remove fw_att_control base classes: as long as they are not integrated into fw_att_control_main they are useless 2015-01-08 09:21:11 +01:00
Thomas Gubler 94ab82ba40 R_adapted.data is 2d, making this more obvious 2015-01-08 09:14:21 +01:00
Thomas Gubler fe279d340d Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	Makefile
2015-01-07 16:00:59 +01:00
Thomas Gubler f37fdd95af add and use PX4_ROS preprocessor define 2015-01-06 19:45:57 +01:00
Thomas Gubler c6722fce0b fw att control: cleanup, create base class for ECL
Adding a new base class to remove a lot of boilerplate code, no
functionality changes
2015-01-06 16:11:31 +01: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
Thomas Gubler 5876ff11ec mc att control multiplatform alongside normal mc att control 2015-01-05 16:12:22 +01:00
Thomas Gubler 7507e4a4b5 sensors: argument is not an enum anymore 2015-01-05 15:31:28 +01:00
Thomas Gubler 88a498d8f8 sensor: fix variable names 2015-01-05 15:23:49 +01: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
Lorenz Meier dc5a006285 Merge branch 'master' of github.com:PX4/Firmware 2015-01-04 20:57:50 +01:00
Lorenz Meier 0e1a532720 sdlog2: Use .px4log as file format. Fixes #1243 2015-01-04 20:57:25 +01:00
Lorenz Meier 025566b99f Merge pull request #1581 from anton-matosov/master
Made all the multirotor tables been generated by multi_table script
2015-01-04 20:49:39 +01:00
Ban Siesta 0265885a39 sdlog2: check every 20MiB if we're running out of space, moved the threshold to 50MiB 2015-01-04 19:13:27 +00:00