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

auto-sync

This commit is contained in:
rusEfi 2016-11-03 17:03:11 -04:00
parent 76e8b5e879
commit 4d8bbd2456
9 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/engines/mazda_miata_nb.cpp
View File

@ -2,7 +2,7 @@
* @file mazda_miata_nb.cpp
*
*
* MAZDA_MIATA_NB = 9
* MAZDA_MIATA_NB1 = 9
* set_engine_type 9
*
* http://rusefi.com/forum/viewtopic.php?t=467
@ -17,11 +17,11 @@
EXTERN_ENGINE;
void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// set_rpm_hard_limit 3000
engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NB;
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NB1;
engineConfiguration->globalTriggerAngleOffset = 276;

8
firmware/config/engines/mazda_miata_nb.h
View File

@ -5,11 +5,11 @@
* @author Andrey Belomutskiy, (c) 2012-2016
*/
#ifndef MAZDA_MIATA_NB_H_
#define MAZDA_MIATA_NB_H_
#ifndef MAZDA_MIATA_NB1_H_
#define MAZDA_MIATA_NB1_H_
#include "engine.h"
void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* MAZDA_MIATA_NB_H_ */
#endif /* MAZDA_MIATA_NB1_H_ */

8
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -92,8 +92,8 @@ case MAZDA_323:
return "MAZDA_323";
case MAZDA_626:
return "MAZDA_626";
case MAZDA_MIATA_NB:
return "MAZDA_MIATA_NB";
case MAZDA_MIATA_NB1:
return "MAZDA_MIATA_NB1";
case MIATA_1990:
return "MIATA_1990";
case MIATA_1994_DEVIATOR:
@ -173,8 +173,8 @@ case TT_HONDA_ACCORD_CD_TWO_WIRES:
return "TT_HONDA_ACCORD_CD_TWO_WIRES";
case TT_MAZDA_MIATA_NA:
return "TT_MAZDA_MIATA_NA";
case TT_MAZDA_MIATA_NB:
return "TT_MAZDA_MIATA_NB";
case TT_MAZDA_MIATA_NB1:
return "TT_MAZDA_MIATA_NB1";
case TT_MINI_COOPER_R50:
return "TT_MINI_COOPER_R50";
case TT_MITSU:

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

@ -823,6 +823,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
}
void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) {
enginePins.reset(); // that's mostly important for functional tests
/**
* Let's apply global defaults first
*/
@ -904,8 +905,8 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
case HONDA_600:
setHonda600(PASS_ENGINE_PARAMETER_F);
break;
case MAZDA_MIATA_NB:
setMazdaMiataNbEngineConfiguration(PASS_ENGINE_PARAMETER_F);
case MAZDA_MIATA_NB1:
setMazdaMiataNb1EngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
case MAZDA_323:
setMazda323EngineConfiguration(engineConfiguration);

7
firmware/controllers/algo/rusefi_enums.h
View File

@ -58,7 +58,7 @@ typedef enum {
*/
GY6_139QMB = 8,
MAZDA_MIATA_NB = 9,
MAZDA_MIATA_NB1 = 9,
ROVER_V8 = 10,
@ -150,7 +150,10 @@ typedef enum {
TT_FORD_ASPIRE = 1,
TT_DODGE_NEON_1995 = 2,
TT_MAZDA_MIATA_NA = 3,
TT_MAZDA_MIATA_NB = 4,
/**
* NB1 means non-VVT NB, 99 and 00 1.8 engine
*/
TT_MAZDA_MIATA_NB1 = 4,
TT_GM_7X = 5,
TT_MINI_COOPER_R50 = 6,
TT_MAZDA_SOHC_4 = 7,

4
firmware/controllers/settings.cpp
View File

@ -143,8 +143,8 @@ const char* getConfigurationName(engine_type_e engineType) {
return "Fordi6";
case GY6_139QMB:
return "Gy6139";
case MAZDA_MIATA_NB:
return "MiataNB";
case MAZDA_MIATA_NB1:
return "MiataNB1";
case MAZDA_323:
return "M323";
case SATURN_ION_2004:

4
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -471,8 +471,8 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
initializeMazdaMiataNaShape(triggerShape PASS_ENGINE_PARAMETER);
break;
case TT_MAZDA_MIATA_NB:
initializeMazdaMiataNbShape(triggerShape PASS_ENGINE_PARAMETER);
case TT_MAZDA_MIATA_NB1:
initializeMazdaMiataNb1Shape(triggerShape PASS_ENGINE_PARAMETER);
break;
case TT_MIATA_VVT:

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

@ -50,7 +50,7 @@ void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) {
s->useOnlyPrimaryForSync = true;
}
void initializeMazdaMiataNbShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) {
void initializeMazdaMiataNb1Shape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) {
s->initialize(FOUR_STROKE_CAM_SENSOR, true);
s->setTriggerSynchronizationGap(0.11f);
s->useRiseEdge = false;

2
firmware/controllers/trigger/trigger_mazda.h
View File

@ -14,7 +14,7 @@
#define MIATA_NA_GAP 1.4930f
void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S);
void initializeMazdaMiataNbShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S);
void initializeMazdaMiataNb1Shape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S);
void configureMazdaProtegeSOHC(TriggerShape *s DECLARE_ENGINE_PARAMETER_S);
void configureMazdaProtegeLx(TriggerShape *s DECLARE_ENGINE_PARAMETER_S);