SWIGJAVA: Remove the last JAVA ifdefs from src
Removed all references to #ifdef SWIGJAVA and JAVACALLBACK from the
library source. All java-specific source code has been moved to the
corresponding library's .i file for java.
* Update library source
* Update examples where necessary
* The function pointer methodology has been remove from libraries
which provided callbacks as both a class and a function pointer
implementation. Examples were updated to use the class version
of callbacks.
* Updated documentation for SWIGJAVA
Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <vector>
|
||||
|
||||
#include "mpu60x0.hpp"
|
||||
#include "ak8975.hpp"
|
||||
@@ -108,17 +109,13 @@ namespace upm {
|
||||
*/
|
||||
void getMagnetometer(float *x, float *y, float *z);
|
||||
|
||||
#ifdef SWIGJAVA
|
||||
/**
|
||||
* Return the compensated values for the x, y, and z axes. The
|
||||
* unit of measurement is in micro-teslas (uT).
|
||||
*
|
||||
* @return Array containing X, Y, Z magnetometer values
|
||||
* @return std::vector containing X, Y, Z magnetometer values
|
||||
*/
|
||||
float *getMagnetometer();
|
||||
#endif
|
||||
|
||||
|
||||
std::vector<float> getMagnetometer();
|
||||
|
||||
protected:
|
||||
// magnetometer instance
|
||||
|
||||
Reference in New Issue
Block a user