diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 713dd15708..fcec9e60fc 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -463,43 +463,35 @@ typedef struct { * offset 932 */ injection_mode_e injectionMode; - - /** - * Inside rusEfi all the angles are handled in relation to the trigger synchronization event - * which depends on the trigger shape and has nothing to do wit Top Dead Center (TDC) - * - * For engine configuration humans need angles from TDC. - * * This field is the angle between Top Dead Center (TDC) and the first trigger event. * Knowing this angle allows us to control timing and other angles in reference to TDC. - */ + * offset 936 + */ float globalTriggerAngleOffset; /** - * We have 3.3V ADC and most of the analog input signals are 5V, this forces us to use - * voltage dividers on the input circuits. This parameter holds the coefficient of these dividers. - * see also vbattDividerCoeff - */ + * This parameter holds the coefficient of input voltage dividers + * offset 940 + */ float analogInputDividerCoefficient; - /** * This setting controls which algorithm is used for ENGINE LOAD - */ + * offset 944 + */ engine_load_mode_e algorithm; - /** - * see - */ + * offset 948 + */ float vbattDividerCoeff; /** * Cooling fan turn-on temperature threshold, in Celsuis * offset 952 - */ + */ float fanOnTemperature; /** * Cooling fan turn-off temperature threshold, in Celsuis * offset 956 - */ + */ float fanOffTemperature; // offset 960 diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini index 09113ca926..ecba347c39 100644 --- a/firmware/rusefi_config.ini +++ b/firmware/rusefi_config.ini @@ -142,9 +142,17 @@ float displacement;Engine displacement, in liters\nsee also cylindersCount;"L", injection_mode_e crankingInjectionMode; injection_mode_e injectionMode; -float globalTriggerAngleOffset; +float globalTriggerAngleOffset;This field is the angle between Top Dead Center (TDC) and the first trigger event.\nKnowing this angle allows us to control timing and other angles in reference to TDC.;"deg", 1, 0, 0, 720, 0 +float analogInputDividerCoefficient;This parameter holds the coefficient of input voltage dividers;"coef", 1, 0, 0.01, 10.0, 2 -bits analog_chart_e S32 [0:1], "none", "trigger", "MAP", "INVALID" -analog_chart_e analogChartMode; +bits engine_load_mode_e U32 [0:1], "MAF", "Alpha-N", "MAP", "SPEED DENSITY" +engine_load_mode_e algorithm;This setting controls which algorithm is used for ENGINE LOAD +float vbattDividerCoeff;;"coef", 1, 0, 0.01, 20.0, 2 +float fanOnTemperature;Cooling fan turn-on temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2 +float fanOffTemperature;Cooling fan turn-off temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2 + + +!bits analog_chart_e S32 [0:1], "none", "trigger", "MAP", "INVALID" +!analog_chart_e analogChartMode; end_struct \ No newline at end of file diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6ad31ea97c..0faf6979e1 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -100,13 +100,14 @@ enable2ndByteCanID = false rpmHardLimit = scalar, S32, 924, "rpm", 1, 0, 0, 10000.0, 2 ;skipping crankingInjectionMode offset 928 ;skipping injectionMode offset 932 + globalTriggerAngleOffset = scalar, F32, 936, "deg", 1, 0, 0, 720, 0 + analogInputDividerCoefficient = scalar, F32, 940, "coef", 1, 0, 0.01, 10.0, 2 + algorithm = bits, U32, 944, [0:1], "MAF", "Alpha-N", "MAP", "SPEED DENSITY" + vbattDividerCoeff = scalar, F32, 948, "coef", 1, 0, 0.01, 20.0, 2 + fanOnTemperature = scalar, F32, 952, "*C", 1, 0, 0, 1000.0, 2 + fanOffTemperature = scalar, F32, 956, "*C", 1, 0, 0, 1000.0, 2 + - globalTriggerOffsetAngle = scalar, F32, 936, "deg", 1, 0, 0, 720, 0 ; size 4 - analogInputDividerCoefficient=scalar, F32, 940, "coef", 1, 0, 0.01, 10.0, 2 ; size 4 - fuelAlgorithm = bits, U32, 944, [0:1], "MAF", "Alpha-N", "MAP", "SPEED DENSITY" - VBattDividerCoefficient = scalar, F32, 948, "coef", 1, 0, 0.01, 20.0, 2 ; size 4 - FanONTemperature = scalar, F32, 952, "°C", 1, 0, 0, 1000.0, 2 ; size 4 - FanOffTemperature = scalar, F32, 956, "°C", 1, 0, 0, 1000.0, 2 ; size 4 ; canNbcType = bits, U32, 968, [0:1], "BMW", "FIAT", "VAG" , "INVALID" canSleepPeriod = scalar, F32, 972, "RPM", 1, 0, 0, 1000.0, 2 ; size 4 nCylinders = bits, U32, 976, [0:3], "INVALID", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "INVALID", "INVALID", "INVALID"