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 2015-05-02 00:04:34 -04:00
parent 3e50b1266f
commit 3655bca597
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,8 +194,10 @@ void Engine::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
*/
engine->engineState.currentVE = veMap.getValue(map, rpm) * 0.01;
engine->engineState.targerAFR = afrMap.getValue(map, rpm);
} else {
float engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_F);
engine->engineState.baseTableFuel = getBaseTableFuel(engineConfiguration, rpm, engineLoad);
}
}
StartupFuelPumping::StartupFuelPumping() {

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

@ -97,6 +97,8 @@ public:
float currentVE;
float targerAFR;
float baseTableFuel;
angle_t injectionAngle;
};

10
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -22,6 +22,9 @@
*/
#include "main.h"
#if EFI_PROD_CODE
#include <nvic.h>
#endif
#if !EFI_PROD_CODE && !EFI_SIMULATOR
@ -293,6 +296,13 @@ static void ignitionCalc(int rpm DECLARE_ENGINE_PARAMETER_S) {
engine->advance = -ENGINE(engineState.timingAdvance);
}
#if EFI_PROD_CODE
/**
* this field is used as an Expression in IAR debugger
*/
uint32_t *cyccnt = (uint32_t*)&DWT_CYCCNT;
#endif
/**
* This is the main trigger event handler.
* Both injection and ignition are controlled from this method.

5
firmware/controllers/trigger/trigger_central.cpp
View File

@ -230,6 +230,7 @@ extern uint32_t hipLastExecutionCount;
extern uint32_t hwSetTimerTime;
extern int maxHowFarOff;
extern uint32_t *cyccnt;
void triggerInfo(Engine *engine) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
@ -294,7 +295,9 @@ void triggerInfo(Engine *engine) {
scheduleMsg(logger, "zeroTestTime=%d maxHowFarOff=%d", engine->m.zeroTestTime, maxHowFarOff);
maxHowFarOff = 0;
scheduleMsg(logger, "advanceLookupTime=%d", engine->m.advanceLookupTime);
scheduleMsg(logger, "advanceLookupTime=%d t=%d fuelCalcTime=%d",
engine->m.advanceLookupTime, *cyccnt,
engine->m.fuelCalcTime);
scheduleMsg(logger,
"ignitionMathTime=%d ignitionSchTime=%d injectonSchTime=%d",