rusefi
/
bldc
mirror of https://github.com/rusefi/bldc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #377 from RadinnAB/hw_rd2_adj 

Minor adjustments for HW_RD2 & the build tool-chain
This commit is contained in:
Benjamin Vedder 2021-11-13 23:10:53 +01:00 committed by GitHub
parent 19dc884ed6 80d504edaf
commit 76adfc1601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -42,7 +42,7 @@ endif
# Enable this if you want to see the full log while compiling.
ifeq ($(USE_VERBOSE_COMPILE),)
USE_VERBOSE_COMPILE = yes
USE_VERBOSE_COMPILE = no
endif
# If enabled, this option makes the build process faster by not compiling
@ -322,3 +322,6 @@ upload-pi-remote: build/$(PROJECT).elf
debug-start:
openocd -f stm32-bv_openocd.cfg
size: build/$(PROJECT).elf
@$(SZ) $<

2
hwconf/hw_rd2.c
View File

@ -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);

30
hwconf/hw_rd2.h
View File

@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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_ */