lots' of header juggling and small changes to make mc att control compile for NuttX and ROS

This commit is contained in:
Thomas Gubler
2014-12-16 08:24:51 +01:00
parent 9980e44821
commit 9520983e08
20 changed files with 376 additions and 88 deletions
+10 -2
View File
@@ -49,9 +49,8 @@
#ifdef CONFIG_ARCH_ARM
#include "../CMSIS/Include/arm_math.h"
#else
#include <math/eigen_math.h>
#include <platforms/ros/eigen_math.h>
#include <Eigen/Eigen>
#define M_PI_2_F 1.5707963267948966192f
#endif
namespace math
@@ -122,6 +121,15 @@ public:
memcpy(data, d, sizeof(data));
}
#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
/**
* set data from boost::array
*/
void set(const boost::array<float, 9ul> d) {
set(static_cast<const float*>(d.data()));
}
#endif
/**
* access by index
*/
+1 -1
View File
@@ -49,7 +49,7 @@
#ifdef CONFIG_ARCH_ARM
#include "../CMSIS/Include/arm_math.h"
#else
#include <math/eigen_math.h>
#include <platforms/ros/eigen_math.h>
#endif
namespace math