From 2e62e6fc91575076a7dc10a535bcc63092a06dbc Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 1 Nov 2023 10:21:27 -0400 Subject: [PATCH] only:shall we be just a little less Toyota --- firmware/controllers/algo/engine2.cpp | 12 ++++++------ firmware/controllers/sensors/impl/maf.cpp | 10 +++++----- firmware/hw_layer/adc/adc_inputs.cpp | 8 ++++---- firmware/hw_layer/adc/ads1015.cpp | 4 ++-- firmware/hw_layer/hardware.cpp | 10 ++++------ 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/firmware/controllers/algo/engine2.cpp b/firmware/controllers/algo/engine2.cpp index 412f36b040..890dc12965 100644 --- a/firmware/controllers/algo/engine2.cpp +++ b/firmware/controllers/algo/engine2.cpp @@ -138,18 +138,18 @@ void EngineState::periodicFastCallback() { auto tps = Sensor::get(SensorType::Tps1); updateTChargeK(rpm, tps.value_or(0)); - float injectionMass = getInjectionMass(rpm) * engine->engineState.lua.fuelMult + engine->engineState.lua.fuelAdd; + float l_injectionMass = getInjectionMass(rpm) * engine->engineState.lua.fuelMult + engine->engineState.lua.fuelAdd; auto clResult = fuelClosedLoopCorrection(); // Store the pre-wall wetting injection duration for scheduling purposes only, not the actual injection duration - engine->engineState.injectionDuration = engine->module()->getInjectionDuration(injectionMass); + engine->engineState.injectionDuration = engine->module()->getInjectionDuration(l_injectionMass); float fuelLoad = getFuelingLoad(); injectionOffset = getInjectionOffset(rpm, fuelLoad); engine->lambdaMonitor.update(rpm, fuelLoad); - float ignitionLoad = getIgnitionLoad(); - float baseAdvance = getAdvance(rpm, ignitionLoad) * engine->ignitionState.luaTimingMult + engine->ignitionState.luaTimingAdd; + float l_ignitionLoad = getIgnitionLoad(); + float baseAdvance = getAdvance(rpm, l_ignitionLoad) * engine->ignitionState.luaTimingMult + engine->ignitionState.luaTimingAdd; float correctedIgnitionAdvance = baseAdvance // Pull any extra timing for knock retard - engine->module()->getKnockRetard() @@ -173,9 +173,9 @@ void EngineState::periodicFastCallback() { auto cylinderTrim = getCylinderFuelTrim(i, rpm, fuelLoad); // Apply both per-bank and per-cylinder trims - engine->engineState.injectionMass[i] = injectionMass * bankTrim * cylinderTrim; + engine->engineState.injectionMass[i] = l_injectionMass * bankTrim * cylinderTrim; - timingAdvance[i] = correctedIgnitionAdvance + getCombinedCylinderIgnitionTrim(i, rpm, ignitionLoad); + timingAdvance[i] = correctedIgnitionAdvance + getCombinedCylinderIgnitionTrim(i, rpm, l_ignitionLoad); } shouldUpdateInjectionTiming = getInjectorDutyCycle(rpm) < 90; diff --git a/firmware/controllers/sensors/impl/maf.cpp b/firmware/controllers/sensors/impl/maf.cpp index 9b74273ce2..b3023edd03 100644 --- a/firmware/controllers/sensors/impl/maf.cpp +++ b/firmware/controllers/sensors/impl/maf.cpp @@ -1,13 +1,13 @@ #include "pch.h" -static int addMafPoint(persistent_config_s *config, int index, float kgHrValue, float voltage) { - config->mafDecoding[index] = kgHrValue; - config->mafDecodingBins[index] = voltage; +static int addMafPoint(persistent_config_s *p_config, int index, float kgHrValue, float voltage) { + p_config->mafDecoding[index] = kgHrValue; + p_config->mafDecodingBins[index] = voltage; return index + 1; } -static int addMafPointByVoltage(persistent_config_s *config, int index, float voltage, float kgHrValue) { - return addMafPoint(config, index, kgHrValue, voltage); +static int addMafPointByVoltage(persistent_config_s *p_config, int index, float voltage, float kgHrValue) { + return addMafPoint(p_config, index, kgHrValue, voltage); } static void fillTheRest(persistent_config_s *e, int i) { diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index b517f2e1e5..2994195c87 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -54,10 +54,10 @@ float getVoltage(const char *msg, adc_channel_e hwChannel) { } #if EFI_USE_FAST_ADC -AdcDevice::AdcDevice(ADCConversionGroup* hwConfig, adcsample_t *buf, size_t buf_len) { - this->hwConfig = hwConfig; - this->samples = buf; - this->buf_len = buf_len; +AdcDevice::AdcDevice(ADCConversionGroup* p_hwConfig, adcsample_t *p_buf, size_t p_buf_len) { + this->hwConfig = p_hwConfig; + this->samples = p_buf; + this->buf_len = p_buf_len; hwConfig->sqr1 = 0; hwConfig->sqr2 = 0; diff --git a/firmware/hw_layer/adc/ads1015.cpp b/firmware/hw_layer/adc/ads1015.cpp index 98dcf95f47..fb7d38a6ac 100644 --- a/firmware/hw_layer/adc/ads1015.cpp +++ b/firmware/hw_layer/adc/ads1015.cpp @@ -31,10 +31,10 @@ void Ads1015::readChannels(float (&result)[4]) { } } -float Ads1015::readChannel(uint8_t ch) { +float Ads1015::readChannel(uint8_t channel) { // set the channel // set to +-6.144v full scale, fastest sampling, manual conversion start - writeReg(ADS1015_CONFIG, 0xC1E0 | ch << 12); + writeReg(ADS1015_CONFIG, 0xC1E0 | channel << 12); // Wait for conversion to complete // Bit is cleared while conversion is ongoing, set when done diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 9dbe709e6e..58b368e0bc 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -89,8 +89,7 @@ void unlockSpi(spi_device_e device) { spiReleaseBus(getSpiDevice(device)); } -static void initSpiModules(engine_configuration_s *engineConfiguration) { - UNUSED(engineConfiguration); +static void initSpiModules() { if (engineConfiguration->is_enabled_spi_1) { turnOnSpi(SPI_DEVICE_1); } @@ -209,8 +208,7 @@ static void calcFastAdcIndexes() { #endif/* HAL_USE_ADC */ } -static void adcConfigListener(Engine *engine) { - UNUSED(engine); +static void adcConfigListener() { // todo: something is not right here - looks like should be a callback for each configuration change? calcFastAdcIndexes(); } @@ -359,7 +357,7 @@ void applyNewHardwareSettings() { startSent(); #endif - adcConfigListener(engine); + adcConfigListener(); } #if EFI_BOR_LEVEL @@ -508,7 +506,7 @@ void initHardware() { #endif // TRIGGER_SCOPE #if HAL_USE_SPI - initSpiModules(engineConfiguration); + initSpiModules(); #endif /* HAL_USE_SPI */ #if (EFI_PROD_CODE && BOARD_EXT_GPIOCHIPS > 0) || EFI_SIMULATOR