Skip to content

Commit 1f6c46c

Browse files
authored
Merge pull request #121 from hbcarlos/fix_lab_install
Removes prints for ros env
2 parents ce31d0a + 7d87639 commit 1f6c46c

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

jupyros/__init__.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@
1313
ros_version = os.environ['ROS_VERSION']
1414
ros_distro = os.environ['ROS_DISTRO']
1515
except KeyError:
16-
print('No ROS environment detected.')
17-
print('Defaulting to ROS noetic.')
16+
# print('No ROS environment detected.')
17+
# print('Defaulting to ROS noetic.')
1818
ros_version = '1'
1919
ros_distro = 'noetic'
2020

2121
if ros_version == '2':
2222
# Import ROS2 modules
23-
print(f'ROS2 {ros_distro} environment detected.')
24-
# TODO: import modules once created
23+
# print(f'ROS2 {ros_distro} environment detected.')
24+
from .ros2.publisher import *
25+
from .ros2.ros_widgets import *
26+
from .ros2.subscriber import *
27+
2528
else:
2629
# Default to ROS1
27-
print(f'ROS {ros_distro} environment detected.')
30+
# print(f'ROS {ros_distro} environment detected.')
2831
from .ros1.ipy import *
2932
from .ros1.pubsub import *
3033
from .ros1.ros_widgets import *

jupyros/ros2/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#from ..ros1.server_extension import *
1414
#from ..ros1.turtle_sim import *
1515

16-
from ..ros2.ros_widgets import *
1716
from ..ros2.publisher import *
18-
17+
from ..ros2.ros_widgets import *
1918
from ..ros2.subscriber import *

jupyros/ros2/publisher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import threading
1212
import time
1313
import ipywidgets as widgets
14-
from . import add_widgets
14+
from .ros_widgets import add_widgets
1515
import functools
1616

1717
def rsetattr(obj, attr, val):

0 commit comments

Comments
 (0)