Skip to content

Commit 9aff85a

Browse files
authored
Services to support various dashboard calls (UniversalRobots#1674)
Add more dashboard client calls that we didn't support so far.
1 parent 79fbf74 commit 9aff85a

21 files changed

Lines changed: 466 additions & 11 deletions

.github/workflows/reusable_ici.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ jobs:
7474
ROS_DISTRO: ${{ inputs.ros_distro }}
7575
ROS_REPO: ${{ inputs.ros_repo }}
7676
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON
77-
ADDITIONAL_DEBS: docker.io netcat-openbsd # Needed for integration tests
77+
ADDITIONAL_DEBS: docker.io netcat-openbsd curl # Needed for integration tests

ur_dashboard_msgs/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ set(msg_files
1111
msg/ProgramState.msg
1212
msg/RobotMode.msg
1313
msg/SafetyMode.msg
14+
msg/OperationalMode.msg
15+
msg/UserRole.msg
16+
msg/VersionInformation.msg
17+
msg/SafetyStatus.msg
1418
)
1519

1620
set(srv_files
@@ -28,6 +32,16 @@ set(srv_files
2832
srv/RawRequest.srv
2933
srv/IsInRemoteControl.srv
3034
srv/UploadProgram.srv
35+
srv/GetPolyScopeVersion.srv
36+
srv/GetSerialNumber.srv
37+
srv/GetUserRole.srv
38+
srv/SetUserRole.srv
39+
srv/SetOperationalMode.srv
40+
srv/GetOperationalMode.srv
41+
srv/GetRobotModel.srv
42+
srv/GetSafetyStatus.srv
43+
srv/GenerateFlightReport.srv
44+
srv/GenerateSupportFile.srv
3145
)
3246

3347
set(action_files
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
string MANUAL = MANUAL
2+
string AUTOMATIC = AUTOMATIC
3+
4+
string mode
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
string NORMAL = NORMAL
2+
string REDUCED = REDUCED
3+
string PROTECTIVE_STOP = PROTECTIVE_STOP
4+
string RECOVERY = RECOVERY
5+
string SAFEGUARD_STOP = SAFEGUARD_STOP
6+
string SYSTEM_EMERGENCY_STOP = SYSTEM_EMERGENCY_STOP
7+
string ROBOT_EMERGENCY_STOP = ROBOT_EMERGENCY_STOP
8+
string VIOLATION = VIOLATION
9+
string FAULT = FAULT
10+
string AUTOMATIC_MODE_SAFEGUARD_STOP = AUTOMATIC_MODE_SAFEGUARD_STOP
11+
string SYSTEM_THREE_POSITION_ENABLING_STOP = SYSTEM_THREE_POSITION_ENABLING_STOP
12+
13+
string status

ur_dashboard_msgs/msg/UserRole.msg

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
string PROGRAMMER = PROGRAMMER
2+
string OPERATOR = OPERATOR
3+
string NONE = NONE
4+
string LOCKED = LOCKED
5+
string RESTRICTED = RESTRICTED
6+
7+
string role
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
uint32 major
2+
uint32 minor
3+
uint32 bugfix
4+
uint32 build
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
string CONTROLLER = controller
2+
string SOFTWARE = software
3+
string SYSTEM = system
4+
5+
# Same default as in the dashboard server
6+
string report_type SYSTEM
7+
---
8+
bool success
9+
string answer
10+
string report_id
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Default: save file in /programs
2+
string dir_path .
3+
---
4+
bool success
5+
string answer
6+
string generated_file_name
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
bool success
3+
string answer
4+
OperationalMode operational_mode
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
string answer
3+
bool success
4+
VersionInformation version

0 commit comments

Comments
 (0)