Skip to content

Commit 8a86fdf

Browse files
authored
Merge pull request #6 from UW-Advanced-Robotics-Lab/user/arnab/edit-2024-02-12
Adding links for WAM internal-PC usage
2 parents bc4825d + a1ce754 commit 8a86fdf

File tree

2 files changed

+45
-37
lines changed

2 files changed

+45
-37
lines changed

docs/Waterloo-Steel:Platform-Instruction.md

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,26 @@
3131
- [**3. Jetson Orin (WAM + Vision PC)**](#3-Jetson-Orin-WAM-Vision-PC)
3232
- [3.1 WAM Node:](#31-WAM-Node)
3333
- [3.2 Multiple Intel Cameras:](#32-Multiple-Intel-Cameras)
34-
- [**4. Steam Deck Controller**](#4-Steam-Deck-Controller)
35-
- [4.1 Deck Button Layout](#41-Deck-Button-Layout)
36-
- [4.2 Deck Button Functions](#42-Deck-Button-Functions)
37-
- [4.2.a) Move Summit:](#42a-Move-Summit)
38-
- [4.2.b) Steam Arch Linux:](#42b-Steam-Arch-Linux)
39-
- [4.2.c) Additional & Modification:](#42c-Additional-Modification)
40-
- [4.3 Control Summit Base Platform:](#43-Control-Summit-Base-Platform)
41-
- [4.3.1 Launching through Icons:](#431-Launching-through-Icons)
42-
- [4.3.2 Launch through terminals:](#432-Launch-through-terminals)
43-
- [1.3.2.1 Launch Pad](#1321-Launch-Pad)
44-
- [1.3.2.2 Launch Rviz](#1322-Launch-Rviz)
45-
- [**5. AMCL Mapping Instruction**](#5-AMCL-Mapping-Instruction)
46-
- [5.1 Creating AMCL Map:](#51-Creating-AMCL-Map)
47-
- [5.1.1 Disable Navigation Package](#511-Disable-Navigation-Package)
48-
- [5.1.2 Launch SLAM Gmapping:](#512-Launch-SLAM-Gmapping)
49-
- [5.1.3 Now Mapping on Rviz:](#513-Now-Mapping-on-Rviz)
50-
- [5.1.4 Save the Map:](#514-Save-the-Map)
51-
- [5.2 Loading the New Map](#52-Loading-the-New-Map)
34+
- [**4. Internal WAM PC**](#4-Internal-WAM-PC)
35+
- [4.1 WAM Node:](#41-WAM-Node)
36+
- [**5. Steam Deck Controller**](#5-Steam-Deck-Controller)
37+
- [5.1 Deck Button Layout](#51-Deck-Button-Layout)
38+
- [5.2 Deck Button Functions](#52-Deck-Button-Functions)
39+
- [5.2.a) Move Summit:](#52a-Move-Summit)
40+
- [5.2.b) Steam Arch Linux:](#52b-Steam-Arch-Linux)
41+
- [5.2.c) Additional & Modification:](#52c-Additional-Modification)
42+
- [5.3 Control Summit Base Platform:](#53-Control-Summit-Base-Platform)
43+
- [5.3.1 Launching through Icons:](#531-Launching-through-Icons)
44+
- [5.3.2 Launch through terminals:](#532-Launch-through-terminals)
45+
- [5.3.2.1 Launch Pad](#5321-Launch-Pad)
46+
- [5.3.2.2 Launch Rviz](#5322-Launch-Rviz)
47+
- [**6. AMCL Mapping Instruction**](#6-AMCL-Mapping-Instruction)
48+
- [6.1 Creating AMCL Map:](#61-Creating-AMCL-Map)
49+
- [6.1.1 Disable Navigation Package](#611-Disable-Navigation-Package)
50+
- [6.1.2 Launch SLAM Gmapping:](#612-Launch-SLAM-Gmapping)
51+
- [6.1.3 Now Mapping on Rviz:](#613-Now-Mapping-on-Rviz)
52+
- [6.1.4 Save the Map:](#614-Save-the-Map)
53+
- [6.2 Loading the New Map](#62-Loading-the-New-Map)
5254
- [**Appendix A - Utilities**](#Appendix-A-Utilities)
5355
- [A.1 xacro and launching](#A1-xacro-and-launching)
5456
- [A.2 ROS](#A2-ROS)
@@ -266,17 +268,20 @@ $ ssh [email protected]
266268
$ roslaunch waterloo_steel_supervisor multi_intel_camera.launch
267269
```
268270

271+
# 4. Internal WAM PC
272+
In order to connect over the Inernal WAM PC (to check if the WAM, under Real-time operation, is performing correctly), download the [wamdiscover.py](https://web.barrett.com/support/WAM_Installer/wamdiscover.py) from the Barrett file [repository](https://web.barrett.com/support/). This will give you the current WAM-IP and allow you to connect to it directly.
269273

274+
Useful info on setting up programs to use the libbarrette library can be found[here](https://github.com/UW-Advanced-Robotics-Lab/uwarl-libbarrett).
270275

271-
# 4. Steam Deck Controller
276+
# 5. Steam Deck Controller
272277

273-
## 4.1 Deck Button Layout
278+
## 5.1 Deck Button Layout
274279

275280
![steam_deck_ports_controls](resources/deck/steam_deck_ports_controls.jpg)
276281

277-
## 4.2 Deck Button Functions
282+
## 5.2 Deck Button Functions
278283

279-
### 4.2.a) Move Summit:
284+
### 5.2.a) Move Summit:
280285

281286
- Launch the joystick controller by touching **[Launch UWARL Summit Controller]** App Icon
282287
- Button Layouts:
@@ -287,7 +292,7 @@ $ roslaunch waterloo_steel_supervisor multi_intel_camera.launch
287292
- Hold :three: **[R1]** + Press **[A]** Speed Down --
288293
- Hold :three: **[R1]** + Press **[X/B]** :no_entry_sign: **NOT IMPLEMENTED**
289294

290-
### 4.2.b) Steam Arch Linux:
295+
### 5.2.b) Steam Arch Linux:
291296

292297
- :four: **[R4]** : Scroll Up
293298
- :five: **[R5]** : Scroll Down
@@ -297,52 +302,52 @@ $ roslaunch waterloo_steel_supervisor multi_intel_camera.launch
297302
- 9️⃣ **[Right Trackpad]** : Mouse Move + Mouse Right Click
298303
- :keycap_ten: **[Steam]** : Menu Selection ---> Used to switch between Steam OS / ArchLinux Mode + Power/Restart
299304

300-
### 4.2.c) Additional & Modification:
305+
### 5.2.c) Additional & Modification:
301306

302307
- You may check the button **id** using the software GUI: **joystick**
303308
- You may assign these button **id** to summit ws files on summit-pc: `~/UWARL_catkin_ws/waterloo_steel/waterloo_steel_interface/summit_xl_pad/config/uwarl_deck.yaml`
304309

305-
## 4.3 Control Summit Base Platform:
310+
## 5.3 Control Summit Base Platform:
306311

307312
![deck_controller_desktop](resources/deck/deck_controller_desktop.jpg)
308313

309-
### 4.3.1 Launching through Icons:
314+
### 5.3.1 Launching through Icons:
310315

311316
- :one: > **Launch Pad**
312317
- :two: > **Rviz Viewer**
313318

314319

315320

316-
### 4.3.2 Launch through terminals:
321+
### 5.3.2 Launch through terminals:
317322

318-
#### 1.3.2.1 Launch Pad
323+
#### 5.3.2.1 Launch Pad
319324

320325
```bash
321326
$ roslaunch summit_xl_pad waterloo_steel_summit_deck.launch
322327
```
323328

324-
#### 1.3.2.2 Launch Rviz
329+
#### 5.3.2.2 Launch Rviz
325330

326331
```bash
327332
$ rosrun rviz rviz
328333
```
329334

330335

331336

332-
# 5. AMCL Mapping Instruction
337+
# 6. AMCL Mapping Instruction
333338

334339
> [!IMPORTANT]
335340
>
336341
> 1. Before launching, make sure the robot is aligned with an edge of the wall in the center of the room for best result
337342
> 2. Make sure in slow speed when creating the map
338343
339-
## 5.1 Creating AMCL Map:
344+
## 6.1 Creating AMCL Map:
340345

341346
```bash
342347
343348
```
344349

345-
### 5.1.1 Disable Navigation Package
350+
### 6.1.1 Disable Navigation Package
346351

347352
```bash
348353
## comment out navigation for summit
@@ -358,15 +363,15 @@ $ summit_systemctl restart
358363
$ summit_systemctl follow
359364
```
360365

361-
### 5.1.2 Launch SLAM Gmapping:
366+
### 6.1.2 Launch SLAM Gmapping:
362367

363368
```bash
364369
## slam mapping:
365370
$ cd ~/UWARL_catkin_ws/src/uwarl-summit_xl_robot/waterloo_steel_summit_bringup
366371
$ roslaunch summit_xl_localization slam_gmapping.launch
367372
```
368373

369-
### 5.1.3 Now Mapping on Rviz:
374+
### 6.1.3 Now Mapping on Rviz:
370375

371376
![mapping_rviz](resources/deck/mapping_rviz.jpg)
372377

@@ -377,7 +382,7 @@ $ roslaunch summit_xl_localization slam_gmapping.launch
377382
> 1. Keep a distance of at least 0.5 meters between the robot and the objects you want to capture. Objects within this distance will not be captured.
378383
> 2. Make sure your legs are not captured as an object. Therefore, stay in the blind spot of the robot or keep walking around.
379384
380-
### 5.1.4 Save the Map:
385+
### 6.1.4 Save the Map:
381386

382387
```bash
383388
$ cd ~/UWARL_catkin_ws/src/uwarl-summit_xl_common/summit_xl_localization/maps/{Building-floor-folder}
@@ -389,7 +394,7 @@ $ cd ~/UWARL_catkin_ws/src/uwarl-summit_xl_common/summit_xl_localization/maps/UW
389394
$ rosrun map_server map_saver -f map_robothub_2023-11-08
390395
```
391396

392-
## 5.2 Loading the New Map
397+
## 6.2 Loading the New Map
393398

394399
```bash
395400
$ cp ~/UWARL_catkin_ws/src/uwarl-summit_xl_common/summit_xl_localization/maps/UW_E7_1ST/map_robothub_2023-11-08.pgm ~/UWARL_catkin_ws/src/uwarl-summit_xl_common/summit_xl_localization/maps/map_in_use/map.pgm

docs/Waterloo-Steel:Spec-Hardware.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ M5 | 0.00001685 |9.48 |0.001584
7070
M6 | 0.00001745 |9.48 |0.001641
7171
M7 | 0.00000142 |14.93 |0.000318
7272

73+
### 1.1.4 Puck communication (*7)
74+
Frequency: 500 Hz (2 ms)
75+
Nescessary in-case one attempts to perform PID gain tuning.
7376

7477
## 1.2 Barrett Torque Sensor (*2):
7578
| Property | Value |
@@ -140,7 +143,7 @@ M7 | 0.00000142 |14.93 |0.000318
140143

141144
*6. [WAM Inertial Spec](https://web.barrett.com/support/WAM_Documentation/WAM_InertialSpecifications_AC-02.pdf)
142145

143-
146+
*7. [WAM Puck communication](https://support.barrett.com/wiki/WAM/DetailedSystemOperation#SoftwareArchitecture)
144147

145148
# 2. Power Table
146149

0 commit comments

Comments
 (0)