From 0800335320c668201a4dbc3ceb13a7f64a3bd98d Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Mon, 13 Nov 2023 18:30:30 -0500
Subject: [PATCH] reducing code duplication

---
 firmware/config/engines/custom_engine.cpp              | 4 ++--
 firmware/config/engines/sachs.cpp                      | 2 +-
 firmware/controllers/actuators/boost_control.cpp       | 2 +-
 firmware/controllers/actuators/electronic_throttle.cpp | 2 +-
 firmware/controllers/algo/engine_configuration.cpp     | 4 ++--
 firmware/controllers/sensors/vr_pwm.cpp                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index 3b498f16a9..b52bad7833 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -658,11 +658,11 @@ void setBoschHDEV_5_injectors() {
 	copyArray(engineConfiguration->hpfpLobeProfileAngle, hardCodedHpfpLobeProfileAngle);
 	setLinearCurve(engineConfiguration->hpfpDeadtimeVoltsBins, 8, 16, 0.5);
 
-	setLinearCurve(engineConfiguration->hpfpTargetRpmBins, 0, 8000, 1);
+	setRpmTableBin(engineConfiguration->hpfpTargetRpmBins);
 	setLinearCurve(engineConfiguration->hpfpTargetLoadBins, 0, 180, 1);
 	setTable(engineConfiguration->hpfpTarget, 5000);
 
-	setLinearCurve(engineConfiguration->hpfpCompensationRpmBins, 0, 8000, 1);
+	setRpmTableBin(engineConfiguration->hpfpCompensationRpmBins);
 	setLinearCurve(engineConfiguration->hpfpCompensationLoadBins, 0.005, 0.120, 0.001);
 
 	// This is the configuration for bosch HDEV 5 injectors
diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp
index 3cf8285f70..15a30b2ee7 100644
--- a/firmware/config/engines/sachs.cpp
+++ b/firmware/config/engines/sachs.cpp
@@ -75,5 +75,5 @@ void setSachs() {
 	// todo: extract a method? figure out something smarter
 	setTimingRpmBin(800, 15000);
 	setLinearCurve(config->veRpmBins, 7000, 15000, 1);
-	setLinearCurve(config->lambdaRpmBins, 500, 7000, 1);
+	setRpmTableBin(config->lambdaRpmBins);
 }
diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp
index 79dc4b04c4..188eaa449e 100644
--- a/firmware/controllers/actuators/boost_control.cpp
+++ b/firmware/controllers/actuators/boost_control.cpp
@@ -220,7 +220,7 @@ void setDefaultBoostParameters() {
 	engineConfiguration->boostPid.minValue = -20;
 	engineConfiguration->boostControlPinMode = OM_DEFAULT;
 
-	setLinearCurve(config->boostRpmBins, 0, 8000, 1);
+	setRpmTableBin(config->boostRpmBins);
 	setLinearCurve(config->boostTpsBins, 0, 100, 1);
 
 	for (int loadIndex = 0; loadIndex < BOOST_LOAD_COUNT; loadIndex++) {
diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
index 9369322396..29357e7a39 100644
--- a/firmware/controllers/actuators/electronic_throttle.cpp
+++ b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -924,7 +924,7 @@ void setDefaultEtbParameters() {
 	engineConfiguration->etbRocExpAverageLength = 50;
 
 	setLinearCurve(config->pedalToTpsPedalBins, /*from*/0, /*to*/100, 1);
-	setLinearCurve(config->pedalToTpsRpmBins, /*from*/0, /*to*/8000, 1);
+	setRpmTableBin(config->pedalToTpsRpmBins);
 
 	for (int pedalIndex = 0;pedalIndex<PEDAL_TO_TPS_SIZE;pedalIndex++) {
 		for (int rpmIndex = 0;rpmIndex<PEDAL_TO_TPS_SIZE;rpmIndex++) {
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index ef75de159a..940e91ca51 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -472,9 +472,9 @@ static void setDefaultEngineConfiguration() {
 
 	setDefaultWarmupIdleCorrection();
 
-	setLinearCurve(engineConfiguration->map.samplingAngleBins, 800, 7000, 1);
+	setRpmTableBin(engineConfiguration->map.samplingAngleBins);
 	setLinearCurve(engineConfiguration->map.samplingAngle, 100, 130, 1);
-	setLinearCurve(engineConfiguration->map.samplingWindowBins, 800, 7000, 1);
+	setRpmTableBin(engineConfiguration->map.samplingWindowBins);
 	setLinearCurve(engineConfiguration->map.samplingWindow, 50, 50, 1);
 
 	setLinearCurve(config->vvtTable1LoadBins, 20, 120, 10);
diff --git a/firmware/controllers/sensors/vr_pwm.cpp b/firmware/controllers/sensors/vr_pwm.cpp
index b346de635f..871b1e789e 100644
--- a/firmware/controllers/sensors/vr_pwm.cpp
+++ b/firmware/controllers/sensors/vr_pwm.cpp
@@ -56,7 +56,7 @@ void initVrThresholdPwm() {
 
 void setDefaultVrThresholds() {
 	for (int i = 0;i<VR_THRESHOLD_COUNT;i++) {
-		setLinearCurve(engineConfiguration->vrThreshold[i].rpmBins, 600, 7000, 100);
+		setRpmTableBin(engineConfiguration->vrThreshold[i].rpmBins);
 		setLinearCurve(engineConfiguration->vrThreshold[i].values, 0.6, 1.2, 0.1);
 	}
 }