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-04-30 11:08:14 -04:00
parent aebf08d807
commit f9dbabc14c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -361,7 +361,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->vbattAdcChannel = EFI_ADC_4;
engineConfiguration->cltAdcChannel = EFI_ADC_6;
engineConfiguration->iatAdcChannel = EFI_ADC_7;
engineConfiguration->mafAdcChannel = EFI_ADC_0;
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
engineConfiguration->afr.hwChannel = EFI_ADC_14;
engineConfiguration->cylinderBore = 87.5;

7
firmware/controllers/engine_controller.cpp
View File

@ -49,6 +49,7 @@
#include "LocalVersionHolder.h"
#include "alternatorController.h"
#include "fuel_math.h"
#include "settings.h"
#if HAL_USE_ADC || defined(__DOXYGEN__)
#include "AdcConfiguration.h"
@ -478,6 +479,11 @@ static void getKnockInfo(void) {
void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
addConsoleAction("analoginfo", printAnalogInfo);
initConfigActions();
#if EFI_PROD_CODE
// todo: this is a mess, remove code duplication with simulator
initSettings(engineConfiguration);
#endif
if (hasFirmwareError()) {
return;
@ -494,7 +500,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
#endif /* EFI_ANALOG_CHART */
initAlgo(sharedLogger, engineConfiguration);
initConfigActions();
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)
if (engineConfiguration->isWaveAnalyzerEnabled) {