diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index bcf297be3e..30abe13e1c 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -238,6 +238,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // boardConfiguration->useWarmupPidAfr = true; engineConfiguration->warmupAfrPid.pFactor = -0.2; engineConfiguration->warmupAfrPid.dFactor = -0.02; + engineConfiguration->debugMode = WARMUP_ENRICH; // set_global_trigger_offset_angle 38 engineConfiguration->globalTriggerAngleOffset = 38; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 62b37a8eb7..176961b408 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -70,9 +70,9 @@ custom baro_corr_table_t 64 array, F32, @OFFSET@, [@@BARO_CORR_SIZE@@x@@BARO custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2 struct pid_s - float pFactor;;"value", 1, 0, 0, 1000, 3 - float iFactor;;"value", 1, 0, 0, 1000, 3 - float dFactor;;"value", 1, 0, 0, 1000, 3 + float pFactor;;"value", 1, 0, 0, 1000, 5 + float iFactor;;"value", 1, 0, 0, 1000, 5 + float dFactor;;"value", 1, 0, 0, 1000, 5 float offset;Linear addition to PID logic;"value", 1, 0, 0, 1000, 3 end_struct diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 076aa744a6..c298d5f2ca 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,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 Sun Feb 07 21:17:35 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 08 20:43:48 EST 2016 pageSize = 16088 page = 1 @@ -480,9 +480,9 @@ page = 1 mapErrorDetectionTooLow = scalar, F32, 1888, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1892, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1896, "rpm", 1, 0, 0, 3000.0, 2 - idleRpmPid_pFactor = scalar, F32, 1900, "value", 1, 0, 0, 1000, 3 - idleRpmPid_iFactor = scalar, F32, 1904, "value", 1, 0, 0, 1000, 3 - idleRpmPid_dFactor = scalar, F32, 1908, "value", 1, 0, 0, 1000, 3 + idleRpmPid_pFactor = scalar, F32, 1900, "value", 1, 0, 0, 1000, 5 + idleRpmPid_iFactor = scalar, F32, 1904, "value", 1, 0, 0, 1000, 5 + idleRpmPid_dFactor = scalar, F32, 1908, "value", 1, 0, 0, 1000, 5 idleRpmPid_offset = scalar, F32, 1912, "value", 1, 0, 0, 1000, 3 ;skipping idleDT offset 1916 ;skipping idleControl offset 1920 @@ -494,18 +494,18 @@ page = 1 consoleSerialRxPin = bits, U32, 1944, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" knockNoise = array, F32, 1948, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1980, [8], "RPM", 1, 0, 0.0, 18000, 2 - etb_pFactor = scalar, F32, 2012, "value", 1, 0, 0, 1000, 3 - etb_iFactor = scalar, F32, 2016, "value", 1, 0, 0, 1000, 3 - etb_dFactor = scalar, F32, 2020, "value", 1, 0, 0, 1000, 3 + etb_pFactor = scalar, F32, 2012, "value", 1, 0, 0, 1000, 5 + etb_iFactor = scalar, F32, 2016, "value", 1, 0, 0, 1000, 5 + etb_dFactor = scalar, F32, 2020, "value", 1, 0, 0, 1000, 5 etb_offset = scalar, F32, 2024, "value", 1, 0, 0, 1000, 3 cltIdleRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2 cltIdleRpm = array, F32, 2092, [16], "RPM", 1, 0, 0.0, 400.0, 0 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2 alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0 - alternatorControl_pFactor = scalar, F32, 2168, "value", 1, 0, 0, 1000, 3 - alternatorControl_iFactor = scalar, F32, 2172, "value", 1, 0, 0, 1000, 3 - alternatorControl_dFactor = scalar, F32, 2176, "value", 1, 0, 0, 1000, 3 + alternatorControl_pFactor = scalar, F32, 2168, "value", 1, 0, 0, 1000, 5 + alternatorControl_iFactor = scalar, F32, 2172, "value", 1, 0, 0, 1000, 5 + alternatorControl_dFactor = scalar, F32, 2176, "value", 1, 0, 0, 1000, 5 alternatorControl_offset = scalar, F32, 2180, "value", 1, 0, 0, 1000, 3 tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 @@ -523,9 +523,9 @@ page = 1 tpsDecelEnleanmentMultiplier = scalar, F32, 2236, "coeff", 1, 0, 0, 200, 3 slowAdcAlpha = scalar, F32, 2240, "coeff", 1, 0, 0, 200, 3 debugMode = bits, U32, 2244, [0:1], "ALTERNATOR", "TPS_ACCEL", "WARMUP_PID", "mode3" - warmupAfrPid_pFactor = scalar, F32, 2248, "value", 1, 0, 0, 1000, 3 - warmupAfrPid_iFactor = scalar, F32, 2252, "value", 1, 0, 0, 1000, 3 - warmupAfrPid_dFactor = scalar, F32, 2256, "value", 1, 0, 0, 1000, 3 + warmupAfrPid_pFactor = scalar, F32, 2248, "value", 1, 0, 0, 1000, 5 + warmupAfrPid_iFactor = scalar, F32, 2252, "value", 1, 0, 0, 1000, 5 + warmupAfrPid_dFactor = scalar, F32, 2256, "value", 1, 0, 0, 1000, 5 warmupAfrPid_offset = scalar, F32, 2260, "value", 1, 0, 0, 1000, 3 ;skipping unused offset 2264 le_formulas1 = array, U08, 3016, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -954,11 +954,11 @@ fileVersion = { 20160122 } curIdlePositionGauge = curIdlePosition, "idle position", "%", 0, 100, 0, 0, 100, 100, 0, 0 - debugFloatField1Gauge = debugFloatField1, "debug f1", "%", 0, 100, 0, 0, 100, 100, 0, 0 - debugFloatField2Gauge = debugFloatField2, "debug f2", "%", 0, 100, 0, 0, 100, 100, 0, 0 - debugFloatField3Gauge = debugFloatField3, "debug f3", "%", 0, 100, 0, 0, 100, 100, 0, 0 - debugFloatField4Gauge = debugFloatField4, "debug f4", "%", 0, 100, 0, 0, 100, 100, 0, 0 - debugFloatField5Gauge = debugFloatField5, "debug f5", "%", 0, 100, 0, 0, 100, 100, 0, 0 + debugFloatField1Gauge = debugFloatField1, "debug f1", "%", 0, 100, 0, 0, 100, 100, 4, 4 + debugFloatField2Gauge = debugFloatField2, "debug f2", "%", 0, 100, 0, 0, 100, 100, 4, 4 + debugFloatField3Gauge = debugFloatField3, "debug f3", "%", 0, 100, 0, 0, 100, 100, 4, 4 + debugFloatField4Gauge = debugFloatField4, "debug f4", "%", 0, 100, 0, 0, 100, 100, 4, 4 + debugFloatField5Gauge = debugFloatField5, "debug f5", "%", 0, 100, 0, 0, 100, 100, 4, 4 debugIntField1Gauge = debugIntField1, "debug i1", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField2Gauge = debugIntField2, "debug i2", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0