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

auto-sync

This commit is contained in:
rusEfi 2015-11-12 14:01:28 -05:00
parent 5ddc483ae7
commit 57b68d8b32
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 Thu Nov 12 10:32:55 EST 2015 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 12 12:52:17 EST 2015
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -853,7 +853,7 @@ typedef struct {
*/ */
float cylinderBore; float cylinderBore;
/** /**
* todo:eliminate this? * todo:see getEngineCycle(operation_mode_e operationMode) eliminate this?
* todo:operationMode should be enough * todo:operationMode should be enough
* 360 for two-stroke * 360 for two-stroke
* 720 for four-stroke * 720 for four-stroke
@ -1571,4 +1571,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 12 10:32:55 EST 2015 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 12 12:52:17 EST 2015

2
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -196,7 +196,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType,
if (diffNt == 0) { if (diffNt == 0) {
rpmState->setRpmValue(NOISY_RPM); rpmState->setRpmValue(NOISY_RPM);
} else { } else {
int mult = engineConfiguration->engineCycleDuration / 360; int mult = getEngineCycle(engineConfiguration->operationMode) / 360;
int rpm = (int) (60 * US2NT(US_PER_SECOND_LL) * mult / diffNt); int rpm = (int) (60 * US2NT(US_PER_SECOND_LL) * mult / diffNt);
rpmState->setRpmValue(rpm > UNREALISTIC_RPM ? NOISY_RPM : rpm); rpmState->setRpmValue(rpm > UNREALISTIC_RPM ? NOISY_RPM : rpm);
} }

2
firmware/integration/rusefi_config.txt
View File

@ -187,7 +187,7 @@ end_struct
specs_s specs specs_s specs
float cylinderBore;Cylinder diameter, in mm. float cylinderBore;Cylinder diameter, in mm.
int engineCycleDuration;todo:eliminate this?\ntodo:operationMode should be enough\n360 for two-stroke\n720 for four-stroke;"engine cycle", 1, 0, 0, 1000, 0 int engineCycleDuration;todo:see getEngineCycle(operation_mode_e operationMode) eliminate this?\ntodo:operationMode should be enough\n360 for two-stroke\n720 for four-stroke;"engine cycle", 1, 0, 0, 1000, 0
int rpmHardLimit;;"rpm", 1, 0, 0, 20000.0, 2 int rpmHardLimit;;"rpm", 1, 0, 0, 20000.0, 2