diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 7db047b026..bb4549f7e8 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 08 16:09:52 EST 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 08 16:33:36 EST 2021 // see also gen_config_and_enums.bat @@ -971,8 +971,6 @@ case TEST_ISSUE_366_RISE: return "TEST_ISSUE_366_RISE"; case TEST_ISSUE_898: return "TEST_ISSUE_898"; -case TEST_QUAD_CAM: - return "TEST_QUAD_CAM"; case TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case TOYOTA_2JZ_GTE_VVTi: @@ -983,6 +981,8 @@ case UNUSED_33: return "UNUSED_33"; case UNUSED_34: return "UNUSED_34"; +case UNUSED_36: + return "UNUSED_36"; case VAG_18_TURBO: return "VAG_18_TURBO"; case VW_ABA: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index ed480864b2..2f597ead8f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 08 16:09:52 EST 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 08 16:33:35 EST 2021 // see also gen_config_and_enums.bat @@ -767,8 +767,6 @@ case TEST_ISSUE_366_RISE: return "TEST_ISSUE_366_RISE"; case TEST_ISSUE_898: return "TEST_ISSUE_898"; -case TEST_QUAD_CAM: - return "TEST_QUAD_CAM"; case TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case TOYOTA_2JZ_GTE_VVTi: @@ -779,6 +777,8 @@ case UNUSED_33: return "UNUSED_33"; case UNUSED_34: return "UNUSED_34"; +case UNUSED_36: + return "UNUSED_36"; case VAG_18_TURBO: return "VAG_18_TURBO"; case VW_ABA: diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index b5a8103844..317635c725 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -18,6 +18,7 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setIssue898(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setTestQuadCam(DECLARE_CONFIG_PARAMETER_SIGNATURE); void mreBoardOldTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); void mreBoardNewTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 49475e2280..12a6a7f276 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 08 16:09:52 EST 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 08 16:33:35 EST 2021 // see also gen_config_and_enums.bat @@ -945,8 +945,6 @@ case TEST_ISSUE_366_RISE: return "TEST_ISSUE_366_RISE"; case TEST_ISSUE_898: return "TEST_ISSUE_898"; -case TEST_QUAD_CAM: - return "TEST_QUAD_CAM"; case TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case TOYOTA_2JZ_GTE_VVTi: @@ -957,6 +955,8 @@ case UNUSED_33: return "UNUSED_33"; case UNUSED_34: return "UNUSED_34"; +case UNUSED_36: + return "UNUSED_36"; case VAG_18_TURBO: return "VAG_18_TURBO"; case VW_ABA: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 7066b0a36e..b0b34c1e65 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1173,7 +1173,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case TEST_ISSUE_366_RISE: setTestEngineIssue366rise(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case TEST_QUAD_CAM: + case UNUSED_36: case TEST_ISSUE_898: setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index fb82e97690..468c70e17d 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -112,7 +112,7 @@ typedef enum { CAMARO_4 = ET_CAMARO, - TEST_QUAD_CAM = 36, + UNUSED_36 = 36, MRE_SUBARU_EJ18 = ET_MRE_SUBARU_EJ18, diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index aa961ad128..bc28aa2618 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -6,6 +6,18 @@ #include "engine_test_helper.h" TEST(trigger, testQuadCam) { + // setting some weird engine WITH_ENGINE_TEST_HELPER(FORD_ESCORT_GT); + // changing to 'ONE TOOTH' trigger on CRANK with CAM/VVT + setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); + engineConfiguration->useOnlyRisingEdgeForTrigger = true; + engineConfiguration->vvtMode = VVT_2JZ; + engineConfiguration->secondVvtMode = MIATA_NB2; + + eth.setTriggerType(TT_ONE PASS_ENGINE_PARAMETER_SUFFIX); + engineConfiguration->camInputs[0] = GPIOA_10; // we just need to indicate that we have CAM + + ASSERT_EQ( 0, GET_RPM()) << "testCamInput RPM"; + }