From 40145ab09cdc6e8352a1beed58300359d4a7bf59 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 22 Feb 2020 13:04:19 -0500 Subject: [PATCH] minor progress --- firmware/config/boards/clean_env_variables.bat | 2 +- firmware/controllers/engine_controller.cpp | 2 +- firmware/controllers/settings.cpp | 18 +++--------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/firmware/config/boards/clean_env_variables.bat b/firmware/config/boards/clean_env_variables.bat index d0dba99e47..7148b891c1 100644 --- a/firmware/config/boards/clean_env_variables.bat +++ b/firmware/config/boards/clean_env_variables.bat @@ -1,4 +1,4 @@ - +@echo off echo clean_env_variables.bat: Cleaning up so that no one inherits any of these values set DEBUG_LEVEL_OPT= set EXTRA_PARAMS= diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 9b27499697..9becb4ec95 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -843,6 +843,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 201200216; + return 201200222; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 6ee9e8c282..bb860edfe2 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -587,10 +587,6 @@ static void setGlobalFuelCorrection(float value) { engineConfiguration->globalFuelCorrection = value; } -static void setCltBias(float value) { - engineConfiguration->clt.config.bias_resistor = value; -} - static void setFanSetting(float onTempC, float offTempC) { if (onTempC <= offTempC) { scheduleMsg(&logger, "ON temp [%.2f] should be above OFF temp [%.2f]", onTempC, offTempC); @@ -600,14 +596,6 @@ static void setFanSetting(float onTempC, float offTempC) { engineConfiguration->fanOffTemperature = offTempC; } -static void setIatBias(float value) { - engineConfiguration->iat.config.bias_resistor = value; -} - -static void setVBattDivider(float value) { - engineConfiguration->vbattDividerCoeff = value; -} - static void setWholeTimingMap(float value) { // todo: table helper? scheduleMsg(&logger, "Setting whole timing map to %.2f", value); @@ -1095,6 +1083,9 @@ const plain_get_float_s getF_plain[] = { {"injection_offset", &engineConfiguration->extraInjectionOffset}, {"global_trigger_offset_angle", &engineConfiguration->globalTriggerAngleOffset}, {"global_fuel_correction", &engineConfiguration->globalFuelCorrection}, + {"vbatt_divider", &engineConfiguration->vbattDividerCoeff}, + {"clt_bias", &engineConfiguration->clt.config.bias_resistor}, + {"iat_bias", &engineConfiguration->iat.config.bias_resistor}, {"cranking_fuel", &engineConfiguration->cranking.baseFuel}, {"cranking_timing_angle", &engineConfiguration->crankingTimingAngle}, {"cranking_charge_angle", &engineConfiguration->crankingChargeAngle}, @@ -1199,9 +1190,6 @@ const command_f_s commandsF[] = { {"cranking_iac", setCrankingIACExtra}, {"cranking_timing_angle", setCrankingTimingAngle}, {"cranking_charge_angle", setCrankingChargeAngle}, - {"vbatt_divider", setVBattDivider}, - {"clt_bias", setCltBias}, - {"iat_bias", setIatBias}, {"tps_accel_threshold", setTpsAccelThr}, {"tps_decel_threshold", setTpsDecelThr}, {"tps_decel_multiplier", setTpsDecelMult},