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-07-23 21:04:30 -04:00
parent 5231266f6a
commit 37151725fe
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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 Fri Jul 22 17:07:24 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 23 20:32:57 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1058,6 +1058,7 @@ typedef struct {
*/
int canSleepPeriod;
/**
* See engineCycle
* offset 500
*/
operation_mode_e operationMode;
@ -1905,4 +1906,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 22 17:07:24 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 23 20:32:57 EDT 2016

8
firmware/controllers/algo/fuel_math.cpp
View File

@ -94,14 +94,14 @@ float getinjectionOffset(float rpm DECLARE_ENGINE_PARAMETER_S) {
/**
* Number of injections into each cylinder per engine cycle
*/
static int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S) {
int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S) {
switch (mode) {
case IM_SIMULTANEOUS:
return engineConfiguration->specs.cylindersCount;
case IM_SEQUENTIAL:
return 1;
case IM_BATCH:
return engineConfiguration->specs.cylindersCount / 2;
return 2;
default:
firmwareError("Unexpected getFuelMultiplier %d", mode);
return 1;
@ -110,8 +110,8 @@ static int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_
percent_t getInjectorDutyCycle(int rpm DECLARE_ENGINE_PARAMETER_S) {
floatms_t totalPerCycle = getFuelMs(rpm PASS_ENGINE_PARAMETER) * getNumberOfInjections(engineConfiguration->injectionMode PASS_ENGINE_PARAMETER);
floatms_t engineCycleTime = getCrankshaftRevolutionTimeMs(rpm) * (engineConfiguration->operationMode == TWO_STROKE ? 1 : 2);
return 100 * totalPerCycle / engineCycleTime;
floatms_t engineCycleDuration = getCrankshaftRevolutionTimeMs(rpm) * (engineConfiguration->operationMode == TWO_STROKE ? 1 : 2);
return 100 * totalPerCycle / engineCycleDuration;
}
/**

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

@ -26,7 +26,7 @@ floatms_t getRealMafFuel(float airMass, int rpm DECLARE_ENGINE_PARAMETER_S);
floatms_t getBaseTableFuel(engine_configuration_s *engineConfiguration, int rpm, float engineLoad);
float getBaroCorrection(DECLARE_ENGINE_PARAMETER_F);
int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S);
float getinjectionOffset(float rpm DECLARE_ENGINE_PARAMETER_S);
float getIatCorrection(float iat DECLARE_ENGINE_PARAMETER_S);
floatms_t getInjectorLag(float vBatt DECLARE_ENGINE_PARAMETER_S);

2
firmware/integration/rusefi_config.txt
View File

@ -301,7 +301,7 @@ int canSleepPeriod;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0
custom operation_mode_e 4 bits, U32, @OFFSET@, [0:1], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke"
operation_mode_e operationMode;
operation_mode_e operationMode;See engineCycle
custom display_mode_e 4 bits, U32, @OFFSET@, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
display_mode_e displayMode;