b2366aaa22
Merge remote-tracking branch 'upstream/master' into ros
2015-01-09 08:07:00 +01:00
fb151a855f
Merge remote-tracking branch 'upstream/master' into ros
2015-01-08 17:08:30 +01:00
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
aa2a00b56a
Merge branch 'MixerNaming' of github.com:anton-matosov/Firmware
2015-01-08 12:45:43 +01:00
f960bbf529
bring back switch_pos_t
2015-01-08 10:54:09 +01:00
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
94ab82ba40
R_adapted.data is 2d, making this more obvious
2015-01-08 09:14:21 +01:00
f13f41f704
point uavcan submodule to same commit as master
2015-01-08 09:08:50 +01:00
74af4807a1
Matrix.hpp: remove wrong and correct formatting changes which are not on master for clarity
2015-01-08 08:26:04 +01:00
c118d17cb5
fix code style in src/platforms
2015-01-08 08:15:44 +01:00
08062e6546
Changed naming of the mixers to get rid of umbiguity as outputs are actually going to be driven by io, not fmu
...
Implemented automatic lookup for the .aux.mix file if it exists
2015-01-08 00:53:52 +02:00
fe279d340d
Merge remote-tracking branch 'upstream/master' into dev_ros
...
Conflicts:
Makefile
2015-01-07 16:00:59 +01:00
e855e4454c
exclude macro hack for tests target
2015-01-07 00:19:30 +01:00
648cb78268
FMU driver: Show up as secondary interface to allow mixer loads.
2015-01-06 19:51:04 +01:00
f37fdd95af
add and use PX4_ROS preprocessor define
2015-01-06 19:45:57 +01:00
5056b03ab0
geo: fix include
2015-01-06 19:14:01 +01:00
78cde98ea8
GPS driver: Add missing wall clock setup for MTK GPS modules
2015-01-06 18:22:44 +01:00
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
f871b777ab
destructors for px4_nodehandle
2015-01-06 11:09:11 +01:00
94b9251a69
Merge remote-tracking branch 'upstream/multitablespython3' into dev_ros
2015-01-06 10:34:53 +01:00
a42febc993
remove output of multi_tables script
2015-01-06 10:29:36 +01:00
0d571458f5
improve multi_tables makefile
2015-01-06 10:27:40 +01:00
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
462a5fae90
Merge remote-tracking branch 'upstream/master' into dev_ros
2015-01-06 08:56:39 +01:00
fbf51360b3
Merged with px4/multitables
...
Conflicts:
src/modules/systemlib/mixer/multi_tables
2015-01-06 00:30:23 +02:00
6e144e6e42
Multi-tables: Adjust shebang, add missing include guards
2015-01-05 23:07:41 +01:00
b04559e5fa
Removed include that couses compilation failure
2015-01-05 23:48:18 +02:00
e466e10d23
using type aliases are not supported by g++ 4.6
2015-01-05 23:33:19 +02:00
29d0754df6
std::underlying_type is not supported by the g++ 4.6 used by CI server
2015-01-05 23:22:43 +02:00
117d43067f
Switched to enum class out of class definition
2015-01-05 23:15:12 +02:00
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
017dc42423
multiplatform fix errors from werror
2015-01-05 16:49:52 +01:00
5876ff11ec
mc att control multiplatform alongside normal mc att control
2015-01-05 16:12:22 +01:00
7507e4a4b5
sensors: argument is not an enum anymore
2015-01-05 15:31:28 +01:00
88a498d8f8
sensor: fix variable names
2015-01-05 15:23:49 +01:00
5745189e7b
fix some errors/warnings in multiplatform examples
2015-01-05 15:22:08 +01:00
17e544ebf3
dummy mixer: add offset param
2015-01-05 13:09:32 +01:00
3bf5dd416e
Fixed compilation
2015-01-05 13:22:53 +02:00
6ba0b75804
Replaced tabs with spaces as it is critical for some python builds
2015-01-05 12:41:25 +02:00
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
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
2daf30fb25
Rewrote multi_tables with python
2015-01-05 12:02:32 +02:00
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
388833a1fa
Added explicit dependency into makefile, as implicit one doesn't work often.
2015-01-05 12:02:32 +02:00
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
ef485177ac
make Matrix.hpp more consistent with upstream
2015-01-05 10:25:39 +01:00
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
dc5a006285
Merge branch 'master' of github.com:PX4/Firmware
2015-01-04 20:57:50 +01:00
0e1a532720
sdlog2: Use .px4log as file format. Fixes #1243
2015-01-04 20:57:25 +01:00
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
Thomas Gubler