diff --git a/hwconf/hw_rd2.c b/hwconf/hw_rd2.c index daceb56b..c6be8582 100644 --- a/hwconf/hw_rd2.c +++ b/hwconf/hw_rd2.c @@ -232,7 +232,7 @@ void hw_try_restore_i2c(void) { } } -float hw75_300_get_temp(void) { +float hw_rd2_get_temp(void) { float t1 = (1.0 / ((logf(NTC_RES(ADC_Value[ADC_IND_TEMP_MOS]) / 10000.0) / 3380.0) + (1.0 / 298.15)) - 273.15); float t2 = (1.0 / ((logf(NTC_RES(ADC_Value[ADC_IND_TEMP_MOS_2]) / 10000.0) / 3380.0) + (1.0 / 298.15)) - 273.15); float t3 = (1.0 / ((logf(NTC_RES(ADC_Value[ADC_IND_TEMP_MOS_3]) / 10000.0) / 3380.0) + (1.0 / 298.15)) - 273.15); diff --git a/hwconf/hw_rd2.h b/hwconf/hw_rd2.h index 7a59ded4..2d6e2c91 100644 --- a/hwconf/hw_rd2.h +++ b/hwconf/hw_rd2.h @@ -17,8 +17,8 @@ along with this program. If not, see . */ -#ifndef HW_75_300_H_ -#define HW_75_300_H_ +#ifndef HW_RD2_H_ +#define HW_RD2_H_ #define HW_NAME "RD2" @@ -108,7 +108,7 @@ // NTC Termistors #define NTC_RES(adc_val) ((4095.0 * 10000.0) / adc_val - 10000.0) -#define NTC_TEMP(adc_ind) hw75_300_get_temp() +#define NTC_TEMP(adc_ind) hw_rd2_get_temp() #define NTC_RES_MOTOR(adc_val) (10000.0 / ((4095.0 / (float)adc_val) - 1.0)) // Motor temp sensor on low side @@ -255,13 +255,19 @@ #define MCCONF_L_MAX_ABS_CURRENT 480.0 #endif #ifndef MCCONF_L_RPM_MAX -#define MCCONF_L_RPM_MAX 30000.0 +#define MCCONF_L_RPM_MAX 30750.0 #endif #ifndef MCCONF_L_RPM_MIN -#define MCCONF_L_RPM_MIN -30000.0 +#define MCCONF_L_RPM_MIN -30750.0 #endif #ifndef MCCONF_L_RPM_START -#define MCCONF_L_RPM_START 0.9 +#define MCCONF_L_RPM_START 0.8 +#endif +#ifndef MCCONF_L_WATT_MAX +#define MCCONF_L_WATT_MAX 11000.0 +#endif +#ifndef MCCONF_L_WATT_MIN +#define MCCONF_L_WATT_MIN -11000.0 #endif #ifndef MCCONF_FOC_CURRENT_KP #define MCCONF_FOC_CURRENT_KP 0.01 @@ -290,16 +296,16 @@ // Setup Info #ifndef MCCONF_SI_MOTOR_POLES -#define MCCONF_SI_MOTOR_POLES 8 // Motor pole count +#define MCCONF_SI_MOTOR_POLES 8 #endif #ifndef MCCONF_SI_BATTERY_TYPE -#define MCCONF_SI_BATTERY_TYPE BATTERY_TYPE_LIION_3_0__4_2 // Battery Type +#define MCCONF_SI_BATTERY_TYPE BATTERY_TYPE_LIION_3_0__4_2 #endif #ifndef MCCONF_SI_BATTERY_CELLS -#define MCCONF_SI_BATTERY_CELLS 14 // Battery Cells +#define MCCONF_SI_BATTERY_CELLS 14 #endif #ifndef MCCONF_SI_BATTERY_AH -#define MCCONF_SI_BATTERY_AH 69.0 // Battery amp hours +#define MCCONF_SI_BATTERY_AH 69.0 #endif // Setting limits @@ -313,6 +319,6 @@ #define HW_LIM_TEMP_FET -40.0, 110.0 // HW-specific functions -float hw75_300_get_temp(void); +float hw_rd2_get_temp(void); -#endif /* HW_75_300_H_ */ +#endif /* HW_RD2_H_ */