Skip to content

DO NOT MERGE #1

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

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

DO NOT MERGE #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f299ca2
we need a different neato driver which will support d5 and d7 Neato m…
knightsamar Jul 17, 2020
b03f428
NEATO_PORT is now taken from the environment instead of hardcoded
knightsamar Jul 17, 2020
00eed7e
Make it working on D5 Connected neato model
knightsamar Jul 26, 2020
71cca28
NEATO_PORT and NEATO_NAME are now paremeterized and picked up from ba…
knightsamar Aug 13, 2020
3c3128d
Explicitly use the D5 Connected model's driver as neato_node instead …
knightsamar Aug 13, 2020
3d82d30
Changing neato_d5d7.py back to neato.py AND base_link inside the odom…
knightsamar Sep 5, 2020
7302da4
Make sure we publish and subscribe to neatoN/TOPIC_NAME instead of ju…
knightsamar Sep 6, 2020
53ce25c
Safety constraint msg is annoying and we are forcing it to be FALSE s…
knightsamar Sep 6, 2020
4859733
Bringing in 8085 way of setting cmd_dist -- BUG PRONE and does not wo…
knightsamar Sep 6, 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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ find_package(catkin REQUIRED COMPONENTS
roscpp
rospy
std_msgs
message_generation
)

# Generate messages in the 'msg' folder
Expand All @@ -27,10 +28,8 @@ find_package(catkin REQUIRED COMPONENTS
)

catkin_package(
INCLUDE_DIRS include
LIBRARIES neato_controller
CATKIN_DEPENDS roscpp rospy std_msgs
DEPENDS system_lib
)

include_directories(
Expand Down
10 changes: 6 additions & 4 deletions launch/bringup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
-->
<launch>
<arg name="user" default="$(env NEATO_NAME)"/>
<group ns="$(arg user)">
<group ns="$(arg user)">
<node pkg="tf" type="static_transform_publisher" name="laser_to_base"
args="-0.1016 0 0.0889 0 0 0 base_footprint base_laser_link 50" />

<node name="neato" pkg="neato_controller" type="neato.py" output="screen">
<param name="port" value="/dev/neato" />
</node>
</group>
<param name="neato_port" value="$(env NEATO_PORT)" />
<param name="port" value="$(env NEATO_PORT)" />

</node>
</group>
</launch>
2 changes: 1 addition & 1 deletion launch/neato_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<arg name="user" default="$(env USER)"/>
<node name="$(arg user)" pkg="neato_controller" type="controller.py" output="screen">
<param name="neato_port" value="/dev/neato" />
<param name="neato_port" value="$(env NEATO_PORT)" />
</node>

</launch>
4 changes: 2 additions & 2 deletions scripts/controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env python

import roslib; roslib.load_manifest("chairbot_neato_node")
import roslib; roslib.load_manifest("neato_node")
import rospy, time

from math import sin, cos, fabs
from geometry_msgs.msg import Twist
from std_msgs.msg import UInt16
from sensor_msgs.msg import Joy
from std_msgs.msg import Int8
from chairbot_neato_driver.chairbot_neato_driver import Botvac
from neato_driver.neato_driver import Botvac
#from neato_controller.msg import NeatoCommand

import socket
Expand Down
Loading