From 6fd456559bad9babf4e6b4df82e8b245b65c468e Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Wed, 18 Sep 2024 22:26:43 -0700
Subject: [PATCH] RegisteredNamedOutputPin fix #285

---
 firmware/controllers/system/efi_gpio.cpp | 8 +-------
 firmware/controllers/system/efi_gpio.h   | 8 +-------
 firmware/integration/rusefi_config.txt   | 1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp
index e1ee37419d..50e4fee26b 100644
--- a/firmware/controllers/system/efi_gpio.cpp
+++ b/firmware/controllers/system/efi_gpio.cpp
@@ -62,10 +62,6 @@ static const char* const auxValveShortNames[] = { "a1", "a2"};
 
 static RegisteredOutputPin * registeredOutputHead = nullptr;
 
-RegisteredNamedOutputPin::RegisteredNamedOutputPin(const char *name, size_t pinOffset,
-		size_t pinModeOffset) : RegisteredOutputPin(name, pinOffset, pinModeOffset) {
-}
-
 RegisteredOutputPin::RegisteredOutputPin(const char *registrationName, size_t pinOffset,
 		size_t pinModeOffset)
 	: next(registeredOutputHead)
@@ -140,7 +136,7 @@ void RegisteredOutputPin::unregister() {
 
 EnginePins::EnginePins() :
 		mainRelay("Main Relay", CONFIG_PIN_OFFSETS(mainRelay)),
-		hpfpValve("HPFP Valve", CONFIG_PIN_OFFSETS(hpfpValve)),
+		hpfpValve("HPFP", CONFIG_PIN_OFFSETS(hpfpValve)),
 		starterControl("Starter Relay", CONFIG_PIN_OFFSETS(starterControl)),
 		starterRelayDisable("Starter Disable Relay", CONFIG_PIN_OFFSETS(starterRelayDisable)),
 		fanRelay("Fan Relay", CONFIG_PIN_OFFSETS(fan)),
@@ -157,8 +153,6 @@ EnginePins::EnginePins() :
 		tachOut("tachOut", CONFIG_PIN_OFFSETS(tachOutput)),
 		speedoOut("speedoOut", CONFIG_OFFSET(speedometerOutputPin))
 {
-	hpfpValve.setName(PROTOCOL_HPFP_NAME);
-
 	static_assert(efi::size(sparkNames) >= MAX_CYLINDER_COUNT, "Too many ignition pins");
 	static_assert(efi::size(trailNames) >= MAX_CYLINDER_COUNT, "Too many ignition pins");
 	static_assert(efi::size(injectorNames) >= MAX_CYLINDER_COUNT, "Too many injection pins");
diff --git a/firmware/controllers/system/efi_gpio.h b/firmware/controllers/system/efi_gpio.h
index ebdda648dd..3b82eb17dc 100644
--- a/firmware/controllers/system/efi_gpio.h
+++ b/firmware/controllers/system/efi_gpio.h
@@ -57,12 +57,6 @@ class RegisteredOutputPin : public virtual OutputPin {
 	const uint16_t m_pinModeOffset;
 	bool isPinConfigurationChanged();
 };
-
-class RegisteredNamedOutputPin : public RegisteredOutputPin, public NamedOutputPin {
-public:
-	RegisteredNamedOutputPin(const char* name, size_t pinOffset, size_t pinModeOffset);
-};
-
 class EnginePins {
 public:
 	EnginePins();
@@ -75,7 +69,7 @@ class EnginePins {
 	/**
 	 * High Pressure Fuel Pump valve control
 	 */
-	RegisteredNamedOutputPin hpfpValve;
+	RegisteredOutputPin hpfpValve;
 	// this one cranks engine
 	RegisteredOutputPin starterControl;
 	// this one prevents driver from cranking engine
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 67f9ce9563..80509dc198 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1834,7 +1834,6 @@ end_struct
 #define PROTOCOL_VVT2_NAME "VVT2"
 #define PROTOCOL_VVT3_NAME "VVT3"
 #define PROTOCOL_VVT4_NAME "VVT4"
-#define PROTOCOL_HPFP_NAME "hpfp"
 
 #define PROTOCOL_WA_CHANNEL_1 "input1"
 #define PROTOCOL_WA_CHANNEL_2 "input2"