From c1c3376405768ffc78a7d21397e86d2eca211dd7 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 12 Apr 2017 10:41:16 -0400 Subject: [PATCH] better CAN flexibility --- firmware/config/stm32f4ems/efifeatures.h | 8 -------- firmware/hw_layer/can_hw.cpp | 1 - firmware/hw_layer/stm32f0/mpu_util.h | 5 ++++- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index c0b7e0728a..782393d4a2 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -197,14 +197,6 @@ // todo: switch to continues ADC conversion for fast ADC? #define EFI_INTERNAL_FAST_ADC_PWM &PWMD4 -//#define EFI_CAN_DEVICE CAND2 -#define EFI_CAN_RX_AF 9 -#define EFI_CAN_TX_AF 9 - -//#define EFI_CAN_DEVICE CAND1 -//#define EFI_CAN_RX_AF 9 -//#define EFI_CAN_TX_AF 9 - #define EFI_SPI1_AF 5 #define EFI_SPI2_AF 5 diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index 05cd1cdd27..f2bb21ad3f 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -278,7 +278,6 @@ void stopCanPins(DECLARE_ENGINE_PARAMETER_F) { } void startCanPins(DECLARE_ENGINE_PARAMETER_F) { - // todo: confirm that same AF works for all pins on all devices? mySetPadMode2("CAN TX", boardConfiguration->canTxPin, PAL_MODE_ALTERNATE(EFI_CAN_TX_AF)); mySetPadMode2("CAN RX", boardConfiguration->canRxPin, PAL_MODE_ALTERNATE(EFI_CAN_RX_AF)); } diff --git a/firmware/hw_layer/stm32f0/mpu_util.h b/firmware/hw_layer/stm32f0/mpu_util.h index 19c91ca2c6..57ca52bc1d 100644 --- a/firmware/hw_layer/stm32f0/mpu_util.h +++ b/firmware/hw_layer/stm32f0/mpu_util.h @@ -7,7 +7,10 @@ #ifndef MPU_UTIL_H_ #define MPU_UTIL_H_ +// we are lucky - all CAN pins use the same AF +#define EFI_CAN_RX_AF 9 +#define EFI_CAN_TX_AF 9 + #define baseHardwareInit() {} - #endif /* MPU_UTIL_H_ */