From 955aba11a50a40299f17ec63765dfb705bf95c59 Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Sun, 1 Jul 2018 15:42:48 -0700 Subject: [PATCH] fix axis error motor failed when encoder failed --- Firmware/MotorControl/encoder.cpp | 2 +- tools/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/MotorControl/encoder.cpp b/Firmware/MotorControl/encoder.cpp index f80f04dc..4eb72f10 100644 --- a/Firmware/MotorControl/encoder.cpp +++ b/Firmware/MotorControl/encoder.cpp @@ -33,7 +33,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(){ diff --git a/tools/setup.py b/tools/setup.py index d5e38eff..8dcc7cdd 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -33,7 +33,7 @@ to publish packages with the name odrive. # Set to true to make an official post-release, rather than dev of new version is_post_release = False -post_rel_num = 5 +post_rel_num = 9 # To test higher numbered releases, bump to the next rev bump_rev = not is_post_release