Skip to content
Snippets Groups Projects
Commit b78c27cd authored by Fabian Reister's avatar Fabian Reister Committed by Fabian Reister
Browse files

Merge branch 'main' into feature/armar-de

parents fcb34928 69c52118
No related branches found
No related tags found
1 merge request!47Changes for ARMAR-DE and ARMAR-7
Hide whitespace changes
Inline Side-by-side
source/armarx/control/ethercat/bus_io/BusIO.cpp
+ 1
− 1
View file @ b78c27cd
......@@ -20,7 +20,7 @@
namespace armarx::control::ethercat
{
static constexpr int TIMEOUT_UPDATE_PDO_US = 500;
static constexpr int TIMEOUT_UPDATE_PDO_US = 600;
BusIO::BusIO()
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment