From bc2aa6601ed73e41b19f3123c4b2aa1ad32402a7 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 6 Sep 2020 20:21:01 -0400 Subject: [PATCH] microRusEFI used as Body Control Module BCM BCU --- firmware/config/engines/bmw_m73_mre.cpp | 7 +------ firmware/hw_layer/drivers/can/can_hw.cpp | 5 ----- firmware/init/sensor/init_tps.cpp | 14 ++++++++------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/firmware/config/engines/bmw_m73_mre.cpp b/firmware/config/engines/bmw_m73_mre.cpp index 2c3c7414ea..dcb2ad4fc3 100644 --- a/firmware/config/engines/bmw_m73_mre.cpp +++ b/firmware/config/engines/bmw_m73_mre.cpp @@ -102,18 +102,13 @@ void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->canNbcType = CAN_BUS_NBC_NONE; -#if EFI_CANBUS_SLAVE - engineConfiguration->canReadEnabled = true; - engineConfiguration->canWriteEnabled = false; -#else /* EFI_CANBUS_SLAVE */ // set_analog_input_pin pps PA7 // EFI_ADC_7: "31 - AN volt 3" - PA7 CONFIG(throttlePedalPositionAdcChannel) = EFI_ADC_7; - engineConfiguration->canReadEnabled = false; + engineConfiguration->canReadEnabled = true; engineConfiguration->canWriteEnabled = true; CONFIG(enableVerboseCanTx) = true; -#endif /* EFI_CANBUS_SLAVE */ // do I have VR wires flipped? diff --git a/firmware/hw_layer/drivers/can/can_hw.cpp b/firmware/hw_layer/drivers/can/can_hw.cpp index fa999a4d6a..dd9bd2507e 100644 --- a/firmware/hw_layer/drivers/can/can_hw.cpp +++ b/firmware/hw_layer/drivers/can/can_hw.cpp @@ -117,17 +117,12 @@ private: static CanRead canRead; static CanWrite canWrite; - static void canInfo(void) { if (!isCanEnabled) { scheduleMsg(&logger, "CAN is not enabled, please enable & restart"); return; } -#if EFI_CANBUS_SLAVE - scheduleMsg(&logger, "CAN SLAVE MODE"); -#endif - scheduleMsg(&logger, "CAN TX %s", hwPortname(CONFIG_OVERRIDE(canTxPin))); scheduleMsg(&logger, "CAN RX %s", hwPortname(CONFIG_OVERRIDE(canRxPin))); scheduleMsg(&logger, "type=%d canReadEnabled=%s canWriteEnabled=%s period=%d", engineConfiguration->canNbcType, diff --git a/firmware/init/sensor/init_tps.cpp b/firmware/init/sensor/init_tps.cpp index ba2af2f1cc..a026da1567 100644 --- a/firmware/init/sensor/init_tps.cpp +++ b/firmware/init/sensor/init_tps.cpp @@ -75,12 +75,14 @@ void initTps(DECLARE_CONFIG_PARAMETER_SIGNATURE) { float min = CONFIG(tpsErrorDetectionTooLow); float max = CONFIG(tpsErrorDetectionTooHigh); - initTpsFunc(tpsFunc1p, tpsSens1p, CONFIG(tps1_1AdcChannel), CONFIG(tpsMin), CONFIG(tpsMax), min, max); - initTpsFuncAndRedund(tps1, tpsFunc1s, tpsSens1s, CONFIG(tps1_2AdcChannel), CONFIG(tps1SecondaryMin), CONFIG(tps1SecondaryMax), min, max); - initTpsFunc(tpsFunc2p, tpsSens2p, CONFIG(tps2_1AdcChannel), CONFIG(tps2Min), CONFIG(tps2Max), min, max); - initTpsFuncAndRedund(tps2, tpsFunc2s, tpsSens2s, CONFIG(tps2_2AdcChannel), CONFIG(tps2SecondaryMin), CONFIG(tps2SecondaryMax), min, max); - initTpsFunc(pedalFuncPrimary, pedalSensorPrimary, CONFIG(throttlePedalPositionAdcChannel), CONFIG(throttlePedalUpVoltage), CONFIG(throttlePedalWOTVoltage), min, max); - initTpsFuncAndRedund(pedal, pedalFuncSecondary, pedalSensorSecondary, CONFIG(throttlePedalPositionSecondAdcChannel), CONFIG(throttlePedalSecondaryUpVoltage), CONFIG(throttlePedalSecondaryWOTVoltage), min, max); + if (!CONFIG(consumeObdSensors)) { + initTpsFunc(tpsFunc1p, tpsSens1p, CONFIG(tps1_1AdcChannel), CONFIG(tpsMin), CONFIG(tpsMax), min, max); + initTpsFuncAndRedund(tps1, tpsFunc1s, tpsSens1s, CONFIG(tps1_2AdcChannel), CONFIG(tps1SecondaryMin), CONFIG(tps1SecondaryMax), min, max); + initTpsFunc(tpsFunc2p, tpsSens2p, CONFIG(tps2_1AdcChannel), CONFIG(tps2Min), CONFIG(tps2Max), min, max); + initTpsFuncAndRedund(tps2, tpsFunc2s, tpsSens2s, CONFIG(tps2_2AdcChannel), CONFIG(tps2SecondaryMin), CONFIG(tps2SecondaryMax), min, max); + initTpsFunc(pedalFuncPrimary, pedalSensorPrimary, CONFIG(throttlePedalPositionAdcChannel), CONFIG(throttlePedalUpVoltage), CONFIG(throttlePedalWOTVoltage), min, max); + initTpsFuncAndRedund(pedal, pedalFuncSecondary, pedalSensorSecondary, CONFIG(throttlePedalPositionSecondAdcChannel), CONFIG(throttlePedalSecondaryUpVoltage), CONFIG(throttlePedalSecondaryWOTVoltage), min, max); + } // Route the pedal or TPS to driverIntent as appropriate if (CONFIG(throttlePedalPositionAdcChannel) != EFI_ADC_NONE) {