diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0f6154fdf2..f0774054b3 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -545,6 +545,9 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->aux1PidMin = 10; engineConfiguration->aux1PidMax = 90; + engineConfiguration->etbPidMin = 0; + engineConfiguration->etbPidMax = 99; + boardConfiguration->alternatorPidMin = 10; boardConfiguration->alternatorPidMax = 90; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 68c087f2ef..56689ca6da 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 Sat May 27 23:31:01 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 28 13:44:34 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1862,7 +1862,11 @@ typedef struct { /** * offset 2828 */ - int unusedThere; + int16_t etbPidMin; + /** + * offset 2830 + */ + int16_t etbPidMax; /** * offset 2832 */ @@ -2129,4 +2133,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:31:01 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 28 13:44:34 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index f2bc98cccf..3fdcaaacc2 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1369,8 +1369,10 @@ #define aux1PidMin_offset_hex b08 #define aux1PidMax_offset 2826 #define aux1PidMax_offset_hex b0a -#define unusedThere_offset 2828 -#define unusedThere_offset_hex b0c +#define etbPidMin_offset 2828 +#define etbPidMin_offset_hex b0c +#define etbPidMax_offset 2830 +#define etbPidMax_offset_hex b0e #define sdCardSpiDevice_offset 2832 #define sdCardSpiDevice_offset_hex b10 #define spi3SckMode_offset 2836 diff --git a/firmware/controllers/electronic_throttle.cpp b/firmware/controllers/electronic_throttle.cpp index 426c65862b..43928cb60f 100644 --- a/firmware/controllers/electronic_throttle.cpp +++ b/firmware/controllers/electronic_throttle.cpp @@ -184,8 +184,9 @@ void stopETBPins(void) { } void onConfigurationChangeElectronicThrottleCallback(engine_configuration_s *previousConfiguration) { - shouldResetPid = !pid.isSame(&engineConfiguration->etb); - + shouldResetPid = !pid.isSame(&previousConfiguration->etb); + pid.minResult = engineConfiguration->etbPidMin; + pid.maxResult = engineConfiguration->etbPidMax; } void startETBPins(void) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c76a73cc91..c76ad2445b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -795,7 +795,8 @@ int16_t etbFreq;;"Hz", 1, 0, 0, 500, 10 int16_t aux1PidMin;;"v", 1, 0, 0, 100.0, 0 int16_t aux1PidMax;;"v", 1, 0, 0, 100.0, 0 - int unusedThere; + int16_t etbPidMin;;"v", 1, 0, 0, 3000.0, 3 + int16_t etbPidMax;;"v", 1, 0, 0, 3000.0, 3 spi_device_e sdCardSpiDevice; pin_mode_e spi3SckMode; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 1df0c4ff7b..f248719a2e 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 Sat May 27 23:31:01 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 28 13:44:34 EDT 2017 pageSize = 16376 page = 1 @@ -676,7 +676,8 @@ page = 1 timing_offset_cylinder12 = scalar, F32, 2820, "Val", 1, 0, -20000000, 20000000, 1 aux1PidMin = scalar, S16, 2824, "v", 1, 0, 0, 100.0, 0 aux1PidMax = scalar, S16, 2826, "v", 1, 0, 0, 100.0, 0 -;skipping unusedThere offset 2828 + etbPidMin = scalar, S16, 2828, "v", 1, 0, 0, 3000.0, 3 + etbPidMax = scalar, S16, 2830, "v", 1, 0, 0, 3000.0, 3 sdCardSpiDevice = bits,U32, 2832, [0:1], "Off", "SPI1", "SPI2", "SPI3" spi3SckMode = bits, U32, 2836, [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" spi3MosiMode = bits, U32, 2840, [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" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index d92b33320e..31aa83bb50 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1636,7 +1636,9 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "pFactor", etb_pFactor field = "iFactor", etb_iFactor field = "dFactor", etb_dFactor - field = "offset", etb_offset + field = "offset", etb_offset + field = "pid min", etbPidMin + field = "pid max", etbPidMax dialog = testSpark, "Spark" commandButton = "Spark #1", cmd_test_spk1