Motor temperature filtering bug fix

This commit is contained in:
Benjamin Vedder 2020-04-09 22:33:20 +02:00
parent 0e6f8dd567
commit 3ab8002fa4
3 changed files with 7 additions and 6 deletions

View File

@ -17,6 +17,7 @@
* Moved fault stop to thread, and added SPI mutexes to DRV drivers.
* Smooth current ramping in flux linkage measurement and sensor detection.
* Added hall_analyze terminal command.
* Motor temperature filtering bug fix.
=== FW 4.02 ===
* Position PID fix (most notable on multiturn encoders).

View File

@ -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 2
#define FW_TEST_VERSION_NUMBER 3
#include "datatypes.h"
@ -72,8 +72,8 @@
// Mark3 version of HW60 with power switch and separate NRF UART.
//#define HW60_IS_MK3
//#define HW_SOURCE "hw_60.c"
//#define HW_HEADER "hw_60.h"
#define HW_SOURCE "hw_60.c"
#define HW_HEADER "hw_60.h"
//#define HW_SOURCE "hw_r2.c"
//#define HW_HEADER "hw_r2.h"
@ -137,8 +137,8 @@
//#define HW_HEADER "hw_unity.h"
//#define HW_DUAL_CONFIG_PARALLEL
#define HW_SOURCE "hw_stormcore_100d.c"
#define HW_HEADER "hw_stormcore_100d.h"
//#define HW_SOURCE "hw_stormcore_100d.c"
//#define HW_HEADER "hw_stormcore_100d.h"
//#define HW_SOURCE "hw_stormcore_60d.c"
//#define HW_HEADER "hw_stormcore_60d.h"

View File

@ -1848,7 +1848,7 @@ static void update_override_limits(volatile motor_if_state_t *motor, volatile mc
switch(conf->m_motor_temp_sens_type) {
case TEMP_SENSOR_NTC_10K_25C:
motor->m_temp_motor = is_motor_1 ? NTC_TEMP_MOTOR(conf->m_ntc_motor_beta) : NTC_TEMP_MOTOR_2(conf->m_ntc_motor_beta);
temp_motor = is_motor_1 ? NTC_TEMP_MOTOR(conf->m_ntc_motor_beta) : NTC_TEMP_MOTOR_2(conf->m_ntc_motor_beta);
break;
case TEMP_SENSOR_PTC_1K_100C: