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 2014-11-08 11:03:07 -06:00
parent 64d3677827
commit f5ee4bd1d6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -366,7 +366,7 @@ void initEngineContoller(Engine *engine) {
* there is an implicit dependency on the fact that 'tachometer' listener is the 1st listener - this case * there is an implicit dependency on the fact that 'tachometer' listener is the 1st listener - this case
* other listeners can access current RPM value * other listeners can access current RPM value
*/ */
initRpmCalculator(); initRpmCalculator(engine);
#endif /* EFI_SHAFT_POSITION_INPUT */ #endif /* EFI_SHAFT_POSITION_INPUT */
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO

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

@ -222,7 +222,7 @@ float getCrankshaftAngleNt(uint64_t timeNt) {
return timeSinceZeroAngleNt / getOneDegreeTimeNt(rpmState.rpm()); return timeSinceZeroAngleNt / getOneDegreeTimeNt(rpmState.rpm());
} }
void initRpmCalculator(void) { void initRpmCalculator(Engine *engine) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
initLogging(&logger, "rpm calc"); initLogging(&logger, "rpm calc");
engine->rpmCalculator = &rpmState; engine->rpmCalculator = &rpmState;

8
firmware/controllers/trigger/rpm_calculator.h
View File

@ -55,16 +55,16 @@ private:
int getRpmE(Engine *engine); int getRpmE(Engine *engine);
bool isCrankingE(Engine *engine); bool isCrankingE(Engine *engine);
void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, RpmCalculator *rpmState); void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, RpmCalculator *rpmState);
/**
* @brief Initialize RPM calculator
*/
void initRpmCalculator(Engine *engine);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/**
* @brief Initialize RPM calculator
*/
void initRpmCalculator(void);
bool isCranking(void); bool isCranking(void);
uint64_t getLastRpmEventTime(void); uint64_t getLastRpmEventTime(void);

2
win32_functional_tests/simulator/rusEfiFunctionalTest.cpp
View File

@ -75,7 +75,7 @@ void rusEfiFunctionalTest(void) {
initThermistors(engine); initThermistors(engine);
initAlgo(engineConfiguration); initAlgo(engineConfiguration);
initRpmCalculator(); initRpmCalculator(engine);
initAnalogChart(); initAnalogChart();