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

auto-sync

This commit is contained in:
rusEfi 2015-05-15 21:05:02 -04:00
parent 44df00ff83
commit 808a4f6233
9 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/GY6_139QMB.cpp
View File

@ -76,8 +76,6 @@ static void setDefault139qmbMaps(DECLARE_ENGINE_PARAMETER_F) {
} }
void setGy6139qmbDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { void setGy6139qmbDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
setDefault139qmbMaps(PASS_ENGINE_PARAMETER_F); setDefault139qmbMaps(PASS_ENGINE_PARAMETER_F);
// engineConfiguration->map.sensor.type = MT_3V_SENSOR; // engineConfiguration->map.sensor.type = MT_3V_SENSOR;
initEgoSensor(&engineConfiguration->afr, ES_NarrowBand); initEgoSensor(&engineConfiguration->afr, ES_NarrowBand);

2
firmware/config/engines/gm_2_2.cpp
View File

@ -14,8 +14,6 @@ EXTERN_ENGINE
; ;
void setGm2_2(DECLARE_ENGINE_PARAMETER_F) { void setGm2_2(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR);
engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2; engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2;

3
firmware/config/engines/honda_accord.cpp
View File

@ -31,12 +31,9 @@ void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) {
EXTERN_ENGINE; EXTERN_ENGINE;
static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) { static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->map.sensor.type = MT_DENSO183; engineConfiguration->map.sensor.type = MT_DENSO183;
boardConfiguration->isFastAdcEnabled = true; boardConfiguration->isFastAdcEnabled = true;
engineConfiguration->ignitionMode = IM_ONE_COIL; engineConfiguration->ignitionMode = IM_ONE_COIL;
engineConfiguration->injectionMode = IM_BATCH; engineConfiguration->injectionMode = IM_BATCH;

1
firmware/config/engines/mazda_626.cpp
View File

@ -21,7 +21,6 @@ EXTERN_ENGINE;
void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4; engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
engineConfiguration->engineChartSize = 150; engineConfiguration->engineChartSize = 150;

8
firmware/config/engines/mazda_miata.cpp
View File

@ -128,7 +128,6 @@ static void setDefaultCrankingFuel(engine_configuration_s *engineConfiguration)
EXTERN_ENGINE; EXTERN_ENGINE;
static void commonMiataNa(DECLARE_ENGINE_PARAMETER_F) { static void commonMiataNa(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA;
engineConfiguration->engineChartSize = 100; engineConfiguration->engineChartSize = 100;
@ -202,8 +201,6 @@ static void common079721_2351(engine_configuration_s *engineConfiguration, board
} }
void setMiata1990(DECLARE_ENGINE_PARAMETER_F) { void setMiata1990(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
common079721_2351(engineConfiguration, boardConfiguration); common079721_2351(engineConfiguration, boardConfiguration);
commonMiataNa(PASS_ENGINE_PARAMETER_F); commonMiataNa(PASS_ENGINE_PARAMETER_F);
@ -238,7 +235,6 @@ void setMiata1990(DECLARE_ENGINE_PARAMETER_F) {
* set_engine_type 14 * set_engine_type 14
*/ */
void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4; engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
common079721_2351(engineConfiguration, boardConfiguration); common079721_2351(engineConfiguration, boardConfiguration);
@ -363,7 +359,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
} }
static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_F) { static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
commonMiataNa(PASS_ENGINE_PARAMETER_F); commonMiataNa(PASS_ENGINE_PARAMETER_F);
engineConfiguration->specs.displacement = 1.839; engineConfiguration->specs.displacement = 1.839;
@ -438,7 +433,6 @@ static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_F) {
* set_engine_type 20 * set_engine_type 20
*/ */
void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) { void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
setMiata1994_common(PASS_ENGINE_PARAMETER_F); setMiata1994_common(PASS_ENGINE_PARAMETER_F);
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2; engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
/** /**
@ -454,7 +448,6 @@ void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) {
} }
void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) { void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
setMiata1994_common(PASS_ENGINE_PARAMETER_F); setMiata1994_common(PASS_ENGINE_PARAMETER_F);
engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2; engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2;
@ -501,7 +494,6 @@ void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) {
* Tom tomiata, Frankenstein board * Tom tomiata, Frankenstein board
*/ */
void setMiata1996(DECLARE_ENGINE_PARAMETER_F) { void setMiata1996(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
commonMiataNa(PASS_ENGINE_PARAMETER_F); commonMiataNa(PASS_ENGINE_PARAMETER_F);
engineConfiguration->specs.displacement = 1.839; engineConfiguration->specs.displacement = 1.839;

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

@ -13,7 +13,6 @@
EXTERN_ENGINE; EXTERN_ENGINE;
void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
// set_rpm_hard_limit 3000 // set_rpm_hard_limit 3000
engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now

1
firmware/config/engines/mitsubishi.cpp
View File

@ -16,7 +16,6 @@
EXTERN_ENGINE; EXTERN_ENGINE;
void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_F) { void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->engineType = MITSU_4G93; engineConfiguration->engineType = MITSU_4G93;
engineConfiguration->trigger.type = TT_MITSU; engineConfiguration->trigger.type = TT_MITSU;

6
unit_tests/engine_test_helper.cpp
View File

@ -17,6 +17,7 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
ec = &persistentConfig.engineConfiguration; ec = &persistentConfig.engineConfiguration;
engineConfiguration = ec; engineConfiguration = ec;
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
persistent_config_s *config = &persistentConfig; persistent_config_s *config = &persistentConfig;
setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5); setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5);
@ -49,9 +50,10 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
void EngineTestHelper::fireTriggerEvents() { void EngineTestHelper::fireTriggerEvents() {
for (int i = 0; i < 24; i++) { for (int i = 0; i < 24; i++) {
timeNow += 5000; // 5ms timeNow += 5000; // 5ms
triggerCentral.handleShaftSignal(SHAFT_PRIMARY_UP, &engine, engine.engineConfiguration, &persistentConfig); board_configuration_s * boardConfiguration = &engine.engineConfiguration->bc;
triggerCentral.handleShaftSignal(SHAFT_PRIMARY_UP, &engine, engine.engineConfiguration, &persistentConfig, boardConfiguration);
timeNow += 5000; timeNow += 5000;
triggerCentral.handleShaftSignal(SHAFT_PRIMARY_DOWN, &engine, engine.engineConfiguration, &persistentConfig); triggerCentral.handleShaftSignal(SHAFT_PRIMARY_DOWN, &engine, engine.engineConfiguration, &persistentConfig, boardConfiguration);
} }
} }

11
unit_tests/global.h
View File

@ -38,14 +38,15 @@ typedef int bool_t;
class Engine; class Engine;
#endif #endif
#define DECLARE_ENGINE_PARAMETER_F Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config #define DECLARE_ENGINE_PARAMETER_F Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
#define DECLARE_ENGINE_PARAMETER_S , Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config #define DECLARE_ENGINE_PARAMETER_S , Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
#define PASS_ENGINE_PARAMETER_F engine, engineConfiguration, config #define PASS_ENGINE_PARAMETER_F engine, engineConfiguration, config, boardConfiguration
#define PASS_ENGINE_PARAMETER , engine, engineConfiguration, config #define PASS_ENGINE_PARAMETER , engine, engineConfiguration, config, boardConfiguration
#define EXPAND_EngineTestHelper Engine *engine = &eth.engine; \ #define EXPAND_EngineTestHelper Engine *engine = &eth.engine; \
engine_configuration_s *engineConfiguration = engine->engineConfiguration; \ engine_configuration_s *engineConfiguration = engine->engineConfiguration; \
persistent_config_s *config = engine->config; persistent_config_s *config = engine->config; \
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
#define CONFIG(x) engineConfiguration->x #define CONFIG(x) engineConfiguration->x
#define ENGINE(x) engine->x #define ENGINE(x) engine->x