From 060e6bbf178bfc31754a6d38aa2d87b868bacfba Mon Sep 17 00:00:00 2001
From: andreeatulbure <andreea_tulbure@yahoo.de>
Date: Tue, 7 Mar 2017 14:15:44 +0100
Subject: [PATCH] added linear acceleration datafield
---
.../components/units/OrientedTactileSensorUnitObserver.cpp | 2 +-
source/RobotAPI/interface/units/OrientedTactileSensorUnit.ice | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/source/RobotAPI/components/units/OrientedTactileSensorUnitObserver.cpp b/source/RobotAPI/components/units/OrientedTactileSensorUnitObserver.cpp
index 256d6c1af..906e90f79 100644
--- a/source/RobotAPI/components/units/OrientedTactileSensorUnitObserver.cpp
+++ b/source/RobotAPI/components/units/OrientedTactileSensorUnitObserver.cpp
@@ -78,7 +78,7 @@ void OrientedTactileSensorUnitObserver::reportSensorValues(int id, float pressur
offerOrUpdateDataField(channelName, "rotationRate", Variant(rotationRate), "current rotationRate");
offerOrUpdateDataField(channelName, "pressureRate", Variant(pressureRate), "current pressureRate");
offerOrUpdateDataField(channelName, "accelerationRate", Variant(accelerationRate), "current accelerationRate");
- offerOrUpdateDataField(channelName, "acceleration", Variant(new Vector3(accelx, accely, accelz)), "current linear acceleration");
+ offerOrUpdateDataField(channelName, "linear acceleration", Variant(new Vector3(accelx, accely, accelz)), "current linear acceleration");
}
/* TODO: for integration with debug drawer
updateChannel(device);
diff --git a/source/RobotAPI/interface/units/OrientedTactileSensorUnit.ice b/source/RobotAPI/interface/units/OrientedTactileSensorUnit.ice
index c6353da24..48a0fdd7d 100644
--- a/source/RobotAPI/interface/units/OrientedTactileSensorUnit.ice
+++ b/source/RobotAPI/interface/units/OrientedTactileSensorUnit.ice
@@ -41,7 +41,6 @@ module armarx
interface OrientedTactileSensorUnitInterface extends armarx::SensorActorUnitInterface
{
- //needs uint16_t
//bool loadCalibration(int accel_offset_x, int accel_offset_y, int accel_offset_z, int gyro_offset_x, int gyro_offset_y, int gyro_offset_z, int mag_offset_x, int mag_offset_y, int mag_offset_z, int accel_radius, int mag_radius );
};
--
GitLab