rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-02-19 20:04:36 -06:00
parent 68039e32e6
commit efaff8fc1c
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/status_loop.cpp
View File

@ -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);

4
firmware/console/tunerstudio/tunerstudio_configuration.h
View File

@ -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_ */

14
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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

4
firmware/rusefi_config.ini
View File

@ -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

4
firmware/tunerstudio/rusefi.ini
View File

@ -37,7 +37,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Thu Feb 19 16:09:09 EST 2015
; this section was generated by ConfigDefinition.jar on Thu Feb 19 20:24:53 EST 2015
pageSize = 15160
page = 1
@ -459,6 +459,8 @@ page = 1
fsioInputModes15 = scalar, F32, 5196, "ms", 1, 0, 0, 200, 1
fsioInputModes16 = scalar, F32, 5200, "ms", 1, 0, 0, 200, 1
;skipping unused3 offset 5204
deaccelEnrichmentThreshold = scalar, F32, 5784, "roc", 1, 0, 0, 200, 3
deaccelEnrichmentMultiplier = scalar, F32, 5788, "coeff", 1, 0, 0, 200, 3
accelEnrichmentThreshold = scalar, F32, 5792, "roc", 1, 0, 0, 200, 3
accelEnrichmentMultiplier = scalar, F32, 5796, "coeff", 1, 0, 0, 200, 3
timingMultiplier = array, U08, 5800, [200],"char", 1, 0, 0.0, 3.0, 2