Added commands, version check and now throws exception #1
Conversation
The dockerfile is no longer needed as the repo now uses the docker image
Co-authored-by: Mads Holm Peters <[email protected]>
Added tests for dashboard client
Codecov ReportBase: 74.23% // Head: 73.15% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## pr #1 +/- ##
==========================================
- Coverage 74.23% 73.15% -1.09%
==========================================
Files 89 90 +1
Lines 3198 3382 +184
Branches 343 378 +35
==========================================
+ Hits 2374 2474 +100
- Misses 612 677 +65
- Partials 212 231 +19
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
|
|
||
| using namespace urcl; | ||
|
|
||
| // In a real-world example it would be better to get those values from command line parameters / a | ||
| // better configuration system such as Boost.Program_options | ||
| const std::string DEFAULT_ROBOT_IP = "127.0.0.1"; | ||
| const std::string DEFAULT_ROBOT_IP = "10.53.253.22"; |
There was a problem hiding this comment.
| const std::string DEFAULT_ROBOT_IP = "10.53.253.22"; | |
| const std::string DEFAULT_ROBOT_IP = "127.0.0.1"; |
| @@ -64,6 +65,8 @@ int main(int argc, char* argv[]) | |||
| return 1; | |||
| } | |||
|
|
|||
| my_dashboard->commandCloseSafetyPopup(); | |||
There was a problem hiding this comment.
Please add a comment on why this is a good idea.
Remember this is an example to get people started
| bool commandRunning(); | ||
|
|
||
| /*! | ||
| * \brief Send Is program saved command |
There was a problem hiding this comment.
| * \brief Send Is program saved command | |
| * \brief Send "Is program saved" request command |
| /*! | ||
| * \brief Send Is program saved command | ||
| * | ||
| * \return True succeeded |
There was a problem hiding this comment.
| * \return True succeeded | |
| * \return True if the program saved |
| bool commandIsProgramSaved(); | ||
|
|
||
| /*! | ||
| * \brief Send Is in remote control command |
There was a problem hiding this comment.
| * \brief Send Is in remote control command | |
| * \brief Send "Is in remote control" request command |
| /*! | ||
| * \brief Send Is in remote control command | ||
| * | ||
| * \return True succeeded |
There was a problem hiding this comment.
| * \return True succeeded | |
| * \return True if it is in remote control |
| URCL_LOG_WARN("Did not got the expected \"%s\" respone within the timeout. Last respone was: \"%s\"", | ||
| expected.c_str(), response.c_str()); | ||
| URCL_LOG_WARN("Did not got the expected \"%s\" response within the timeout. Last response was: \"%s\"", | ||
| expected.c_str(), response.c_str()); // Is a warning here so retryCommand does not throw when retrying |
There was a problem hiding this comment.
Change it to an exception and make "retryCommand()" catch the exception
| bool ret = std::lexicographical_compare(parsedRef, parsedRef + 4, parsedC, parsedC + 4); | ||
| if (!ret) | ||
| { | ||
| throw UrException("Polyscope software version required is: " + ref + ", but actual version is: " + c); |
There was a problem hiding this comment.
Will suggest that we throw the exception in the "command" function to make it obvious witch one is the one that is not supported by the robot or pass the command name to this function
| bool DashboardClient::commandPowerOff() | ||
| { | ||
| if (!lessThanVersion("5.0.0", "3.0", polyscope_version_)) | ||
| return false; |
|
|
||
| using namespace urcl; | ||
|
|
||
| // std::string ROBOT_IP = "192.168.56.101"; |
fmauch
force-pushed
the
pr
branch
7 times, most recently
from
926a3a5
to
607eeeb
Compare
|
I've merged the changes from this PR into UniversalRobots#127 and will do the review / final changes there. |
Added tests for dashboard client