From 11b718adf76859ee1123a0857b70155a96238bee Mon Sep 17 00:00:00 2001 From: andreika-git Date: Sat, 27 Jul 2019 16:37:45 +0300 Subject: [PATCH] Use BOARD_TLE8888_COUNT for more compatibility (#889) --- firmware/config/engines/custom_engine.cpp | 17 ++++++++--------- firmware/config/engines/me7pnp.cpp | 12 +++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 1e3e7bcbb5..ab1dd40c92 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -330,11 +330,6 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL; - boardConfiguration->spi1mosiPin = GPIOB_5; - boardConfiguration->spi1misoPin = GPIOB_4; - boardConfiguration->spi1sckPin = GPIOB_3; // please note that this pin is also SWO/SWD - Single Wire debug Output - - engineConfiguration->tle8888_cs = GPIOD_5; engineConfiguration->directSelfStimulation = true; #if defined(STM32_HAS_GPIOG) && STM32_HAS_GPIOG @@ -348,15 +343,20 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { boardConfiguration->ignitionPins[6] = GPIOC_6; boardConfiguration->ignitionPins[7] = GPIOC_7; - // sckPin = GPIOB_3 - // misoPin = GPIOB_4 - // mosiPin = GPIOB_5 +#if (BOARD_TLE8888_COUNT > 0) engineConfiguration->tle8888spiDevice = SPI_DEVICE_1; + engineConfiguration->tle8888_cs = GPIOD_5; // PB3 is nicely both SWO and SPI1 SCK so logic analyzer could be used on SWO header + boardConfiguration->spi1mosiPin = GPIOB_5; + boardConfiguration->spi1misoPin = GPIOB_4; + boardConfiguration->spi1sckPin = GPIOB_3; // please note that this pin is also SWO/SWD - Single Wire debug Output boardConfiguration->is_enabled_spi_1 = true; engineConfiguration->debugMode = DBG_TLE8888; + boardConfiguration->fuelPumpPin = TLE8888_PIN_20; +#endif /* BOARD_TLE8888_COUNT */ + engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_9; // PB1 // just any non-empty value for now // ETB #1 top one - closer to 121 connector // DIS PF12 @@ -389,7 +389,6 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { CONFIG(etb2.directionPin1) = GPIOE_2; CONFIG(etb2.directionPin2) = GPIOE_4; - boardConfiguration->fuelPumpPin = TLE8888_PIN_20; engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // PA3 engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; // PA7 diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp index 9af30aa74d..f0aa23da6c 100644 --- a/firmware/config/engines/me7pnp.cpp +++ b/firmware/config/engines/me7pnp.cpp @@ -97,13 +97,18 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->is_enabled_spi_1 = true; boardConfiguration->is_enabled_spi_2 = true; boardConfiguration->is_enabled_spi_3 = false; - engineConfiguration->tle8888spiDevice = SPI_DEVICE_1; engineConfiguration->cj125SpiDevice = SPI_DEVICE_2; boardConfiguration->cj125CsPin = GPIOB_11; //Digital Inputs/Outputs - +#if (BOARD_TLE8888_COUNT > 0) + engineConfiguration->tle8888spiDevice = SPI_DEVICE_1; boardConfiguration->fuelPumpPin = TLE8888_PIN_22; + boardConfiguration->tachOutputPin = TLE8888_PIN_16; + boardConfiguration->alternatorControlPin = TLE8888_PIN_17; + engineConfiguration->auxPidPins[0] = TLE8888_PIN_6; // VVT solenoid control +#endif /* BOARD_TLE8888_COUNT */ + boardConfiguration->mainRelayPin = GPIO_UNASSIGNED; boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED; boardConfiguration->fanPin = GPIO_UNASSIGNED; @@ -116,11 +121,9 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF boardConfiguration->vehicleSpeedSensorInputPin = GPIOF_14; #endif /* STM32_HAS_GPIOF */ - boardConfiguration->tachOutputPin = TLE8888_PIN_16; //Alternator Settings - boardConfiguration->alternatorControlPin = TLE8888_PIN_17; boardConfiguration->alternatorControlPinMode = OM_OPENDRAIN; engineConfiguration->targetVBatt = 13.8; engineConfiguration->alternatorControl.offset = 40; @@ -163,7 +166,6 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // VVT Settings - engineConfiguration->auxPidPins[0] = TLE8888_PIN_6; // VVT solenoid control engineConfiguration->activateAuxPid1 = true; engineConfiguration->auxPidFrequency[0] = 300; boardConfiguration->fsio_setting[0] = 0.0;