From 2b13131a441663288abb1bfea667fae4c00202db Mon Sep 17 00:00:00 2001 From: "Jeffrey M. Friesen" Date: Mon, 6 Apr 2020 13:52:04 -0700 Subject: [PATCH] Correctly log motor fault data and iterate beta version number --- conf_general.h | 2 +- mc_interface.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf_general.h b/conf_general.h index 43957b14..7363b3cc 100644 --- a/conf_general.h +++ b/conf_general.h @@ -24,7 +24,7 @@ #define FW_VERSION_MAJOR 5 #define FW_VERSION_MINOR 00 // Set to 0 for building a release and iterate during beta test builds -#define FW_TEST_VERSION_NUMBER 1 +#define FW_TEST_VERSION_NUMBER 2 #include "datatypes.h" diff --git a/mc_interface.c b/mc_interface.c index 52f0c029..a4176544 100644 --- a/mc_interface.c +++ b/mc_interface.c @@ -2266,6 +2266,7 @@ static THD_FUNCTION(fault_stop_thread, arg) { chEvtWaitAny((eventmask_t) 1); #ifdef HW_HAS_DUAL_MOTORS volatile motor_if_state_t *motor = m_fault_stop_is_second_motor ? &m_motor_2 : &m_motor_1; + mc_interface_select_motor_thread(m_fault_stop_is_second_motor + 1); #else volatile motor_if_state_t *motor = &m_motor_1; #endif