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 2016-01-18 19:01:48 -05:00
parent 330655478f
commit 13f010d2f1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,4 @@ void initAlgo(Logging *sharedLogger, engine_configuration_s *engineConfiguration
// todo: this is a mess, remove code duplication with PROD // todo: this is a mess, remove code duplication with PROD
initSettings(engineConfiguration); initSettings(engineConfiguration);
#endif #endif
#if EFI_PROD_CODE || EFI_SIMULATOR
initSignalExecutor();
#endif
} }

3
firmware/controllers/engine_controller.cpp
View File

@ -488,6 +488,9 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
addConsoleAction("analoginfo", printAnalogInfo); addConsoleAction("analoginfo", printAnalogInfo);
#if EFI_PROD_CODE || EFI_SIMULATOR
initSignalExecutor();
#endif
commonInitEngineController(sharedLogger); commonInitEngineController(sharedLogger);
if (hasFirmwareError()) { if (hasFirmwareError()) {

5
firmware/hw_layer/microsecond_timer.cpp
View File

@ -37,6 +37,8 @@ static const char * msg;
static char buff[32]; static char buff[32];
extern bool hasFirmwareErrorFlag;
/** /**
* sets the alarm to the specified number of microseconds from now. * sets the alarm to the specified number of microseconds from now.
* This function should be invoked under kernel lock which would disable interrupts. * This function should be invoked under kernel lock which would disable interrupts.
@ -49,6 +51,9 @@ void setHardwareUsTimer(int32_t timeUs) {
if (GPTDEVICE.state == GPT_ONESHOT) if (GPTDEVICE.state == GPT_ONESHOT)
gptStopTimerI(&GPTDEVICE); gptStopTimerI(&GPTDEVICE);
efiAssertVoid(GPTDEVICE.state == GPT_READY, "hw timer");
if (hasFirmwareError())
return;
gptStartOneShotI(&GPTDEVICE, timeUs); gptStartOneShotI(&GPTDEVICE, timeUs);
lastSetTimerTimeNt = getTimeNowNt(); lastSetTimerTimeNt = getTimeNowNt();