From 2f9623555c898a1a6014129e512b67ade577f2ba Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 4 Jun 2017 13:07:22 -0400 Subject: [PATCH] ETB --- firmware/integration/rusefi_config.txt | 4 +- firmware/tunerstudio/rusefi.ini | 65 +++++++++++++------------- firmware/tunerstudio/rusefi.input | 27 +++++------ 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9c54a62bc0..7b25b6750f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -107,8 +107,8 @@ struct pid_s float dFactor;;"value", 1, 0, -1000, 1000, 5 int16_t offset;Linear addition to PID logic;"value", 1, 0, 0, 1000, 0 int16_t period;PID dTime;"ms", 1, 0, 0, 3000, 0 - int16_t minValue;;"v", 1, 0, 0, 3000.0, 3 - int16_t maxValue;;"v", 1, 0, 0, 3000.0, 3 + int16_t minValue;;"", 1, 0, 0, 3000.0, 3 + int16_t maxValue;;"", 1, 0, 0, 3000.0, 3 end_struct struct cranking_parameters_s diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 99ef785d24..a68ada366c 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,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 Mon May 29 22:21:18 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 04 13:06:50 EDT 2017 pageSize = 16376 page = 1 @@ -514,22 +514,22 @@ page = 1 alternatorControl_dFactor = scalar, F32, 1836, "value", 1, 0, -1000, 1000, 5 alternatorControl_offset = scalar, S16, 1840, "value", 1, 0, 0, 1000, 0 alternatorControl_period = scalar, S16, 1842, "ms", 1, 0, 0, 3000, 0 - alternatorControl_minValue = scalar, S16, 1844, "v", 1, 0, 0, 3000.0, 3 - alternatorControl_maxValue = scalar, S16, 1846, "v", 1, 0, 0, 3000.0, 3 + alternatorControl_minValue = scalar, S16, 1844, "", 1, 0, 0, 3000.0, 3 + alternatorControl_maxValue = scalar, S16, 1846, "", 1, 0, 0, 3000.0, 3 etb_pFactor = scalar, F32, 1848, "value", 1, 0, -1000, 1000, 5 etb_iFactor = scalar, F32, 1852, "value", 1, 0, -1000, 1000, 5 etb_dFactor = scalar, F32, 1856, "value", 1, 0, -1000, 1000, 5 etb_offset = scalar, S16, 1860, "value", 1, 0, 0, 1000, 0 etb_period = scalar, S16, 1862, "ms", 1, 0, 0, 3000, 0 - etb_minValue = scalar, S16, 1864, "v", 1, 0, 0, 3000.0, 3 - etb_maxValue = scalar, S16, 1866, "v", 1, 0, 0, 3000.0, 3 + etb_minValue = scalar, S16, 1864, "", 1, 0, 0, 3000.0, 3 + etb_maxValue = scalar, S16, 1866, "", 1, 0, 0, 3000.0, 3 warmupAfrPid_pFactor = scalar, F32, 1868, "value", 1, 0, -1000, 1000, 5 warmupAfrPid_iFactor = scalar, F32, 1872, "value", 1, 0, -1000, 1000, 5 warmupAfrPid_dFactor = scalar, F32, 1876, "value", 1, 0, -1000, 1000, 5 warmupAfrPid_offset = scalar, S16, 1880, "value", 1, 0, 0, 1000, 0 warmupAfrPid_period = scalar, S16, 1882, "ms", 1, 0, 0, 3000, 0 - warmupAfrPid_minValue = scalar, S16, 1884, "v", 1, 0, 0, 3000.0, 3 - warmupAfrPid_maxValue = scalar, S16, 1886, "v", 1, 0, 0, 3000.0, 3 + warmupAfrPid_minValue = scalar, S16, 1884, "", 1, 0, 0, 3000.0, 3 + warmupAfrPid_maxValue = scalar, S16, 1886, "", 1, 0, 0, 3000.0, 3 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 @@ -538,8 +538,8 @@ page = 1 idleRpmPid_dFactor = scalar, F32, 1908, "value", 1, 0, -1000, 1000, 5 idleRpmPid_offset = scalar, S16, 1912, "value", 1, 0, 0, 1000, 0 idleRpmPid_period = scalar, S16, 1914, "ms", 1, 0, 0, 3000, 0 - idleRpmPid_minValue = scalar, S16, 1916, "v", 1, 0, 0, 3000.0, 3 - idleRpmPid_maxValue = scalar, S16, 1918, "v", 1, 0, 0, 3000.0, 3 + idleRpmPid_minValue = scalar, S16, 1916, "", 1, 0, 0, 3000.0, 3 + idleRpmPid_maxValue = scalar, S16, 1918, "", 1, 0, 0, 3000.0, 3 addedToWallCoef = scalar, F32, 1920, "%", 1, 0, 0.0, 300.0, 2 communicationPin = bits, U32, 1924, [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, 1928, [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" @@ -650,8 +650,8 @@ page = 1 fuelClosedLoopPid_dFactor = scalar, F32, 2748, "value", 1, 0, -1000, 1000, 5 fuelClosedLoopPid_offset = scalar, S16, 2752, "value", 1, 0, 0, 1000, 0 fuelClosedLoopPid_period = scalar, S16, 2754, "ms", 1, 0, 0, 3000, 0 - fuelClosedLoopPid_minValue = scalar, S16, 2756, "v", 1, 0, 0, 3000.0, 3 - fuelClosedLoopPid_maxValue = scalar, S16, 2758, "v", 1, 0, 0, 3000.0, 3 + fuelClosedLoopPid_minValue = scalar, S16, 2756, "", 1, 0, 0, 3000.0, 3 + fuelClosedLoopPid_maxValue = scalar, S16, 2758, "", 1, 0, 0, 3000.0, 3 fuelClosedLoopAfrHighThreshold = scalar, F32, 2760, "ratio", 1, 0, 0, 100, 1 stepperEnablePinMode = bits, U32, 2764, [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, 2768, [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" @@ -683,29 +683,29 @@ page = 1 auxPid1_dFactor = scalar, F32, 2872, "value", 1, 0, -1000, 1000, 5 auxPid1_offset = scalar, S16, 2876, "value", 1, 0, 0, 1000, 0 auxPid1_period = scalar, S16, 2878, "ms", 1, 0, 0, 3000, 0 - auxPid1_minValue = scalar, S16, 2880, "v", 1, 0, 0, 3000.0, 3 - auxPid1_maxValue = scalar, S16, 2882, "v", 1, 0, 0, 3000.0, 3 + auxPid1_minValue = scalar, S16, 2880, "", 1, 0, 0, 3000.0, 3 + auxPid1_maxValue = scalar, S16, 2882, "", 1, 0, 0, 3000.0, 3 auxPid2_pFactor = scalar, F32, 2884, "value", 1, 0, -1000, 1000, 5 auxPid2_iFactor = scalar, F32, 2888, "value", 1, 0, -1000, 1000, 5 auxPid2_dFactor = scalar, F32, 2892, "value", 1, 0, -1000, 1000, 5 auxPid2_offset = scalar, S16, 2896, "value", 1, 0, 0, 1000, 0 auxPid2_period = scalar, S16, 2898, "ms", 1, 0, 0, 3000, 0 - auxPid2_minValue = scalar, S16, 2900, "v", 1, 0, 0, 3000.0, 3 - auxPid2_maxValue = scalar, S16, 2902, "v", 1, 0, 0, 3000.0, 3 + auxPid2_minValue = scalar, S16, 2900, "", 1, 0, 0, 3000.0, 3 + auxPid2_maxValue = scalar, S16, 2902, "", 1, 0, 0, 3000.0, 3 auxPid3_pFactor = scalar, F32, 2904, "value", 1, 0, -1000, 1000, 5 auxPid3_iFactor = scalar, F32, 2908, "value", 1, 0, -1000, 1000, 5 auxPid3_dFactor = scalar, F32, 2912, "value", 1, 0, -1000, 1000, 5 auxPid3_offset = scalar, S16, 2916, "value", 1, 0, 0, 1000, 0 auxPid3_period = scalar, S16, 2918, "ms", 1, 0, 0, 3000, 0 - auxPid3_minValue = scalar, S16, 2920, "v", 1, 0, 0, 3000.0, 3 - auxPid3_maxValue = scalar, S16, 2922, "v", 1, 0, 0, 3000.0, 3 + auxPid3_minValue = scalar, S16, 2920, "", 1, 0, 0, 3000.0, 3 + auxPid3_maxValue = scalar, S16, 2922, "", 1, 0, 0, 3000.0, 3 auxPid4_pFactor = scalar, F32, 2924, "value", 1, 0, -1000, 1000, 5 auxPid4_iFactor = scalar, F32, 2928, "value", 1, 0, -1000, 1000, 5 auxPid4_dFactor = scalar, F32, 2932, "value", 1, 0, -1000, 1000, 5 auxPid4_offset = scalar, S16, 2936, "value", 1, 0, 0, 1000, 0 auxPid4_period = scalar, S16, 2938, "ms", 1, 0, 0, 3000, 0 - auxPid4_minValue = scalar, S16, 2940, "v", 1, 0, 0, 3000.0, 3 - auxPid4_maxValue = scalar, S16, 2942, "v", 1, 0, 0, 3000.0, 3 + auxPid4_minValue = scalar, S16, 2940, "", 1, 0, 0, 3000.0, 3 + auxPid4_maxValue = scalar, S16, 2942, "", 1, 0, 0, 3000.0, 3 ;skipping unusedEnd offset 2944 le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -1242,7 +1242,7 @@ fileVersion = { 20161225 } massAirFlowValueGa = massAirFlowValue,"Air Flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 - pedalPositionGauge = pedalPosition,"Pedal Position", "%", 0, 120, 10, 10, 100, 100, 1, 1 + pedalPositionGauge = pedalPosition,"Throttle Pedal Position", "%", 0, 120, 10, 10, 100, 100, 1, 1 knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1 knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2 @@ -1775,7 +1775,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "AFR ADC input", afr_hwChannel field = "fuelLevelSensor", fuelLevelSensor field = "Baro ADC input", baroSensor_hwChannel - field = "pedal Position Channel", pedalPositionChannel + field = "Throttle pedal Position Channel", pedalPositionChannel field = "Primary input channel", triggerInputPins1 field = "Secondary channel", triggerInputPins2 field = "Cam Sync/VVT input", camInput @@ -2392,17 +2392,18 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "verbose", isVerboseETB field = "Throttle Pedal Up", throttlePedalUpVoltage field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage - field = "PWM Frequency", etbFreq - field = "Dir #1", etbDirectionPin1 - field = "Dir #2", etbDirectionPin2 - field = "Control #1", etbControlPin1 - field = "Control #2", etbControlPin2 - field = "pFactor", etb_pFactor - field = "iFactor", etb_iFactor - field = "dFactor", etb_dFactor - field = "offset", etb_offset - field = "pid min", etb_minValue - field = "pid max", etb_maxValue + field = "PWM Frequency", etbFreq, {pedalPositionChannel != 16} + field = "Dir #1", etbDirectionPin1, {pedalPositionChannel != 16} + field = "Dir #2", etbDirectionPin2, {pedalPositionChannel != 16} + field = "Control #1", etbControlPin1, {pedalPositionChannel != 16} + field = "Control #2", etbControlPin2, {pedalPositionChannel != 16} + field = "pFactor", etb_pFactor, {pedalPositionChannel != 16} + field = "iFactor", etb_iFactor, {pedalPositionChannel != 16} + field = "dFactor", etb_dFactor, {pedalPositionChannel != 16} + field = "offset", etb_offset, {pedalPositionChannel != 16} + field = "control period", etb_period, {pedalPositionChannel != 16} + field = "pid min", etb_minValue, {pedalPositionChannel != 16} + field = "pid max", etb_maxValue, {pedalPositionChannel != 16} dialog = testSpark, "Spark" commandButton = "Spark #1", cmd_test_spk1 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 601dad2598..3aa1431771 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -478,7 +478,7 @@ fileVersion = { 20161225 } massAirFlowValueGa = massAirFlowValue,"Air Flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 - pedalPositionGauge = pedalPosition,"Pedal Position", "%", 0, 120, 10, 10, 100, 100, 1, 1 + pedalPositionGauge = pedalPosition,"Throttle Pedal Position", "%", 0, 120, 10, 10, 100, 100, 1, 1 knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1 knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2 @@ -1011,7 +1011,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "AFR ADC input", afr_hwChannel field = "fuelLevelSensor", fuelLevelSensor field = "Baro ADC input", baroSensor_hwChannel - field = "pedal Position Channel", pedalPositionChannel + field = "Throttle pedal Position Channel", pedalPositionChannel field = "Primary input channel", triggerInputPins1 field = "Secondary channel", triggerInputPins2 field = "Cam Sync/VVT input", camInput @@ -1628,17 +1628,18 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "verbose", isVerboseETB field = "Throttle Pedal Up", throttlePedalUpVoltage field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage - field = "PWM Frequency", etbFreq - field = "Dir #1", etbDirectionPin1 - field = "Dir #2", etbDirectionPin2 - field = "Control #1", etbControlPin1 - field = "Control #2", etbControlPin2 - field = "pFactor", etb_pFactor - field = "iFactor", etb_iFactor - field = "dFactor", etb_dFactor - field = "offset", etb_offset - field = "pid min", etb_minValue - field = "pid max", etb_maxValue + field = "PWM Frequency", etbFreq, {pedalPositionChannel != 16} + field = "Dir #1", etbDirectionPin1, {pedalPositionChannel != 16} + field = "Dir #2", etbDirectionPin2, {pedalPositionChannel != 16} + field = "Control #1", etbControlPin1, {pedalPositionChannel != 16} + field = "Control #2", etbControlPin2, {pedalPositionChannel != 16} + field = "pFactor", etb_pFactor, {pedalPositionChannel != 16} + field = "iFactor", etb_iFactor, {pedalPositionChannel != 16} + field = "dFactor", etb_dFactor, {pedalPositionChannel != 16} + field = "offset", etb_offset, {pedalPositionChannel != 16} + field = "control period", etb_period, {pedalPositionChannel != 16} + field = "pid min", etb_minValue, {pedalPositionChannel != 16} + field = "pid max", etb_maxValue, {pedalPositionChannel != 16} dialog = testSpark, "Spark" commandButton = "Spark #1", cmd_test_spk1