From 60d96c4216a93979b5c588e3626a583a990ead84 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 10 Jan 2019 23:48:05 -0500 Subject: [PATCH] refactoring: method name consistency --- firmware/controllers/algo/advance_map.cpp | 2 +- firmware/controllers/algo/advance_map.h | 2 +- firmware/controllers/algo/algo.cpp | 6 +++--- firmware/controllers/algo/fuel_math.cpp | 2 +- firmware/controllers/algo/fuel_math.h | 2 +- firmware/controllers/core/fsio_impl.cpp | 2 +- firmware/controllers/core/fsio_impl.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp index dd27905446..2a95aea6de 100644 --- a/firmware/controllers/algo/advance_map.cpp +++ b/firmware/controllers/algo/advance_map.cpp @@ -185,7 +185,7 @@ void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) { copyTimingTable(defaultIatTiming, config->ignitionIatCorrTable); } -void prepareTimingMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +void initTimingMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // We init both tables in RAM because here we're at a very early stage, with no config settings loaded. advanceMap.init(config->ignitionTable, config->ignitionLoadBins, config->ignitionRpmBins); diff --git a/firmware/controllers/algo/advance_map.h b/firmware/controllers/algo/advance_map.h index 18d3499332..4b1ae18322 100644 --- a/firmware/controllers/algo/advance_map.h +++ b/firmware/controllers/algo/advance_map.h @@ -12,7 +12,7 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX); void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); -void prepareTimingMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void initTimingMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); float getTopAdvanceForBore(chamber_style_e style, int octane, double compression, double bore); float getInitialAdvance(int rpm, float map, float advanceMax); void buildTimingMap(float advanceMax DECLARE_CONFIG_PARAMETER_SUFFIX); diff --git a/firmware/controllers/algo/algo.cpp b/firmware/controllers/algo/algo.cpp index 9c5c3988a9..b82db63fda 100644 --- a/firmware/controllers/algo/algo.cpp +++ b/firmware/controllers/algo/algo.cpp @@ -31,10 +31,10 @@ EXTERN_ENGINE; void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - prepareFuelMap(PASS_ENGINE_PARAMETER_SIGNATURE); - prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE); + initFuelMap(PASS_ENGINE_PARAMETER_SIGNATURE); + initTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE); initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE); - prepareFsio(); + initFsio(); } void initAlgo(Logging *sharedLogger) { diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp index d220d89fe5..56c4849734 100644 --- a/firmware/controllers/algo/fuel_math.cpp +++ b/firmware/controllers/algo/fuel_math.cpp @@ -224,7 +224,7 @@ floatms_t getInjectorLag(float vBatt DECLARE_ENGINE_PARAMETER_SUFFIX) { * @note this method has nothing to do with fuel map VALUES - it's job * is to prepare the fuel map data structure for 3d interpolation */ -void prepareFuelMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +void initFuelMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) { fuelMap.init(config->fuelTable, config->fuelLoadBins, config->fuelRpmBins); fuelPhaseMap.init(config->injectionPhase, config->injPhaseLoadBins, config->injPhaseRpmBins); } diff --git a/firmware/controllers/algo/fuel_math.h b/firmware/controllers/algo/fuel_math.h index cf5bd35d4b..5d2bbf7696 100644 --- a/firmware/controllers/algo/fuel_math.h +++ b/firmware/controllers/algo/fuel_math.h @@ -10,7 +10,7 @@ #include "engine.h" -void prepareFuelMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); +void initFuelMap(DECLARE_ENGINE_PARAMETER_SIGNATURE); /** * @return total injection time into all cylinders, before CLT & IAT corrections diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 7730f05899..ce9eca146e 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -702,7 +702,7 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { } -void prepareFsio(void) { +void initFsio(void) { for (int i = 0; i < FSIO_COMMAND_COUNT; i++) { fsioLogics[i] = NULL; } diff --git a/firmware/controllers/core/fsio_impl.h b/firmware/controllers/core/fsio_impl.h index e6372f519e..99c8d71798 100644 --- a/firmware/controllers/core/fsio_impl.h +++ b/firmware/controllers/core/fsio_impl.h @@ -27,6 +27,6 @@ void runFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE); float getFsioOutputValue(int index DECLARE_ENGINE_PARAMETER_SUFFIX); void applyFsioConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); void onConfigurationChangeFsioCallback(engine_configuration_s *previousConfiguration DECLARE_ENGINE_PARAMETER_SUFFIX); -void prepareFsio(void); +void initFsio(void); #endif /* LE_FUNCTIONS_H_ */