diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 0e5cf6ff07..9704078d81 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -546,7 +546,7 @@ void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputC tsOutputChannels->throttlePositon = tps; tsOutputChannels->massAirFlowVoltage = getMaf(); tsOutputChannels->massAirFlowValue = getRealMaf(); - tsOutputChannels->massAirFlowValue = veMap.getValue(getMap(), rpm); + tsOutputChannels->veValue = veMap.getValue(getMap(), rpm); tsOutputChannels->airFuelRatio = getAfr(); tsOutputChannels->v_batt = getVBatt(engineConfiguration); tsOutputChannels->tpsADC = getTPS10bitAdc(PASS_ENGINE_PARAMETER_F); diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/tunerstudio/tunerstudio_configuration.h index 3f261dcd5a..f1ef0dd43c 100644 --- a/firmware/console/tunerstudio/tunerstudio_configuration.h +++ b/firmware/console/tunerstudio/tunerstudio_configuration.h @@ -83,7 +83,9 @@ typedef struct { float rpmAcceleration; float massAirFlowValue; float veValue; - int unused3[20]; + float maxDelta; + float minDelta; + int unused3[18]; } TunerStudioOutputChannels; #endif /* TUNERSTUDIO_CONFIGURATION_H_ */ diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index c8c1653950..1bf1d0a802 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 by config_definition.jar on Tue Feb 17 16:44:47 EST 2015 +// this section was generated by config_definition.jar on Thu Feb 19 20:24:50 EST 2015 // begin #include "rusefi_types.h" typedef struct { @@ -1068,7 +1068,15 @@ typedef struct { /** * offset 5204 */ - int unused3[147]; + int unused3[145]; + /** + * offset 5784 + */ + float deaccelEnrichmentThreshold; + /** + * offset 5788 + */ + float deaccelEnrichmentMultiplier; /** * offset 5792 */ @@ -1172,4 +1180,4 @@ typedef struct { } engine_configuration_s; // end -// this section was generated by config_definition.jar on Tue Feb 17 16:44:47 EST 2015 +// this section was generated by config_definition.jar on Thu Feb 19 20:24:50 EST 2015 diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini index 36e88cc2a6..5c509570be 100644 --- a/firmware/rusefi_config.ini +++ b/firmware/rusefi_config.ini @@ -469,8 +469,10 @@ bit hasMapSensor;@see isMapAveragingEnabled custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1 pin_input_mode_e[LE_COMMAND_COUNT iterate] fsioInputModes; - int[147] unused3; + int[145] unused3; + float deaccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 + float deaccelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3 float accelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 float accelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3