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

Changed package name in all the necessary files #23

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Changed package name in all the necessary files #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d4a825
changed package name
adbidwai Feb 11, 2021
ec03312
changed package name
adbidwai Feb 11, 2021
72ac568
changed package name
adbidwai Feb 11, 2021
0182261
changed package name
adbidwai Feb 11, 2021
1fa0465
changed package name
adbidwai Feb 11, 2021
faf09dc
changed package name
adbidwai Feb 11, 2021
ab4c312
changed package name
adbidwai Feb 11, 2021
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(echoslam_ROS)
project(echoslam_ros)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
Expand Down
10 changes: 5 additions & 5 deletions launch/team.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<param name="radius" value="0.5" />
<node
name="bot_server_node"
pkg="echoslam_ROS"
pkg="echoslam_ros"
type="bot_server_node.py"
if="$(eval arg('dummy') == arg('teamsize'))"
output="screen"
/>
<node
name="plotter_node"
pkg="echoslam_ROS"
pkg="echoslam_ros"
type="plotter_node.py"
if="$(eval arg('dummy') == arg('teamsize'))"
output="screen"
Expand All @@ -23,7 +23,7 @@
<group ns="$(eval 'bot' + str(arg('dummy')))">
<node
name="$(eval 'bot' + str(arg('dummy')))"
pkg="echoslam_ROS" type="bot.py"
pkg="echoslam_ros" type="bot.py"
output="screen"
/>
<param
Expand All @@ -34,9 +34,9 @@
</group>

<!-- recursively start new node -->
<include file="$(find echoslam_ROS)/launch/team.launch" if="$(eval arg('dummy') - 1 > 0)">
<include file="$(find echoslam_ros)/launch/team.launch" if="$(eval arg('dummy') - 1 > 0)">
<arg name="dummy" value="$(eval arg('dummy') - 1)"/>
<arg name="teamsize" value="$(eval arg('teamsize'))" />
</include>

</launch>
</launch>
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<package format="2">
<name>echoslam_ROS</name>
<name>echoslam_ros</name>
<version>0.0.0</version>
<description>The echoslam package</description>

Expand Down
4 changes: 2 additions & 2 deletions scripts/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"""


from echoslam_ROS.msg import Bot #28/08/2020 : Aditya changed echoslam to echoslam_ROS in this line.
from echoslam_ROS.srv import *
from echoslam_ros.msg import Bot #28/08/2020 : Aditya changed echoslam to echoslam_ROS in this line.
from echoslam_ros.srv import *
from std_msgs.msg import Int32
import sys
import rospkg
Expand Down
4 changes: 2 additions & 2 deletions scripts/bot_server_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

import rospkg
import rospy
from echoslam_ROS.srv import BotService, BotServiceResponse
from echoslam_ros.srv import BotService, BotServiceResponse


rospack = rospkg.RosPack()
path = rospack.get_path("echoslam_ROS")
path = rospack.get_path("echoslam_ros")
sys.path.append(path)
from src.robot import Robot

Expand Down
4 changes: 2 additions & 2 deletions scripts/plotter_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import rospy
import matplotlib.pyplot as plt
import matplotlib.animation as animation
from echoslam_ROS.msg import Bot
from echoslam_ros.msg import Bot

rospy.init_node("plotter_node")
bots = rospy.get_param("/size")
Expand Down Expand Up @@ -31,4 +31,4 @@ def callback(msg):
plt.plot(bot_x, bot_y, 'ro')
plt.pause(0.1)
plt.clf()


2 changes: 1 addition & 1 deletion src/robot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from echoslam_ROS.msg import Bot
from echoslam_ros.msg import Bot
# from echoslam.msg import Bot
import rospkg
import rospy
Expand Down