Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose diagnostic error codes #225

Merged

Conversation

jessica-chen-ocado
Copy link
Contributor

@jessica-chen-ocado jessica-chen-ocado commented Nov 14, 2024

PR to parse UR10 error codes from diagnostic logs that are streamed on the Primary Interface port 30001

@jessica-chen-ocado jessica-chen-ocado marked this pull request as ready for review November 14, 2024 18:53
@urfeex
Copy link
Member

urfeex commented Nov 15, 2024

Thank you very much for your contribution! I've wanted to extract parts of #186 since a long time, since that one got too big at some point. I'll have a deeper look at this ASAP.

@jessica-chen-ocado
Copy link
Contributor Author

@urfeex Any updates on this?

Copy link
Member

@urfeex urfeex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you again for tackling this. If we could restructure things a bit (and rename the ErrorCodeClient) so it could potentially be reused as a primary client with more features in future, I think we could get this merged.

src/primary/robot_message/error_code_message.cpp Outdated Show resolved Hide resolved
include/ur_client_library/ur/error_code_client.h Outdated Show resolved Hide resolved
tests/test_ur_driver.cpp Show resolved Hide resolved
@jessica-chen-ocado jessica-chen-ocado force-pushed the expose-diagnostic-error-codes branch from 5a65f3e to 93b0933 Compare January 13, 2025 20:02
@urfeex
Copy link
Member

urfeex commented Jan 14, 2025

@jessica-chen-ocado as you just rebased on current master: Do you plan to continue working on this based on our discussions previously?

@jessica-chen-ocado
Copy link
Contributor Author

@jessica-chen-ocado as you just rebased on current master: Do you plan to continue working on this based on our discussions previously?

There is a change in priority with my assigned tasks but yes I intend to work on this when I'm free and finish this PR.

@jessica-chen-ocado jessica-chen-ocado force-pushed the expose-diagnostic-error-codes branch from af13b93 to b264b21 Compare January 16, 2025 20:03
Copy link
Member

@urfeex urfeex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking almost good. It would be good to sort out the license headers before merging and I have a couple of suggestions. Thank you for following up on this. This should give us a solid base to implement more features from #186 in the future.

src/primary/primary_client.cpp Show resolved Hide resolved
src/primary/primary_client.cpp Show resolved Hide resolved
src/primary/robot_message/error_code_message.cpp Outdated Show resolved Hide resolved
src/primary/primary_client.cpp Outdated Show resolved Hide resolved
src/ur/ur_driver.cpp Outdated Show resolved Hide resolved
tests/test_ur_driver.cpp Outdated Show resolved Hide resolved
tests/test_ur_driver.cpp Outdated Show resolved Hide resolved
include/ur_client_library/primary/primary_client.h Outdated Show resolved Hide resolved
include/ur_client_library/primary/primary_client.h Outdated Show resolved Hide resolved
src/primary/primary_client.cpp Outdated Show resolved Hide resolved
src/primary/primary_client.cpp Outdated Show resolved Hide resolved
Copy link

codecov bot commented Jan 17, 2025

Codecov Report

Attention: Patch coverage is 85.71429% with 15 lines in your changes missing coverage. Please review.

Project coverage is 73.03%. Comparing base (316b1b3) to head (1abca39).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
...clude/ur_client_library/primary/primary_consumer.h 70.73% 11 Missing and 1 partial ⚠️
include/ur_client_library/comm/pipeline.h 75.00% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #225      +/-   ##
==========================================
+ Coverage   72.62%   73.03%   +0.40%     
==========================================
  Files          76       80       +4     
  Lines        2977     3059      +82     
  Branches      381      389       +8     
==========================================
+ Hits         2162     2234      +72     
  Misses        614      614              
- Partials      201      211      +10     
Flag Coverage Δ
ur20-latest 71.72% <85.71%> (+0.24%) ⬆️
ur5-3.14.3 72.59% <85.71%> (+0.38%) ⬆️
ur5e-5.9.4 72.33% <85.71%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@urfeex
Copy link
Member

urfeex commented Jan 24, 2025

@jessica-chen-ocado If you could add license headers to the files you've added, I think we would be good to merge this.

@jessica-chen-ocado jessica-chen-ocado force-pushed the expose-diagnostic-error-codes branch from 1520307 to c798e80 Compare February 5, 2025 15:50
@jessica-chen-ocado
Copy link
Contributor Author

fyi I have add the headers and rebased my branch. I'll let you handle the rest? Thanks!

@urfeex
Copy link
Member

urfeex commented Feb 6, 2025

Thank you for coming back on this @jessica-chen-ocado

I'll see what needs to be done and if I can do that.

Copy link
Member

@urfeex urfeex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think, we are good to go with that! I will do some final testing and then probably merge this. Thank you @jessica-chen-ocado for getting parts of #186, finally!

tests/test_ur_driver.cpp Outdated Show resolved Hide resolved
urfeex and others added 9 commits February 7, 2025 10:46
If URsim's time in the container is running a bit slower than the caller's time, we raise an error.
Since I've created the file while working at FZI, I left the copyright
owner and the license as is.
@urfeex urfeex force-pushed the expose-diagnostic-error-codes branch from 37081c1 to d400328 Compare February 7, 2025 09:46
@urfeex urfeex merged commit 61680ae into UniversalRobots:master Feb 7, 2025
20 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants