File tree Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Original file line number Diff line number Diff line change 13
13
ros_version = os .environ ['ROS_VERSION' ]
14
14
ros_distro = os .environ ['ROS_DISTRO' ]
15
15
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.')
18
18
ros_version = '1'
19
19
ros_distro = 'noetic'
20
20
21
21
if ros_version == '2' :
22
22
# 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
+
25
28
else :
26
29
# Default to ROS1
27
- print (f'ROS { ros_distro } environment detected.' )
30
+ # print(f'ROS {ros_distro} environment detected.')
28
31
from .ros1 .ipy import *
29
32
from .ros1 .pubsub import *
30
33
from .ros1 .ros_widgets import *
Original file line number Diff line number Diff line change 13
13
#from ..ros1.server_extension import *
14
14
#from ..ros1.turtle_sim import *
15
15
16
- from ..ros2 .ros_widgets import *
17
16
from ..ros2 .publisher import *
18
-
17
+ from .. ros2 . ros_widgets import *
19
18
from ..ros2 .subscriber import *
Original file line number Diff line number Diff line change 11
11
import threading
12
12
import time
13
13
import ipywidgets as widgets
14
- from . import add_widgets
14
+ from .ros_widgets import add_widgets
15
15
import functools
16
16
17
17
def rsetattr (obj , attr , val ):
You can’t perform that action at this time.
0 commit comments