Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to package names, launch files and topic names based on conventions #24

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+144 −109
Open

Update to package names, launch files and topic names based on conventions #24

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ede9898
Update naming conventions and add launch tests
dave992 Sep 21, 2020
1104e79
Update default frame_id and topic name
dave992 Sep 21, 2020
e6b1df2
Support model selection and general update
dave992 Sep 21, 2020
cdd39cc
String find bug fixes
dave992 Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
String find bug fixes
@dave992
dave992 committed Oct 16, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit cdd39cc6dc0818c73989b85e55e34e17f8a81a88
6 changes: 3 additions & 3 deletions micro_epsilon_scancontrol_driver/src/driver.cpp
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ namespace scancontrol_driver

// Check if the available device is the same as the prefered device (if a serial is provided):
std::string interface(available_interfaces[0]);
if ((config_.serial == "") || (interface.find(config_.serial) > -1)){
if ((config_.serial == "") || (interface.find(config_.serial) != std::string::npos)){
ROS_INFO_STREAM("Interface found: " << interface);
}
else{
@@ -78,7 +78,7 @@ namespace scancontrol_driver
if (config_.serial != ""){
for (int i = 0; i < interface_count; i++){
std::string interface(available_interfaces[i]);
if (interface.find(config_.serial) > -1){
if (interface.find(config_.serial) != std::string::npos){
ROS_INFO_STREAM("Interface found: " << interface);
selected_interface = i;
break;
@@ -163,7 +163,7 @@ namespace scancontrol_driver
gint8 selected_resolution = -1;
for (int i = 0; i < return_code; i++){
std::string resolution = std::to_string(available_resolutions[i]);
if (resolution.find(config_.serial) > -1){
if (resolution.find(config_.resolution) != std::string::npos){
selected_resolution = i;
break;
}