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

fixed some minor merge errors

This commit is contained in:
Unknown 2018-04-06 23:46:35 +02:00
parent 5d9cc774ab
commit f740900a72
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf_general.h
View File

@ -51,8 +51,8 @@
!defined(HW_VERSION_48) && !defined(HW_VERSION_49) && !defined(HW_VERSION_410) && \
!defined(HW_VERSION_60) && !defined(HW_VERSION_R2) && !defined(HW_VERSION_VICTOR_R1A) && \
!defined(HW_VERSION_DAS_RS) && !defined(HW_VERSION_PALTA) && !defined(HW_VERSION_RH) && \
!defined(HW_VERSION_TP) && !defined(HW_VERSION_75_300) && !defined(HW_VERSION_MINI4)
!defined(HW_VERSION_TP) && !defined(HW_VERSION_DAS_MINI)
!defined(HW_VERSION_TP) && !defined(HW_VERSION_75_300) && !defined(HW_VERSION_MINI4) && \
!defined(HW_VERSION_DAS_MINI)
//#define HW_VERSION_40
//#define HW_VERSION_45
//#define HW_VERSION_46 // Also for 4.7

2
hwconf/hwconf.mk
View File

@ -15,7 +15,7 @@ HWSRC = hwconf/hw_40.c \
hwconf/hw_rh.c \
hwconf/hw_tp.c \
hwconf/hw_75_300.c \
hwconf/hw_mini4.c
hwconf/hw_mini4.c \
hwconf/hw_das_mini.c
HWINC = hwconf

4
mcuconf.h
View File

@ -210,8 +210,8 @@
#define STM32_ICU_USE_TIM1 FALSE
#define STM32_ICU_USE_TIM2 FALSE
#if defined(HW_VERSION_60) || defined(HW_VERSION_DAS_RS) || defined(HW_VERSION_PALTA) || \
defined(HW_VERSION_RH) || defined(HW_VERSION_75_300) || defined(HW_VERSION_MINI4)
#if defined(HW_VERSION_60) || defined(HW_VERSION_DAS_RS) || defined(HW_VERSION_PALTA) || defined(HW_VERSION_RH) || defined(HW_VERSION_DAS_MINI)
defined(HW_VERSION_RH) || defined(HW_VERSION_75_300) || defined(HW_VERSION_MINI4) || \
defined(HW_VERSION_DAS_MINI)
#define STM32_ICU_USE_TIM3 FALSE
#define STM32_ICU_USE_TIM4 TRUE
#else