From 8d843f3cacd2169e80fbda54122d203e8d201b39 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 1 Sep 2024 16:53:40 -0700 Subject: [PATCH] people ask constantly about why this doesn't do what they want --- firmware/console/binary/output_channels.txt | 25 ----------- firmware/controllers/system/efi_gpio.cpp | 38 ----------------- firmware/controllers/system/efi_gpio.h | 3 +- .../controllers/system/injection_gpio.cpp | 41 ------------------- firmware/controllers/system/injection_gpio.h | 2 - 5 files changed, 1 insertion(+), 108 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 8cee4f9370..785a70788f 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -312,31 +312,6 @@ int16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 uint8_t[BOOST_BLEND_COUNT iterate] autoscale boostClosedLoopBlendBias;;"%", 0.5, 0, 0, 100, 1 int16_t[BOOST_BLEND_COUNT iterate] autoscale boostClosedLoopBlendOutput;;"%", 0.1, 0, -1000, 1000, 1 -bit coilState1 -bit coilState2 -bit coilState3 -bit coilState4 -bit coilState5 -bit coilState6 -bit coilState7 -bit coilState8 -bit coilState9 -bit coilState10 -bit coilState11 -bit coilState12 -bit injectorState1 -bit injectorState2 -bit injectorState3 -bit injectorState4 -bit injectorState5 -bit injectorState6 -bit injectorState7 -bit injectorState8 -bit injectorState9 -bit injectorState10 -bit injectorState11 -bit injectorState12 - uint32_t outputRequestPeriod float mapFast float[LUA_GAUGE_COUNT iterate] luaGauges;Lua: Gauge;"value",1, 0, 0, 50000, 3 diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 4c4cfac97d..e1ee37419d 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -419,44 +419,6 @@ IgnitionOutputPin::IgnitionOutputPin() { reset(); } -void IgnitionOutputPin::setHigh() { - NamedOutputPin::setHigh(); - // this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet? - switch (coilIndex) { - case 0: - engine->outputChannels.coilState1 = true; - break; - case 1: - engine->outputChannels.coilState2 = true; - break; - case 2: - engine->outputChannels.coilState3 = true; - break; - case 3: - engine->outputChannels.coilState4 = true; - break; - } -} - -void IgnitionOutputPin::setLow() { - NamedOutputPin::setLow(); - // this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet? - switch (coilIndex) { - case 0: - engine->outputChannels.coilState1 = false; - break; - case 1: - engine->outputChannels.coilState2 = false; - break; - case 2: - engine->outputChannels.coilState3 = false; - break; - case 3: - engine->outputChannels.coilState4 = false; - break; - } -} - void IgnitionOutputPin::reset() { outOfOrder = false; signalFallSparkId = 0; diff --git a/firmware/controllers/system/efi_gpio.h b/firmware/controllers/system/efi_gpio.h index d145d274b0..ebdda648dd 100644 --- a/firmware/controllers/system/efi_gpio.h +++ b/firmware/controllers/system/efi_gpio.h @@ -30,8 +30,7 @@ void turnAllPinsOff(void); class IgnitionOutputPin : public NamedOutputPin { public: IgnitionOutputPin(); - void setHigh() override; - void setLow() override; + void reset(); int signalFallSparkId; bool outOfOrder; // https://sourceforge.net/p/rusefi/tickets/319/ diff --git a/firmware/controllers/system/injection_gpio.cpp b/firmware/controllers/system/injection_gpio.cpp index e562196908..71f571b63b 100644 --- a/firmware/controllers/system/injection_gpio.cpp +++ b/firmware/controllers/system/injection_gpio.cpp @@ -82,44 +82,3 @@ void InjectorOutputPin::close(efitick_t nowNt) { m_overlappingCounter = 0; } } - -void InjectorOutputPin::setHigh() { - NamedOutputPin::setHigh(); - TunerStudioOutputChannels *state = getTunerStudioOutputChannels(); - // this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet? - switch (injectorIndex) { - case 0: - state->injectorState1 = true; - break; - case 1: - state->injectorState2 = true; - break; - case 2: - state->injectorState3 = true; - break; - case 3: - state->injectorState4 = true; - break; - } -} - -void InjectorOutputPin::setLow() { - NamedOutputPin::setLow(); - TunerStudioOutputChannels *state = getTunerStudioOutputChannels(); - // this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet? - switch (injectorIndex) { - case 0: - state->injectorState1 = false; - break; - case 1: - state->injectorState2 = false; - break; - case 2: - state->injectorState3 = false; - break; - case 3: - state->injectorState4 = false; - break; - } -} - diff --git a/firmware/controllers/system/injection_gpio.h b/firmware/controllers/system/injection_gpio.h index 1198faab3f..b44cef2056 100644 --- a/firmware/controllers/system/injection_gpio.h +++ b/firmware/controllers/system/injection_gpio.h @@ -16,8 +16,6 @@ class InjectorOutputPin final : public NamedOutputPin { void open(efitick_t nowNt); void close(efitick_t nowNt); - void setHigh() override; - void setLow() override; int8_t getOverlappingCounter() const { return m_overlappingCounter; }