Skip to content
Snippets Groups Projects
Commit 50701aa6 authored by Christian Dreher's avatar Christian Dreher
Browse files

Merge branch 'armar7' into 'main'

RelativeEncoderErrorChecking: outcommented warnings temporary because of bogus...

See merge request !52
parents 421b2d0d 2234b057
No related branches found
No related tags found
1 merge request!52RelativeEncoderErrorChecking: outcommented warnings temporary because of bogus...
......@@ -3,7 +3,6 @@
#include <armarx/control/ethercat/ErrorReporting.h>
#include <armarx/control/ethercat/SlaveInterface.h>
namespace devices::ethercat::common::sensor_board::armar7de
{
ErrorDecoder::ErrorDecoder(SlaveOut* outputs, SlaveIn* inputs) :
......@@ -39,15 +38,18 @@ namespace devices::ethercat::common::sensor_board::armar7de
case RelativeEncoderStatus::EncoderHasNoPower:
SLAVE_ERROR(slave->getSlaveIdentifier(), "Relative encoder has no power")
.deactivateSpam(1);
return true;
//return true; <-- Outcommented temporary because of bogus hip sensor board (Christian + Jonas)
return false;
case RelativeEncoderStatus::EncoderHasNoSignal:
SLAVE_ERROR(slave->getSlaveIdentifier(), "Relative encoder has no signal")
.deactivateSpam(1);
return true;
//return true; <-- Outcommented temporary because of bogus hip sensor board (Christian + Jonas)
return false;
case RelativeEncoderStatus::SpeedIsTooHigh:
SLAVE_ERROR(slave->getSlaveIdentifier(), "Relative encoder: speed is too high")
.deactivateSpam(1);
return true;
//return true; <-- Outcommented temporary because of bogus hip sensor board (Christian + Jonas)
return false;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment