From 7ef40b508cfa7deed21419a391b29d8dddfbbf0e Mon Sep 17 00:00:00 2001 From: Takashi Ogura Date: Mon, 18 Jan 2021 11:46:52 +0900 Subject: [PATCH 1/4] Add `serial` as dependencies in package.xml --- package.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.xml b/package.xml index 8ea547e..78fff1c 100644 --- a/package.xml +++ b/package.xml @@ -14,10 +14,12 @@ roscpp rospy std_msgs + serial roscpp rospy std_msgs + serial From 47a2b549e7adaab134fd7977e319f87344741a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=AB=8B=E5=86=9B?= Date: Tue, 2 Feb 2021 11:39:04 +0800 Subject: [PATCH 2/4] doc: fix pip test description. --- README.md | 2 +- READMEcn.md | 2 +- scripts/test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 408970b..ac979aa 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ $ catkin_make ```bash cd ~/catkin_ws/src/myCobotROS -python3 scripts/test.py +python scripts/test.py ``` ## 2. Package Modules diff --git a/READMEcn.md b/READMEcn.md index bee04aa..68d0382 100644 --- a/READMEcn.md +++ b/READMEcn.md @@ -42,7 +42,7 @@ $ catkin_make ```bash cd ~/catkin_ws/src/myCobotROS -python3 scripts/test.py +python scripts/test.py ``` ## 2. 模块 diff --git a/scripts/test.py b/scripts/test.py index 53469aa..dc26831 100644 --- a/scripts/test.py +++ b/scripts/test.py @@ -5,7 +5,7 @@ from pymycobot.genre import Angle, Coord if __name__ == '__main__': port = subprocess.check_output(['echo -n /dev/ttyUSB*'], - shell=True) + shell=True).decode() mycobot = MyCobot(port) # port = subprocess.run(['echo -n /dev/ttyUSB*'], From d9380b83033e1ad5a85b64705727b0a4c26b9a1f Mon Sep 17 00:00:00 2001 From: Zachary Date: Tue, 2 Feb 2021 14:45:16 +0800 Subject: [PATCH 3/4] Update test.py --- scripts/test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/test.py b/scripts/test.py index dc26831..ed36c4d 100644 --- a/scripts/test.py +++ b/scripts/test.py @@ -17,9 +17,9 @@ if __name__ == '__main__': color_name = ['red', 'green', 'blue'] color_code = ['ff0000', '00ff00', '0000ff'] - print('::ser_color()') + print('::ser_led_color()') i = random.randint(0, len(color_code) - 1) - mycobot.set_color(color_code[i]) + mycobot.set_led_color(color_code[i]) print('==>set color {}\n'.format(color_name[i])) time.sleep(0.5) @@ -57,7 +57,7 @@ if __name__ == '__main__': print('==> send coords [160,160,160,0,0,0], speed 70, mode 0\n') time.sleep(3.0) - print(mycobot.is_in_position(coord_list)) + print(mycobot.is_in_position(coord_list, 1)) time.sleep(1) print('::send_coord()') From 516b03c151e18e6d9b979f4bc7d4eef3116ba471 Mon Sep 17 00:00:00 2001 From: mertcooking Date: Thu, 4 Feb 2021 00:17:59 +0900 Subject: [PATCH 4/4] Add:control_slider.launch --- launch/control_slider.launch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 launch/control_slider.launch diff --git a/launch/control_slider.launch b/launch/control_slider.launch new file mode 100644 index 0000000..6aadc66 --- /dev/null +++ b/launch/control_slider.launch @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +