Skip to content
Snippets Groups Projects
Commit dfce78eb authored by Fabian Reister's avatar Fabian Reister Committed by Fabian Reister
Browse files

sick laser unit: local changes on ARMAR-7

parent 8b8f8aa1
No related branches found
No related tags found
1 merge request!266Feature/armem laser scans
This commit is part of merge request !266. Comments created here will be created in the context of that merge request.
...@@ -120,7 +120,7 @@ namespace armarx ...@@ -120,7 +120,7 @@ namespace armarx
} }
if (this->result == sick_scan::ExitSuccess) // OK -> loop again if (this->result == sick_scan::ExitSuccess) // OK -> loop again
{ {
ARMARX_INFO_S << "Scanner " << ip << " successfully initialized."; ARMARX_INFO_S << "Scanner `" << ip << "` successfully initialized.";
this->runState = RunState::scannerRun; // after initialising switch to run state this->runState = RunState::scannerRun; // after initialising switch to run state
} }
else else
......
...@@ -138,7 +138,7 @@ namespace armarx ...@@ -138,7 +138,7 @@ namespace armarx
int timelimit = 5; int timelimit = 5;
double rangeMin = 0.0; double rangeMin = 0.0;
double rangeMax = 10.0; double rangeMax = 12.0;
std::string robotName = "Armar6"; std::string robotName = "Armar6";
}; };
......
...@@ -435,7 +435,7 @@ namespace armarx ...@@ -435,7 +435,7 @@ namespace armarx
// FIXME scan info is not set atm. // FIXME scan info is not set atm.
scanInfo.minAngle = VirtualRobot::MathTools::deg2rad(-45); scanInfo.minAngle = VirtualRobot::MathTools::deg2rad(-45);
scanInfo.maxAngle = VirtualRobot::MathTools::deg2rad(225); scanInfo.maxAngle = VirtualRobot::MathTools::deg2rad(225);
scanInfo.stepSize = VirtualRobot::MathTools::deg2rad(0.33); scanInfo.stepSize = (scanInfo.maxAngle - scanInfo.minAngle) / (distVal.size()-1);
ARMARX_VERBOSE << "Min/max angle: " << VirtualRobot::MathTools::rad2deg(scanInfo.minAngle) << ", " << VirtualRobot::MathTools::rad2deg(scanInfo.maxAngle) << ""; ARMARX_VERBOSE << "Min/max angle: " << VirtualRobot::MathTools::rad2deg(scanInfo.minAngle) << ", " << VirtualRobot::MathTools::rad2deg(scanInfo.maxAngle) << "";
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <Ice/ObjectAdapter.h> #include <Ice/ObjectAdapter.h>
#include "ArmarXCore/core/logging/Logging.h"
#include <ArmarXCore/core/ArmarXManager.h> #include <ArmarXCore/core/ArmarXManager.h>
#include "RobotUnitDataStreamingReceiver.h" #include "RobotUnitDataStreamingReceiver.h"
...@@ -59,8 +60,8 @@ namespace armarx::detail::RobotUnitDataStreamingReceiver ...@@ -59,8 +60,8 @@ namespace armarx::detail::RobotUnitDataStreamingReceiver
static_assert(sizeof(std::uint64_t) == sizeof(msgSequenceNbr)); static_assert(sizeof(std::uint64_t) == sizeof(msgSequenceNbr));
const auto seq = static_cast<std::uint64_t>(msgSequenceNbr); const auto seq = static_cast<std::uint64_t>(msgSequenceNbr);
std::lock_guard g{_data_mutex}; std::lock_guard g{_data_mutex};
ARMARX_INFO << deactivateSpam() ARMARX_VERBOSE << deactivateSpam()
<< "received " << data.size() << " timesteps"; << "received " << data.size() << " timesteps";
_data[seq] = data; _data[seq] = data;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment