From ec69d43a9f4cc2d62e18c425eadfceb7fb4670c6 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 24 Jan 2016 15:02:46 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/custom_engine.cpp | 7 +++++++ firmware/config/engines/dodge_neon.cpp | 5 +---- firmware/hw_layer/can_hw.cpp | 6 ++++++ firmware/hw_layer/can_hw.h | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 085de858be..8861d104b9 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -12,6 +12,10 @@ #include "allsensors.h" #include "engine_math.h" +#if EFI_PROD_CODE +#include "can_hw.h" +#endif + EXTERN_ENGINE; void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { @@ -112,6 +116,9 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // todo: 8.2 or 10k? engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2; +#if EFI_PROD_CODE + enableFrankensoCan(); +#endif } #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_CPP_ */ diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 8cc0eeabae..d856e712d4 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -447,11 +447,8 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // engineConfiguration->alternatorControl.pFactor = 22; engineConfiguration->alternatorControl.pFactor = 55; // looks to work better, maybe time for some iFactor -// engineConfiguration->isCanEnabled = true; - boardConfiguration->canTxPin = GPIOB_6; - boardConfiguration->canRxPin = GPIOB_12; +// enableFrankensoCan(); engineConfiguration->canWriteEnabled = true; - engineConfiguration->canReadEnabled = false; engineConfiguration->canNbcType = CAN_BUS_NBC_BMW; // engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8; diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index 0496216e65..befbca2ba8 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -252,6 +252,12 @@ static void canInfo(void) { #endif /* EFI_PROD_CODE */ +void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_F) { + // engineConfiguration->isCanEnabled = true; + boardConfiguration->canTxPin = GPIOB_6; + boardConfiguration->canRxPin = GPIOB_12; + engineConfiguration->canReadEnabled = false; +} void initCan(void) { #if EFI_PROD_CODE diff --git a/firmware/hw_layer/can_hw.h b/firmware/hw_layer/can_hw.h index c026681667..9f5c47518c 100644 --- a/firmware/hw_layer/can_hw.h +++ b/firmware/hw_layer/can_hw.h @@ -30,5 +30,6 @@ void initCan(void); void commonTxInit(int eid); void sendMessage(); void setTxBit(int offset, int index); +void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_F); #endif /* CAN_HW_H_ */