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

auto-sync

This commit is contained in:
rusEfi 2016-06-09 11:02:31 -04:00
parent 0124270e16
commit ab7fe5cefa
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/console/status_loop.cpp
View File

@ -181,6 +181,8 @@ static void printSensors(Logging *log, bool fileFormat) {
if (engineConfiguration->hasAfrSensor) { if (engineConfiguration->hasAfrSensor) {
reportSensorF(log, fileFormat, "afr", "AFR", getAfr(PASS_ENGINE_PARAMETER_F), 2); reportSensorF(log, fileFormat, "afr", "AFR", getAfr(PASS_ENGINE_PARAMETER_F), 2);
} }
reportSensorF(log, fileFormat, "target", "AFR", engine->engineState.targetAFR, 2);
#endif #endif
#if EFI_VEHICLE_SPEED || defined(__DOXYGEN__) #if EFI_VEHICLE_SPEED || defined(__DOXYGEN__)
@ -204,6 +206,9 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, "tpsacc", "ms", engine->tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F), 2); reportSensorF(log, fileFormat, "tpsacc", "ms", engine->tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F), 2);
reportSensorF(log, fileFormat, "advance", "deg", engine->engineState.timingAdvance, 2); reportSensorF(log, fileFormat, "advance", "deg", engine->engineState.timingAdvance, 2);
reportSensorF(log, fileFormat, "duty", "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2); reportSensorF(log, fileFormat, "duty", "%", getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER), 2);
reportSensorF(log, fileFormat, "tCharge", "K", engine->engineState.tChargeK, 2);
} }
if (engineConfiguration->hasCltSensor) { if (engineConfiguration->hasCltSensor) {

2
firmware/controllers/algo/engine.cpp
View File

@ -188,7 +188,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
* *0.01 because of https://sourceforge.net/p/rusefi/tickets/153/ * *0.01 because of https://sourceforge.net/p/rusefi/tickets/153/
*/ */
currentVE = baroCorrection * veMap.getValue(rpm, map) * 0.01; currentVE = baroCorrection * veMap.getValue(rpm, map) * 0.01;
targerAFR = afrMap.getValue(rpm, map); targetAFR = afrMap.getValue(rpm, map);
} else { } else {
baseTableFuel = getBaseTableFuel(engineConfiguration, rpm, engineLoad); baseTableFuel = getBaseTableFuel(engineConfiguration, rpm, engineLoad);
} }

2
firmware/controllers/algo/engine.h
View File

@ -162,7 +162,7 @@ public:
// speed density // speed density
float tChargeK; float tChargeK;
float currentVE; float currentVE;
float targerAFR; float targetAFR;
/** /**
* pre-calculated value from simple fuel lookup * pre-calculated value from simple fuel lookup

4
firmware/controllers/math/speed_density.cpp
View File

@ -78,7 +78,7 @@ EXTERN_ENGINE;
/** /**
* @return per cylinder injection time, in Milliseconds * @return per cylinder injection time, in Milliseconds
*/ */
float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) { floatms_t getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
//int rpm = engine->rpmCalculator->rpm(); //int rpm = engine->rpmCalculator->rpm();
/** /**
@ -91,7 +91,7 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
engine->engineState.airMass = getAirMass(engineConfiguration, ENGINE(engineState.currentVE), adjustedMap, tChargeK); engine->engineState.airMass = getAirMass(engineConfiguration, ENGINE(engineState.currentVE), adjustedMap, tChargeK);
return sdMath(engineConfiguration, engine->engineState.airMass, ENGINE(engineState.targerAFR)) * 1000; return sdMath(engineConfiguration, engine->engineState.airMass, ENGINE(engineState.targetAFR)) * 1000;
} }
static const baro_corr_table_t default_baro_corr = { static const baro_corr_table_t default_baro_corr = {

2
firmware/controllers/math/speed_density.h
View File

@ -20,6 +20,6 @@ float sdMath(engine_configuration_s *engineConfiguration, float airMass, float A
void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F); void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F);
void initSpeedDensity(DECLARE_ENGINE_PARAMETER_F); void initSpeedDensity(DECLARE_ENGINE_PARAMETER_F);
float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S); floatms_t getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S);
#endif /* SPEED_DENSITY_H_ */ #endif /* SPEED_DENSITY_H_ */

2
firmware/rusefi.cpp
View File

@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20160601; return 20160609;
} }