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

auto-sync

This commit is contained in:
rusEfi 2017-02-11 10:01:49 -05:00
parent 2b73087f01
commit 2b7023f464
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/hw_layer/can_hw.cpp
View File

@ -273,17 +273,21 @@ void startCanPins(DECLARE_ENGINE_PARAMETER_F) {
mySetPadMode2("CAN RX", boardConfiguration->canRxPin, PAL_MODE_ALTERNATE(EFI_CAN_RX_AF)); mySetPadMode2("CAN RX", boardConfiguration->canRxPin, PAL_MODE_ALTERNATE(EFI_CAN_RX_AF));
} }
static bool isValidCanPin(brain_pin_e pin) { static bool isValidCanTxPin(brain_pin_e pin) {
return pin == GPIOB_6 || pin == GPIOB_12; return pin == GPIOB_6 || pin == GPIOD_1;
}
static bool isValidCanRxPin(brain_pin_e pin) {
return pin == GPIOB_12 || pin == GPIOD_0;
} }
void initCan(void) { void initCan(void) {
isCanEnabled = (boardConfiguration->canTxPin != GPIO_UNASSIGNED) && (boardConfiguration->canRxPin != GPIO_UNASSIGNED); isCanEnabled = (boardConfiguration->canTxPin != GPIO_UNASSIGNED) && (boardConfiguration->canRxPin != GPIO_UNASSIGNED);
if (isCanEnabled) { if (isCanEnabled) {
if (!isValidCanPin(boardConfiguration->canTxPin)) if (!isValidCanTxPin(boardConfiguration->canTxPin))
firmwareError(CUSTOM_OBD_70, "invalid CAN %s", hwPortname(boardConfiguration->canTxPin)); firmwareError(CUSTOM_OBD_70, "invalid CAN TX %s", hwPortname(boardConfiguration->canTxPin));
if (!isValidCanPin(boardConfiguration->canRxPin)) if (!isValidCanRxPin(boardConfiguration->canRxPin))
firmwareError(CUSTOM_OBD_70, "invalid CAN %s", hwPortname(boardConfiguration->canRxPin)); firmwareError(CUSTOM_OBD_70, "invalid CAN RX %s", hwPortname(boardConfiguration->canRxPin));
} }