diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 882d0aafd7..4fda1cda8c 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -136,13 +136,14 @@ custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, custom angle_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2 struct pid_s +! explicitly document which use-cases need 10e-7 parameters float pFactor;;"", 1, 0, -10000, 10000, 7 float iFactor;;"", 1, 0, -10000, 10000, 7 float dFactor;;"", 1, 0, -10000, 10000, 7 int16_t offset;Linear addition to PID logic;"", 1, 0, 0, 1000, 0 int16_t period;PID dTime;"ms", 1, 0, 0, 3000, 0 - int16_t minValue;;"", 1, 0, 0, 3000.0, 3 - int16_t maxValue;;"", 1, 0, 0, 3000.0, 3 + int16_t minValue;;"", 1, 0, -3000, 3000.0, 3 + int16_t maxValue;;"", 1, 0, -3000, 3000.0, 3 end_struct struct cranking_parameters_s diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index e1fadf7c11..05a9fb9e3d 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 Sat Mar 24 23:48:37 EDT 2018 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Mar 25 09:12:10 EDT 2018 pageSize = 20000 page = 1 @@ -555,22 +555,22 @@ page = 1 alternatorControl_dFactor = scalar, F32, 1820, "", 1, 0, -10000, 10000, 7 alternatorControl_offset = scalar, S16, 1824, "", 1, 0, 0, 1000, 0 alternatorControl_period = scalar, S16, 1826, "ms", 1, 0, 0, 3000, 0 - alternatorControl_minValue = scalar, S16, 1828, "", 1, 0, 0, 3000.0, 3 - alternatorControl_maxValue = scalar, S16, 1830, "", 1, 0, 0, 3000.0, 3 + alternatorControl_minValue = scalar, S16, 1828, "", 1, 0, -3000, 3000.0, 3 + alternatorControl_maxValue = scalar, S16, 1830, "", 1, 0, -3000, 3000.0, 3 etb_pFactor = scalar, F32, 1832, "", 1, 0, -10000, 10000, 7 etb_iFactor = scalar, F32, 1836, "", 1, 0, -10000, 10000, 7 etb_dFactor = scalar, F32, 1840, "", 1, 0, -10000, 10000, 7 etb_offset = scalar, S16, 1844, "", 1, 0, 0, 1000, 0 etb_period = scalar, S16, 1846, "ms", 1, 0, 0, 3000, 0 - etb_minValue = scalar, S16, 1848, "", 1, 0, 0, 3000.0, 3 - etb_maxValue = scalar, S16, 1850, "", 1, 0, 0, 3000.0, 3 + etb_minValue = scalar, S16, 1848, "", 1, 0, -3000, 3000.0, 3 + etb_maxValue = scalar, S16, 1850, "", 1, 0, -3000, 3000.0, 3 warmupAfrPid_pFactor = scalar, F32, 1852, "", 1, 0, -10000, 10000, 7 warmupAfrPid_iFactor = scalar, F32, 1856, "", 1, 0, -10000, 10000, 7 warmupAfrPid_dFactor = scalar, F32, 1860, "", 1, 0, -10000, 10000, 7 warmupAfrPid_offset = scalar, S16, 1864, "", 1, 0, 0, 1000, 0 warmupAfrPid_period = scalar, S16, 1866, "ms", 1, 0, 0, 3000, 0 - warmupAfrPid_minValue = scalar, S16, 1868, "", 1, 0, 0, 3000.0, 3 - warmupAfrPid_maxValue = scalar, S16, 1870, "", 1, 0, 0, 3000.0, 3 + warmupAfrPid_minValue = scalar, S16, 1868, "", 1, 0, -3000, 3000.0, 3 + warmupAfrPid_maxValue = scalar, S16, 1870, "", 1, 0, -3000, 3000.0, 3 mapErrorDetectionTooLow = scalar, F32, 1872, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1876, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1880, "rpm", 1, 0, 0, 3000.0, 2 @@ -579,8 +579,8 @@ page = 1 idleRpmPid_dFactor = scalar, F32, 1892, "", 1, 0, -10000, 10000, 7 idleRpmPid_offset = scalar, S16, 1896, "", 1, 0, 0, 1000, 0 idleRpmPid_period = scalar, S16, 1898, "ms", 1, 0, 0, 3000, 0 - idleRpmPid_minValue = scalar, S16, 1900, "", 1, 0, 0, 3000.0, 3 - idleRpmPid_maxValue = scalar, S16, 1902, "", 1, 0, 0, 3000.0, 3 + idleRpmPid_minValue = scalar, S16, 1900, "", 1, 0, -3000, 3000.0, 3 + idleRpmPid_maxValue = scalar, S16, 1902, "", 1, 0, -3000, 3000.0, 3 addedToWallCoef = scalar, F32, 1904, "%", 1, 0, 0.0, 300.0, 2 communicationPin = bits, U32, 1908, [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" runningPin = bits, U32, 1912, [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" @@ -697,8 +697,8 @@ page = 1 fuelClosedLoopPid_dFactor = scalar, F32, 2700, "", 1, 0, -10000, 10000, 7 fuelClosedLoopPid_offset = scalar, S16, 2704, "", 1, 0, 0, 1000, 0 fuelClosedLoopPid_period = scalar, S16, 2706, "ms", 1, 0, 0, 3000, 0 - fuelClosedLoopPid_minValue = scalar, S16, 2708, "", 1, 0, 0, 3000.0, 3 - fuelClosedLoopPid_maxValue = scalar, S16, 2710, "", 1, 0, 0, 3000.0, 3 + fuelClosedLoopPid_minValue = scalar, S16, 2708, "", 1, 0, -3000, 3000.0, 3 + fuelClosedLoopPid_maxValue = scalar, S16, 2710, "", 1, 0, -3000, 3000.0, 3 fuelClosedLoopAfrHighThreshold = scalar, F32, 2712, "ratio", 1, 0, 0, 100, 1 stepperEnablePinMode = bits, U32, 2716, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "PULLUP", "mode33", "mode34", "mode35" cj125ua = bits, U32, 2720, [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" @@ -730,29 +730,29 @@ page = 1 auxPid1_dFactor = scalar, F32, 2824, "", 1, 0, -10000, 10000, 7 auxPid1_offset = scalar, S16, 2828, "", 1, 0, 0, 1000, 0 auxPid1_period = scalar, S16, 2830, "ms", 1, 0, 0, 3000, 0 - auxPid1_minValue = scalar, S16, 2832, "", 1, 0, 0, 3000.0, 3 - auxPid1_maxValue = scalar, S16, 2834, "", 1, 0, 0, 3000.0, 3 + auxPid1_minValue = scalar, S16, 2832, "", 1, 0, -3000, 3000.0, 3 + auxPid1_maxValue = scalar, S16, 2834, "", 1, 0, -3000, 3000.0, 3 auxPid2_pFactor = scalar, F32, 2836, "", 1, 0, -10000, 10000, 7 auxPid2_iFactor = scalar, F32, 2840, "", 1, 0, -10000, 10000, 7 auxPid2_dFactor = scalar, F32, 2844, "", 1, 0, -10000, 10000, 7 auxPid2_offset = scalar, S16, 2848, "", 1, 0, 0, 1000, 0 auxPid2_period = scalar, S16, 2850, "ms", 1, 0, 0, 3000, 0 - auxPid2_minValue = scalar, S16, 2852, "", 1, 0, 0, 3000.0, 3 - auxPid2_maxValue = scalar, S16, 2854, "", 1, 0, 0, 3000.0, 3 + auxPid2_minValue = scalar, S16, 2852, "", 1, 0, -3000, 3000.0, 3 + auxPid2_maxValue = scalar, S16, 2854, "", 1, 0, -3000, 3000.0, 3 auxPid3_pFactor = scalar, F32, 2856, "", 1, 0, -10000, 10000, 7 auxPid3_iFactor = scalar, F32, 2860, "", 1, 0, -10000, 10000, 7 auxPid3_dFactor = scalar, F32, 2864, "", 1, 0, -10000, 10000, 7 auxPid3_offset = scalar, S16, 2868, "", 1, 0, 0, 1000, 0 auxPid3_period = scalar, S16, 2870, "ms", 1, 0, 0, 3000, 0 - auxPid3_minValue = scalar, S16, 2872, "", 1, 0, 0, 3000.0, 3 - auxPid3_maxValue = scalar, S16, 2874, "", 1, 0, 0, 3000.0, 3 + auxPid3_minValue = scalar, S16, 2872, "", 1, 0, -3000, 3000.0, 3 + auxPid3_maxValue = scalar, S16, 2874, "", 1, 0, -3000, 3000.0, 3 auxPid4_pFactor = scalar, F32, 2876, "", 1, 0, -10000, 10000, 7 auxPid4_iFactor = scalar, F32, 2880, "", 1, 0, -10000, 10000, 7 auxPid4_dFactor = scalar, F32, 2884, "", 1, 0, -10000, 10000, 7 auxPid4_offset = scalar, S16, 2888, "", 1, 0, 0, 1000, 0 auxPid4_period = scalar, S16, 2890, "ms", 1, 0, 0, 3000, 0 - auxPid4_minValue = scalar, S16, 2892, "", 1, 0, 0, 3000.0, 3 - auxPid4_maxValue = scalar, S16, 2894, "", 1, 0, 0, 3000.0, 3 + auxPid4_minValue = scalar, S16, 2892, "", 1, 0, -3000, 3000.0, 3 + auxPid4_maxValue = scalar, S16, 2894, "", 1, 0, -3000, 3000.0, 3 oilPressure_hwChannel = bits, U32, 2896, [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" oilPressure_v1 = scalar, F32, 2900, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value1 = scalar, F32, 2904, "kPa", 1, 0.0, 0, 1000.0, 2