diff --git a/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp b/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp index 57958b8f2ec5584347e0e42ca3028bdafc98eeae..23bb88f2d0a433961d8f88e41bf4d496698571c3 100644 --- a/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp +++ b/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp @@ -120,7 +120,7 @@ namespace armarx } 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 } else diff --git a/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h b/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h index 08412143cbf40817fb490e01b8c06372c7d16198..1fed1aab9d05370280535c4314d9a4104ce25fcb 100644 --- a/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h +++ b/source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h @@ -138,7 +138,7 @@ namespace armarx int timelimit = 5; double rangeMin = 0.0; - double rangeMax = 10.0; + double rangeMax = 12.0; std::string robotName = "Armar6"; }; diff --git a/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp b/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp index 99289d56a646cef239ca445dd75cfe36334a3f88..3d20aad67f1a121c641bfa4f82021c9d2a59d74b 100644 --- a/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp +++ b/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp @@ -435,7 +435,7 @@ namespace armarx // FIXME scan info is not set atm. scanInfo.minAngle = VirtualRobot::MathTools::deg2rad(-45); 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) << ""; diff --git a/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp b/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp index b7d6343d447fd95a6031b2ab5b5c88201a540069..b83206f6fb670587dc418fdd0207382390b83543 100644 --- a/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp +++ b/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp @@ -22,6 +22,7 @@ #include <Ice/ObjectAdapter.h> +#include "ArmarXCore/core/logging/Logging.h" #include <ArmarXCore/core/ArmarXManager.h> #include "RobotUnitDataStreamingReceiver.h" @@ -59,8 +60,8 @@ namespace armarx::detail::RobotUnitDataStreamingReceiver static_assert(sizeof(std::uint64_t) == sizeof(msgSequenceNbr)); const auto seq = static_cast<std::uint64_t>(msgSequenceNbr); std::lock_guard g{_data_mutex}; - ARMARX_INFO << deactivateSpam() - << "received " << data.size() << " timesteps"; + ARMARX_VERBOSE << deactivateSpam() + << "received " << data.size() << " timesteps"; _data[seq] = data; }