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

consistency

This commit is contained in:
rusefi 2019-11-23 15:53:22 -05:00
parent e706c999f1
commit 56ff75004b
6 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/mazda_323.cpp
View File

@ -7,7 +7,9 @@
#include "mazda_323.h"
void setMazda323EngineConfiguration(engine_configuration_s *engineConfiguration) {
EXTERN_CONFIG;
void setMazda323EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->specs.displacement = 1.6;

7
firmware/config/engines/mazda_323.h
View File

@ -10,11 +10,8 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef MAZDA_323_H_
#define MAZDA_323_H_
#pragma once
#include "engine_configuration.h"
void setMazda323EngineConfiguration(engine_configuration_s *engineConfiguration);
#endif /* MAZDA_323_H_ */
void setMazda323EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);

15
firmware/config/engines/nissan_primera.cpp
View File

@ -1,10 +1,11 @@
/**
* @file nissan_primera.cpp
*
* engine_type 5
* NISSAN_PRIMERA
* set engine_type 5
*
* @date Oct 14, 2013
* @author Andrey Belomutskiy, (c) 2012-2018
* @author Andrey Belomutskiy, (c) 2012-2019
*/
#include "global.h"
@ -12,11 +13,17 @@
#if EFI_SUPPORT_NISSAN_PRIMERA
#include "nissan_primera.h"
void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration) {
EXTERN_CONFIG;
void setNissanPrimeraEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->trigger.type = TT_NISSAN_SR20VE;
// engineConfiguration->auxValves[0]
}
void setNissanPrimeraEngineConfiguration_360(engine_configuration_s *engineConfiguration) {
void setNissanPrimeraEngineConfiguration_360(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_NISSAN_SR20VE_360;
}

11
firmware/config/engines/nissan_primera.h
View File

@ -2,19 +2,16 @@
* @file nissan_primera.h
*
* @date Oct 14, 2013
* @author Andrey Belomutskiy, (c) 2012-2017
* @author Andrey Belomutskiy, (c) 2012-2019
*/
#ifndef NISSAN_PRIMERA_H_
#define NISSAN_PRIMERA_H_
#pragma once
#if EFI_SUPPORT_NISSAN_PRIMERA
#include "engine_configuration.h"
void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration);
void setNissanPrimeraEngineConfiguration_360(engine_configuration_s *engineConfiguration);
void setNissanPrimeraEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setNissanPrimeraEngineConfiguration_360(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* EFI_SUPPORT_NISSAN_PRIMERA */
#endif /* NISSAN_PRIMERA_H_ */

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

@ -1103,7 +1103,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
#endif /* EFI_SUPPORT_FORD_FIESTA */
#if EFI_SUPPORT_NISSAN_PRIMERA
case NISSAN_PRIMERA:
setNissanPrimeraEngineConfiguration(engineConfiguration);
setNissanPrimeraEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif
case HONDA_ACCORD_CD:
@ -1163,7 +1163,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setMazdaMiataNb1EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MAZDA_323:
setMazda323EngineConfiguration(engineConfiguration);
setMazda323EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MAZDA_626:
setMazda626EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);

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

@ -494,7 +494,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t trgEventIndex D
}
if (checkIfTriggerConfigChanged(PASS_ENGINE_PARAMETER_SIGNATURE)) {
engine->ignitionEvents.isReady = false; // we need to rebuild ignition schedule
engine->ignitionEvents.isReady = false; // we need to rebuild complete ignition schedule
engine->injectionEvents.isReady = false;
// moved 'triggerIndexByAngle' into trigger initialization (why was it invoked from here if it's only about trigger shape & optimization?)
// see initializeTriggerShape() -> prepareOutputSignals(PASS_ENGINE_PARAMETER_SIGNATURE)