diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 807d334bee..b8e9176b49 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -88,7 +88,6 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 int16_t autoscale wallFuelCorrectionValue;@@GAUGE_NAME_FUEL_WALL_CORRECTION@@;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 3 uint16_t revolutionCounterSinceStart;;"",1, 0, 0, 0, 0 - int16_t autoscale deltaTpsValue;@@GAUGE_NAME_FUEL_TPS_ROC@@;"ratio",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t canReadCounter;;"",1, 0, 0, 0, 0 int16_t autoscale tpsAccelFuel;@@GAUGE_NAME_FUEL_TPS_EXTRA@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 3 @@ -246,9 +245,6 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 uint16_t autoscale rawMap;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3 uint16_t autoscale rawAfr;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3 - uint8_t tpsAccelFrom;Fuel: TPS AE From;"%", 1, 0, 0, 100, 0 - uint8_t tpsAccelTo;Fuel: TPS AE To;"%", 1, 0, 0, 100, 0 - float calibrationValue2;;"", 1, 0, 0, 0, 0 bit isMainRelayOn; bit isUsbConnected;isUsbConnected\nOriginal reason for this is to check if USB is connected from Lua @@ -269,7 +265,6 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 int16_t autoscale auxLinear2;@@GAUGE_NAME_AUX_LINEAR_2@@;"", 0.01, 0, 0, 0, 2 bit dfcoActive - bit tpsAccelActive uint16_t autoscale fallbackMap;;"kPa", 0.1, 0, 0, 1000, 1 diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 0deb9fdbec..909ebf19a3 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -638,10 +638,6 @@ DcHardware *getdcHardware(); tsOutputChannels->mafMeasured2 = Sensor::getOrZero(SensorType::Maf2); tsOutputChannels->mafEstimate = engine->engineState.airflowEstimate; - // offset 116 - // TPS acceleration - tsOutputChannels->deltaTpsValue = engine->tpsAccelEnrichment.getMaxDelta(); - tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter; tsOutputChannels->orderingErrorCounter = engine->triggerCentral.triggerState.orderingErrorCounter; diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp index 9051d89991..a8a7f75caa 100644 --- a/firmware/controllers/algo/accel_enrichment.cpp +++ b/firmware/controllers/algo/accel_enrichment.cpp @@ -186,10 +186,6 @@ void TpsAccelEnrichment::onNewValue(float currentValue) { // TODO: can deltaTps actually be negative? Will this ever trigger? isBelowDecelThreshold = deltaTps < -engineConfiguration->tpsDecelEnleanmentThreshold; - - engine->outputChannels.tpsAccelActive = isAboveAccelThreshold; - engine->outputChannels.tpsAccelFrom = tpsFrom; - engine->outputChannels.tpsAccelTo = tpsTo; } TpsAccelEnrichment::TpsAccelEnrichment() { diff --git a/firmware/controllers/algo/tps_accel_state.txt b/firmware/controllers/algo/tps_accel_state.txt index b8f0f36058..28c32591c7 100644 --- a/firmware/controllers/algo/tps_accel_state.txt +++ b/firmware/controllers/algo/tps_accel_state.txt @@ -2,14 +2,14 @@ struct_no_prefix tps_accel_state_s custom percent_t 4 scalar, F32, @OFFSET@, "", 1, 0, 0, 100, 2 -percent_t tpsFrom -percent_t tpsTo -percent_t deltaTps +percent_t tpsFrom;Fuel: TPS AE from +percent_t tpsTo;Fuel: TPS AE to +percent_t deltaTps;Fuel: TPS AE change floatms_t extraFuel; float valueFromTable; -bit isAboveAccelThreshold; +bit isAboveAccelThreshold;Fuel: TPS AE Active bit isBelowDecelThreshold; bit isTimeToResetAccumulator;Accel: reset time bit isFractionalEnrichment diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml index 87a302b988..1819d84e9e 100644 --- a/firmware/integration/LiveData.yaml +++ b/firmware/integration/LiveData.yaml @@ -104,6 +104,7 @@ Usages: - name: tps_accel_state java: TpsAccelState.java folder: controllers/algo + prepend: integration/rusefi_config_shared.txt - name: trigger_central java: TriggerCentral.java diff --git a/firmware/integration/rusefi_config_shared.txt b/firmware/integration/rusefi_config_shared.txt index eda3a7aef0..2ad99bb2c6 100644 --- a/firmware/integration/rusefi_config_shared.txt +++ b/firmware/integration/rusefi_config_shared.txt @@ -142,7 +142,6 @@ #define GAUGE_NAME_FUEL_BARO_CORR "Fuel: Barometric pressure mult" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_INJECTOR_LAG "Fuel: injector lag" -#define GAUGE_NAME_FUEL_TPS_ROC "Fuel: TPS AE change" #define GAUGE_NAME_FUEL_CHARGE_TEMP "Fuel: Estimated charge temperature" #define GAUGE_NAME_FUEL_TPS_EXTRA "Fuel: TPS AE add fuel ms" #define GAUGE_NAME_FUEL_CLT_CORR "Fuel: CLT correction"