Merge branch 'master' into devel

This commit is contained in:
Oskar Weigl
2018-07-17 01:41:31 -07:00
7 changed files with 58 additions and 40 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ void Encoder::setup() {
void Encoder::set_error(Encoder::Error_t error) {
error_ |= error;
axis_->error_ |= Axis::ERROR_MOTOR_FAILED;
axis_->error_ |= Axis::ERROR_ENCODER_FAILED;
}
bool Encoder::do_checks(){