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

auto-sync

This commit is contained in:
rusEfi 2016-09-11 21:02:02 -04:00
parent 5212e2b28d
commit aeb134d975
11 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/dodge_neon.cpp
View File

@ -499,12 +499,10 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->tpsAccelLength = 12;
engineConfiguration->tpsAccelEnrichmentThreshold = 10;
engineConfiguration->tpsAccelEnrichmentMultiplier = 0.15;
engineConfiguration->suckedOffCoef = 0.05;
engineConfiguration->addedToWallCoef = 0.40;
engineConfiguration->tpsAccelEnrichmentMultiplier = 0;
engineConfiguration->suckedOffCoef = 0;
engineConfiguration->addedToWallCoef = 0;

1
firmware/config/engines/ford_festiva.cpp
View File

@ -281,7 +281,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->tpsAccelEnrichmentThreshold = 40;
engineConfiguration->tpsAccelEnrichmentMultiplier = 0.0;
engineConfiguration->engineLoadAccelEnrichmentThreshold = 5.0;
engineConfiguration->engineLoadAccelEnrichmentMultiplier = 1;

1
firmware/config/engines/mazda_626.cpp
View File

@ -92,7 +92,6 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->tpsAccelLength = 12;
engineConfiguration->tpsAccelEnrichmentThreshold = 10;
engineConfiguration->tpsAccelEnrichmentMultiplier = 0.06;
// todo engineConfiguration->afr.hwChannel = EFI_ADC_3;

9
firmware/controllers/algo/accel_enrichment.cpp
View File

