From 55b4e82615b1df055281fea8f6af2b9e372d8464 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 18 Dec 2020 09:01:18 -0500 Subject: [PATCH] naming consistency --- .../config/controllers/algo/auto_generated_enums.cpp | 6 +++--- .../config/controllers/algo/auto_generated_enums.cpp | 6 +++--- firmware/controllers/algo/auto_generated_enums.cpp | 6 +++--- firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/algo/rusefi_enums.h | 2 +- unit_tests/tests/test_issue_898.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) 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 54b39b3726..5e8b61175d 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 Dec 14 23:31:45 EST 2020 +// 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 Fri Dec 18 08:54:10 EST 2020 // see also gen_config_and_enums.bat @@ -879,8 +879,6 @@ case HONDA_ACCORD_CD_DIP: return "HONDA_ACCORD_CD_DIP"; case HONDA_ACCORD_CD_TWO_WIRES: return "HONDA_ACCORD_CD_TWO_WIRES"; -case ISSUE_898: - return "ISSUE_898"; case LADA_KALINA: return "LADA_KALINA"; case MAZDA_626: @@ -963,6 +961,8 @@ case TEST_ISSUE_366_BOTH: return "TEST_ISSUE_366_BOTH"; case TEST_ISSUE_366_RISE: return "TEST_ISSUE_366_RISE"; +case TEST_ISSUE_898: + return "TEST_ISSUE_898"; case TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case TOYOTA_2JZ_GTE_VVTi: 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 10b80dab82..6fa2724b55 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 Dec 14 23:31:45 EST 2020 +// 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 Fri Dec 18 08:54:09 EST 2020 // see also gen_config_and_enums.bat @@ -675,8 +675,6 @@ case HONDA_ACCORD_CD_DIP: return "HONDA_ACCORD_CD_DIP"; case HONDA_ACCORD_CD_TWO_WIRES: return "HONDA_ACCORD_CD_TWO_WIRES"; -case ISSUE_898: - return "ISSUE_898"; case LADA_KALINA: return "LADA_KALINA"; case MAZDA_626: @@ -759,6 +757,8 @@ case TEST_ISSUE_366_BOTH: return "TEST_ISSUE_366_BOTH"; case TEST_ISSUE_366_RISE: return "TEST_ISSUE_366_RISE"; +case TEST_ISSUE_898: + return "TEST_ISSUE_898"; case TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case TOYOTA_2JZ_GTE_VVTi: diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 30b542b988..c106222833 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 Dec 14 23:31:45 EST 2020 +// 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 Fri Dec 18 08:54:09 EST 2020 // see also gen_config_and_enums.bat @@ -821,8 +821,6 @@ case HONDA_ACCORD_CD_DIP: return "HONDA_ACCORD_CD_DIP"; case HONDA_ACCORD_CD_TWO_WIRES: return "HONDA_ACCORD_CD_TWO_WIRES"; -case ISSUE_898: - return "ISSUE_898"; case LADA_KALINA: return "LADA_KALINA"; case MAZDA_626: @@ -905,6 +903,8 @@ case TEST_ISSUE_366_BOTH: return "TEST_ISSUE_366_BOTH"; case TEST_ISSUE_366_RISE: return "TEST_ISSUE_366_RISE"; +case TEST_ISSUE_898: + return "TEST_ISSUE_898"; case TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case TOYOTA_2JZ_GTE_VVTi: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index a7139e018a..9fbf7cd737 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1186,7 +1186,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case TEST_ISSUE_366_RISE: setTestEngineIssue366rise(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case ISSUE_898: + case TEST_ISSUE_898: setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE); break; #endif // EFI_UNIT_TEST diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 3f1b66bc61..c61979ba3a 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -101,7 +101,7 @@ typedef enum { // used by unit test // see https://github.com/rusefi/rusefi/issues/898 // see TriggerWaveform::bothFrontsRequired - ISSUE_898 = 27, + TEST_ISSUE_898 = 27, MAZDA_626 = 28, diff --git a/unit_tests/tests/test_issue_898.cpp b/unit_tests/tests/test_issue_898.cpp index e032141050..a613c34085 100644 --- a/unit_tests/tests/test_issue_898.cpp +++ b/unit_tests/tests/test_issue_898.cpp @@ -16,7 +16,7 @@ static void boardConfigurationForIssue898(engine_configuration_s *engineConfigur } TEST(issues, issue898) { - EngineTestHelper eth(ISSUE_898, &boardConfigurationForIssue898); + EngineTestHelper eth(TEST_ISSUE_898, &boardConfigurationForIssue898); EXPAND_EngineTestHelper; ASSERT_EQ(TRUE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "MRE_MIATA_NA6 shapeDefinitionError";