alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-01 17:31:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed old interfaces and replaced them with the new ones.

Browse Source 
Signed-off-by: Serban Waltter <serban.waltter@rinftech.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Serban Waltter
2018-09-27 17:33:40 +03:00
committed by Mihai Tudor Panu
parent b6e53f7da8
commit 34bb12933d
139 changed files with 396 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/interfaces/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set (libname "new_interfaces")
set (libname "interfaces")
set (libdescription "CXX Interface Library")
set (module_src ${libname}.cxx)

2
include/interfaces/iAcceleration.hpp
View File

@ -40,7 +40,7 @@ namespace upm
* Get acceleration values on X, Y and Z axis.
* v[0] = X, v[1] = Y, v[2] = Z
*
* @return vector of 3 floats containing acceleration on each axis
* @return vector of 3 floats containing acceleration on each axis in Gs
*/
virtual std::vector<float> getAcceleration() = 0;
};

11
include/interfaces/new_interfaces.cxx → include/interfaces/interfaces.cxx
View File

@ -1,9 +1,14 @@
#include "iAcceleration.hpp"
#include "iAngle.hpp"
#include "iButton.hpp"
#include "iClock.hpp"
#include "iCollision.hpp"
#include "iDistance.hpp"
#include "iDistanceInterrupter.hpp"
#include "iEC.hpp"
#include "iElectromagnet.hpp"
#include "iEmg.hpp"
#include "iGps.hpp"
#include "iHallEffect.hpp"
#include "iHeartRate.hpp"
#include "iHumidity.hpp"
@ -11,6 +16,10 @@
#include "iLineFinder.hpp"
#include "iMoisture.hpp"
#include "iMotion.hpp"
#include "iOrp.hpp"
#include "iPH.hpp"
#include "iPressure.hpp"
#include "iProximity.hpp"
#include "iTemperature.hpp"
#include "iAcceleration.hpp"
#include "iVDiv.hpp"
#include "iWater.hpp"

40
include/interfaces/new_interfaces.i → include/interfaces/interfaces.i
View File

@ -1,7 +1,7 @@
#ifdef SWIGPYTHON
%module (package="upm") pyupm_new_interfaces
%module (package="upm") pyupm_interfaces
#else
%module new_interfaces
%module interfaces
#endif
#ifdef SWIGJAVA
@ -39,11 +39,17 @@ import java.lang.Float;
%template(floatVector) std::vector<float>;
%interface_impl (upm::iAcceleration);
%interface_impl (upm::iAngle);
%interface_impl (upm::iButton);
%interface_impl (upm::iClock);
%interface_impl (upm::iCollision);
%interface_impl (upm::iDistance);
%interface_impl (upm::iDistanceInterrupter);
%interface_impl (upm::iEC);
%interface_impl (upm::iElectromagnet);
%interface_impl (upm::iEmg);
%interface_impl (upm::iGps);
%interface_impl (upm::iHallEffect);
%interface_impl (upm::iHeartRate);
%interface_impl (upm::iHumidity);
@ -51,17 +57,27 @@ import java.lang.Float;
%interface_impl (upm::iLineFinder);
%interface_impl (upm::iMoisture);
%interface_impl (upm::iMotion);
%interface_impl (upm::iOrp);
%interface_impl (upm::iPH);
%interface_impl (upm::iPressure);
%interface_impl (upm::iProximity);
%interface_impl (upm::iTemperature);
%interface_impl (upm::iAcceleration);
%interface_impl (upm::iVDiv);
%interface_impl (upm::iWater);
#endif
%{
#include "iAcceleration.hpp"
#include "iAngle.hpp"
#include "iButton.hpp"
#include "iClock.hpp"
#include "iCollision.hpp"
#include "iDistance.hpp"
#include "iDistanceInterrupter.hpp"
#include "iEC.hpp"
#include "iElectromagnet.hpp"
#include "iEmg.hpp"
#include "iGps.hpp"
#include "iHallEffect.hpp"
#include "iHeartRate.hpp"
#include "iHumidity.hpp"
@ -69,16 +85,26 @@ import java.lang.Float;
#include "iLineFinder.hpp"
#include "iMoisture.hpp"
#include "iMotion.hpp"
#include "iOrp.hpp"
#include "iPH.hpp"
#include "iPressure.hpp"
#include "iProximity.hpp"
#include "iTemperature.hpp"
#include "iAcceleration.hpp"
#include "iVDiv.hpp"
#include "iWater.hpp"
%}
%include "iAcceleration.hpp"
%include "iAngle.hpp"
%include "iButton.hpp"
%include "iClock.hpp"
%include "iCollision.hpp"
%include "iDistance.hpp"
%include "iDistanceInterrupter.hpp"
%include "iEC.hpp"
%include "iElectromagnet.hpp"
%include "iEmg.hpp"
%include "iGps.hpp"
%include "iHallEffect.hpp"
%include "iHeartRate.hpp"
%include "iHumidity.hpp"
@ -86,9 +112,13 @@ import java.lang.Float;
%include "iLineFinder.hpp"
%include "iMoisture.hpp"
%include "iMotion.hpp"
%include "iOrp.hpp"
%include "iPH.hpp"
%include "iPressure.hpp"
%include "iProximity.hpp"
%include "iTemperature.hpp"
%include "iAcceleration.hpp"
%include "iVDiv.hpp"
%include "iWater.hpp"
/* Java-specific SWIG syntax */
#ifdef SWIGJAVA