@ -202,7 +202,7 @@ static void accelInfo() {
scheduleMsg(logger, "EL decel th=%f/mult=%f", engineConfiguration->engineLoadDecelEnleanmentThreshold, engineConfiguration->engineLoadDecelEnleanmentMultiplier);
// scheduleMsg(logger, "TPS accel length=%d", tpsInstance.cb.getSize());
scheduleMsg(logger, "TPS accel th=%f/mult=%f", engineConfiguration->tpsAccelEnrichmentThreshold, engineConfiguration->tpsAccelEnrichmentMultiplier);
scheduleMsg(logger, "TPS accel th=%f/mult=%f", engineConfiguration->tpsAccelEnrichmentThreshold, -1);
scheduleMsg(logger, "added to wall=%f/sucked=%f", engineConfiguration->addedToWallCoef, engineConfiguration->suckedOffCoef);
}
@ -222,11 +222,6 @@ static void setTpsAccelThr(float value) {
accelInfo();
}
static void setTpsAccelMult(float value) {
engineConfiguration->tpsAccelEnrichmentMultiplier = value;
accelInfo();
}
static void setTpsDecelThr(float value) {
engineConfiguration->tpsDecelEnleanmentThreshold = value;
accelInfo();
@ -280,7 +275,7 @@ void initAccelEnrichment(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__)
addConsoleActionI("set_tps_accel_len", setTpsAccelLen);
addConsoleActionF("set_tps_accel_threshold", setTpsAccelThr);
addConsoleActionF("set_tps_accel_multiplier", setTpsAccelMult);
//addConsoleActionF("set_tps_accel_multiplier", setTpsAccelMult);
addConsoleActionF("set_tps_decel_threshold", setTpsDecelThr);
addConsoleActionF("set_tps_decel_multiplier", setTpsDecelMult);

1
firmware/controllers/algo/engine_configuration.cpp
View File

@ -782,7 +782,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->tpsAccelLength = 12;
engineConfiguration->tpsAccelEnrichmentThreshold = 40; // TPS % change, per engine cycle
engineConfiguration->tpsAccelEnrichmentMultiplier = 0.05;
}
void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) {

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

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1532,7 +1532,7 @@ typedef struct {
/**
* offset 2192
*/
float tpsAccelEnrichmentMultiplier;
float unused213;
/**
* offset 2196
*/
@ -1930,4 +1930,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016

4
firmware/controllers/algo/rusefi_generated.h
View File

@ -781,8 +781,8 @@
#define tpsAccelLength_offset 2184
#define tpsAccelLength_offset_hex 888
#define tpsAccelEnrichmentThreshold_offset 2188
#define tpsAccelEnrichmentMultiplier_offset 2192
#define tpsAccelEnrichmentMultiplier_offset_hex 890
#define unused213_offset 2192
#define unused213_offset_hex 890
#define engineLoadAccelLength_offset 2196
#define engineLoadAccelLength_offset_hex 894
#define engineLoadDecelEnleanmentThreshold_offset 2200

2
firmware/integration/rusefi_config.txt
View File

@ -685,7 +685,7 @@ baro_corr_table_t baroCorrTable;
int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0
float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3
float tpsAccelEnrichmentMultiplier;;"coeff", 1, 0, 0, 200, 3
float unused213;;"coeff", 1, 0, 0, 200, 3
int engineLoadAccelLength;;"cycles", 1, 0, 1, 200, 0

20
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,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 Thu Sep 08 15:38:36 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016
pageSize = 16376
page = 1
@ -541,7 +541,7 @@ page = 1
alternatorControl_offset = scalar, F32, 2180, "value", 1, 0, 0, 1000, 3
tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0
tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3
tpsAccelEnrichmentMultiplier = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3
unused213 = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3
engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0
engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3
engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3
@ -1320,11 +1320,12 @@ fileVersion = { 20160702 }
subMenu = fuelTableTbl, "Fuel Table", 0, {fuelAlgorithm != 3}
subMenu = veTableTbl, "VE Table", 0, {fuelAlgorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", 0, {fuelAlgorithm == 3}
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
subMenu = injPhaseTableTbl, "Injection Phase"
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier"
subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper"
subMenu = std_separator
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier"
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction"
@ -1873,24 +1874,23 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "enable Cylinder Cleanup", isCylinderCleanupEnabled
dialog = EngineLoadAccel, "Engine Load"
dialog = EngineLoadAccelPanel, "Engine Load"
field = "Length", engineLoadAccelLength
field = "Accel Threshold", engineLoadAccelEnrichmentThreshold
field = "Accel Multiplier", engineLoadAccelEnrichmentMultiplier
field = "Decel Threshold", engineLoadDecelEnleanmentThreshold
field = "Decel Multiplier", engineLoadDecelEnleanmentMultiplier
dialog = TpsAccel, "TPS"
dialog = TpsAccelPanel, "TPS"
field = "Length", tpsAccelLength
field = "Accel Threshold", tpsAccelEnrichmentThreshold
field = "Accel Multiplier", tpsAccelEnrichmentMultiplier
field = "Decel Threshold", tpsDecelEnleanmentThreshold
field = "Decel Multiplier", tpsDecelEnleanmentMultiplier
; field = "Decel Multiplier", tpsDecelEnleanmentMultiplier
; Tuning->AccelEnrichment
dialog = AccelEnrich, "Accel/Decel Enrichment"
panel = EngineLoadAccel
panel = TpsAccel
panel = EngineLoadAccelPanel
panel = TpsAccelPanel
field = "sucked off wall coefficient", suckedOffCoef
field = "added to wall coef", addedToWallCoef

17
firmware/tunerstudio/rusefi.input
View File

@ -540,7 +540,6 @@ page = 1
alternatorControl_offset = scalar, F32, 2180, "value", 1, 0, 0, 1000, 3
tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0
tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3
tpsAccelEnrichmentMultiplier = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3
engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0
engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3
engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3
@ -1302,11 +1301,12 @@ fileVersion = { 20160702 }
subMenu = fuelTableTbl, "Fuel Table", 0, {fuelAlgorithm != 3}
subMenu = veTableTbl, "VE Table", 0, {fuelAlgorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", 0, {fuelAlgorithm == 3}
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
subMenu = injPhaseTableTbl, "Injection Phase"
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier"
subMenu = mapAccelTaper, "Engine Load Acceleration Enrichment Taper"
subMenu = std_separator
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier"
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction"
@ -1855,24 +1855,23 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "enable Cylinder Cleanup", isCylinderCleanupEnabled
dialog = EngineLoadAccel, "Engine Load"
dialog = EngineLoadAccelPanel, "Engine Load"
field = "Length", engineLoadAccelLength
field = "Accel Threshold", engineLoadAccelEnrichmentThreshold
field = "Accel Multiplier", engineLoadAccelEnrichmentMultiplier
field = "Decel Threshold", engineLoadDecelEnleanmentThreshold
field = "Decel Multiplier", engineLoadDecelEnleanmentMultiplier
dialog = TpsAccel, "TPS"
dialog = TpsAccelPanel, "TPS"
field = "Length", tpsAccelLength
field = "Accel Threshold", tpsAccelEnrichmentThreshold
field = "Accel Multiplier", tpsAccelEnrichmentMultiplier
field = "Decel Threshold", tpsDecelEnleanmentThreshold
field = "Decel Multiplier", tpsDecelEnleanmentMultiplier
; field = "Decel Multiplier", tpsDecelEnleanmentMultiplier
; Tuning->AccelEnrichment
dialog = AccelEnrich, "Accel/Decel Enrichment"
panel = EngineLoadAccel
panel = TpsAccel
panel = EngineLoadAccelPanel
panel = TpsAccelPanel
field = "sucked off wall coefficient", suckedOffCoef
field = "added to wall coef", addedToWallCoef

8
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 20:11:57 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -785,8 +785,8 @@ public class Fields {
public static final int tpsAccelLength_offset = 2184;
public static final int tpsAccelLength_offset_hex = 888;
public static final int tpsAccelEnrichmentThreshold_offset = 2188;
public static final int tpsAccelEnrichmentMultiplier_offset = 2192;
public static final int tpsAccelEnrichmentMultiplier_offset_hex = 890;
public static final int unused213_offset = 2192;
public static final int unused213_offset_hex = 890;
public static final int engineLoadAccelLength_offset = 2196;
public static final int engineLoadAccelLength_offset_hex = 894;
public static final int engineLoadDecelEnleanmentThreshold_offset = 2200;
@ -1446,7 +1446,7 @@ public class Fields {
public static final Field ALTERNATORCONTROL_OFFSET = Field.create("ALTERNATORCONTROL_OFFSET", 2180, FieldType.FLOAT);
public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2184, FieldType.INT);
public static final Field TPSACCELENRICHMENTTHRESHOLD = Field.create("TPSACCELENRICHMENTTHRESHOLD", 2188, FieldType.FLOAT);
public static final Field TPSACCELENRICHMENTMULTIPLIER = Field.create("TPSACCELENRICHMENTMULTIPLIER", 2192, FieldType.FLOAT);
public static final Field UNUSED213 = Field.create("UNUSED213", 2192, FieldType.FLOAT);
public static final Field ENGINELOADACCELLENGTH = Field.create("ENGINELOADACCELLENGTH", 2196, FieldType.INT);
public static final Field ENGINELOADDECELENLEANMENTTHRESHOLD = Field.create("ENGINELOADDECELENLEANMENTTHRESHOLD", 2200, FieldType.FLOAT);
public static final Field ENGINELOADDECELENLEANMENTMULTIPLIER = Field.create("ENGINELOADDECELENLEANMENTMULTIPLIER", 2204, FieldType.FLOAT);