From 7e2f36fbdc0a200a4c83330a415a0776295e7d08 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 3 May 2024 20:54:52 -0400 Subject: [PATCH] only: KNOCK_TABLE_SIZE --- firmware/controllers/engine_cycle/knock_logic.h | 2 +- firmware/integration/rusefi_config.txt | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/engine_cycle/knock_logic.h b/firmware/controllers/engine_cycle/knock_logic.h index 2f7d0ac80b..84d1523b6c 100644 --- a/firmware/controllers/engine_cycle/knock_logic.h +++ b/firmware/controllers/engine_cycle/knock_logic.h @@ -48,5 +48,5 @@ public: float getMaximumRetard() const override; private: - Map3D<6, 6, uint8_t, uint8_t, uint8_t> m_maxRetardTable; + Map3D m_maxRetardTable; }; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c2a055ab78..5d4f12554e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1897,9 +1897,11 @@ int8_t[ETB2_TRIM_SIZE x ETB2_TRIM_SIZE] autoscale throttle2TrimTable;;"%", 0.1, uint8_t[ETB2_TRIM_SIZE] throttle2TrimTpsBins;;"%", 1, 0, 0, 120, 0 uint8_t[ETB2_TRIM_SIZE] autoscale throttle2TrimRpmBins;;"RPM", 100, 0, 0, 25000, 0 -uint8_t[6 x 6] autoscale maxKnockRetardTable;;"deg", 0.25, 0, 0, 30, 2 -uint8_t[6] maxKnockRetardLoadBins;;"%", 1, 0, 0, 250, 0 -uint8_t[6] autoscale maxKnockRetardRpmBins;;"RPM", 100, 0, 0, 25000, 0 +#define KNOCK_TABLE_SIZE 6 + +uint8_t[KNOCK_TABLE_SIZE x KNOCK_TABLE_SIZE] autoscale maxKnockRetardTable;;"deg", 0.25, 0, 0, 30, 2 +uint8_t[KNOCK_TABLE_SIZE] maxKnockRetardLoadBins;;"%", 1, 0, 0, 250, 0 +uint8_t[KNOCK_TABLE_SIZE] autoscale maxKnockRetardRpmBins;;"RPM", 100, 0, 0, 25000, 0 int16_t[4 x 4] autoscale ALSTimingRetardTable;;"deg", 0.1, 0, -60, 0, 1 uint16_t[4] alsIgnRetardLoadBins;;"TPS", 1, 0, 0, 100, 0