From 638f3675fd2fb9124b2cb75ddf7dd94711e13feb Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 3 Jan 2018 07:59:59 -0500 Subject: [PATCH] #530 --- .../engine_configuration_generated_structures.h | 8 +++++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 16 ++++++++++------ .../models/src/com/rusefi/config/Fields.java | 6 +++--- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 05c573096b8..c81003291dc 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jan 02 21:23:52 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1431,13 +1431,15 @@ typedef struct { */ uint32_t engineChartSize; /** + * Relative to the target idle RPM * offset 1492 */ int16_t idlePidRpmUpperLimit; /** + * Prime injection pulse falloff temperature threshold, in Celsuis * offset 1494 */ - int16_t unusedInt16; + int16_t primeInjFalloffTemperature; /** * A/C button input handled as analog input * offset 1496 @@ -2315,4 +2317,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jan 02 21:23:52 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index b7f24b245c6..44f77d397ce 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -972,8 +972,8 @@ #define engineChartSize_offset_hex 5d0 #define idlePidRpmUpperLimit_offset 1492 #define idlePidRpmUpperLimit_offset_hex 5d4 -#define unusedInt16_offset 1494 -#define unusedInt16_offset_hex 5d6 +#define primeInjFalloffTemperature_offset 1494 +#define primeInjFalloffTemperature_offset_hex 5d6 #define acSwitchAdc_offset 1496 #define acSwitchAdc_offset_hex 5d8 #define ignMathCalculateAtIndex_offset 1500 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index d3dd91e1531..7dfa62a25f3 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,7 +63,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jan 02 21:23:52 EST 2018 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 pageSize = 20000 page = 1 @@ -505,7 +505,7 @@ page = 1 unused_1484_bit_21 = bits, U32, 1484, [21:21], "false", "true" engineChartSize = scalar, U32, 1488, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1492, "RPM", 1, 0, 0, 9000, 0 -;skipping unusedInt16 offset 1494 + primeInjFalloffTemperature = scalar, S16, 1494, "*C", 1, 0, 0, 1000.0, 0 acSwitchAdc = bits, U32, 1496, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" ignMathCalculateAtIndex = scalar, S32, 1500, "index", 1, 0, 0, 7000, 0 ;skipping acCutoffLowRpm offset 1504 @@ -594,7 +594,7 @@ page = 1 throttlePedalWOTVoltage = scalar, F32, 2000, "voltage", 1, 0, -6, 6, 2 stepperDirectionPinMode = bits, U32, 2004, [0:1], "default", "default inverted", "open collector", "open collector inverted" startUpFuelPumpDuration = scalar, S16, 2008, "seconds", 1, 0, 0, 6000, 0 - idlePidRpmDeadZone = scalar, S16, 2010, "C", 1, 0, 0, 1000, 0 + idlePidRpmDeadZone = scalar, S16, 2010, "RPM", 1, 0, 0, 1000, 0 cltIdleRpmBins = array, F32, 2012, [16], "C", 1, 0, -100.0, 250.0, 2 cltIdleRpm = array, F32, 2076, [16], "RPM", 1, 0, 0.0, 8000.0, 0 targetVBatt = scalar, F32, 2140, "Volts", 1, 0, 0,30, 1 @@ -871,6 +871,7 @@ page = 1 twoWireBatchInjection = "This is needed if batched injection and individual injector wiring\nenable two_wire_batch_injection" useOnlyRisingEdgeForTrigger = "VR sensors are only precise on rising front\nenable trigger_only_front" twoWireBatchIgnition = "This is needed if batched igniton (waster spark) and individual coil wiring" + idlePidRpmUpperLimit = "Relative to the target idle RPM" ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" @@ -2323,6 +2324,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "Use separate Advance Table for idle", useSeparateAdvanceForIdle field = "Use separate VE Table for idle", useSeparateVeForIdle field = "Cranking Idle Air", crankingIACposition + field = "TPS deactivation threshold", idlePidDeactivationTpsThreshold ; field = "# Warmup Idle multipplier is apploed to target RPM" ; field = "Auto target", targetIdleRpm, { idleMode == 0} field = "idle P", idleRpmPid_pFactor, { idleMode == 0} @@ -2332,8 +2334,8 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "period", idleRpmPid_period field = "pid min", idleRpmPid_minValue, { idleMode == 0} field = "pid max", idleRpmPid_maxValue, { idleMode == 0} - field = "pid TPS deactivation", idlePidDeactivationTpsThreshold, { idleMode == 0} - field = "RPM error to deactivate IAC pid", iacRPMErrorThreshold, { idleMode == 0} + field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone, { idleMode == 0} + field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit, { idleMode == 0} field = "iacByTpsTaper", iacByTpsTaper; field = "verbose", isVerboseIAC slider = "Manual Idle Position", manIdlePosition, horizontal @@ -2504,6 +2506,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "!todo: move MAF channel to maf curve dialog" field = "MAF ADC input", mafAdcChannel field = "Baro ADC input", baroSensor_hwChannel + field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap field = "Analog divider", analogInputDividerCoefficient field = "Use BiQuad averaging", useBiQuadAnalogFiltering field = "Smoothing factor", slowAdcAlpha, {useBiQuadAnalogFiltering == 0} @@ -2625,7 +2628,8 @@ cmd_stop_engine = "w\x00\x99\x00\x00" panel = crankingFuel panel = crankingIgnition field = "Cranking Idle Air", crankingIACposition - field = "Priming fuel pulse", startOfCrankingPrimingPulse + field = "Priming fuel pulse at -40C degrees", startOfCrankingPrimingPulse + field = "Primimg fuel pulse falloff temperature", primeInjFalloffTemperature panel = postCrankingEnrichment field = "" field = "" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 6433bb6497c..1cbc64aaa21 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jan 02 21:23:52 EST 2018 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 03 07:47:04 EST 2018 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -655,7 +655,7 @@ public class Fields { public static final int unused_1484_bit_21_offset = 1484; public static final int engineChartSize_offset = 1488; public static final int idlePidRpmUpperLimit_offset = 1492; - public static final int unusedInt16_offset = 1494; + public static final int primeInjFalloffTemperature_offset = 1494; public static final int acSwitchAdc_offset = 1496; public static final int ignMathCalculateAtIndex_offset = 1500; public static final int acCutoffLowRpm_offset = 1504; @@ -1587,7 +1587,7 @@ public class Fields { public static final Field UNUSED_1484_BIT_21 = Field.create("UNUSED_1484_BIT_21", 1484, FieldType.BIT, 21); public static final Field ENGINECHARTSIZE = Field.create("ENGINECHARTSIZE", 1488, FieldType.INT); public static final Field IDLEPIDRPMUPPERLIMIT = Field.create("IDLEPIDRPMUPPERLIMIT", 1492, FieldType.INT); - public static final Field UNUSEDINT16 = Field.create("UNUSEDINT16", 1494, FieldType.INT); + public static final Field PRIMEINJFALLOFFTEMPERATURE = Field.create("PRIMEINJFALLOFFTEMPERATURE", 1494, FieldType.INT); public static final Field ACSWITCHADC = Field.create("ACSWITCHADC", 1496, FieldType.INT, adc_channel_e); public static final Field IGNMATHCALCULATEATINDEX = Field.create("IGNMATHCALCULATEATINDEX", 1500, FieldType.INT); public static final Field ACCUTOFFLOWRPM = Field.create("ACCUTOFFLOWRPM", 1504, FieldType.INT);