From d0644c38416f8fdd37ec8b84a13d81c0b19690e1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 27 May 2019 11:43:34 -0400 Subject: [PATCH] refactoring - fancier C++ --- firmware/util/containers/table_helper.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/firmware/util/containers/table_helper.h b/firmware/util/containers/table_helper.h index ff5f369da6..ea4bee0994 100644 --- a/firmware/util/containers/table_helper.h +++ b/firmware/util/containers/table_helper.h @@ -23,15 +23,15 @@ class Map3D { public: Map3D(const char*name); Map3D(const char*name, float multiplier); - void create(const char*name, float multiplier); void init(vType table[RPM_BIN_SIZE][LOAD_BIN_SIZE], const float loadBins[LOAD_BIN_SIZE], const float rpmBins[RPM_BIN_SIZE]); float getValue(float xRpm, float y); void setAll(vType value); vType *pointers[LOAD_BIN_SIZE]; private: - const float *loadBins; - const float *rpmBins; - bool initialized; + void create(const char*name, float multiplier); + const float *loadBins = NULL; + const float *rpmBins = NULL; + bool initialized = false; const char *name; float multiplier; }; @@ -112,10 +112,7 @@ template void Map3D::create(const char *name, float multiplier) { this->name = name; this->multiplier = multiplier; - initialized = false; memset(&pointers, 0, sizeof(pointers)); - loadBins = NULL; - rpmBins = NULL; } template