From a20f353506a9c253da9703fb891d252e7068a280 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 18 Sep 2019 17:23:14 -0700 Subject: [PATCH] Kill Dead Code 2: Electric Boogaloo (#940) * remove dead * remove dead * deflex --- firmware/controllers/sensors/allsensors.cpp | 1 - firmware/controllers/sensors/allsensors.h | 1 - firmware/controllers/sensors/flex_fuel.cpp | 26 --------------------- firmware/controllers/sensors/flex_fuel.h | 13 ----------- firmware/controllers/sensors/sensors.mk | 1 - firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 1 - 7 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 firmware/controllers/sensors/flex_fuel.cpp delete mode 100644 firmware/controllers/sensors/flex_fuel.h diff --git a/firmware/controllers/sensors/allsensors.cpp b/firmware/controllers/sensors/allsensors.cpp index f28a81d94d..fce99e3758 100644 --- a/firmware/controllers/sensors/allsensors.cpp +++ b/firmware/controllers/sensors/allsensors.cpp @@ -15,7 +15,6 @@ EXTERN_ENGINE; void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { initThermistors(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); initMapDecoder(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); - initFlexFuelSensor(); } bool hasAcToggle(DECLARE_ENGINE_PARAMETER_SIGNATURE) { diff --git a/firmware/controllers/sensors/allsensors.h b/firmware/controllers/sensors/allsensors.h index f6029a41f0..5c8f79c63d 100644 --- a/firmware/controllers/sensors/allsensors.h +++ b/firmware/controllers/sensors/allsensors.h @@ -20,7 +20,6 @@ #include "voltage.h" #include "thermistors.h" #include "oil_pressure.h" -#include "flex_fuel.h" #include "adc_inputs.h" #include "analog_input.h" diff --git a/firmware/controllers/sensors/flex_fuel.cpp b/firmware/controllers/sensors/flex_fuel.cpp deleted file mode 100644 index 7274fc7618..0000000000 --- a/firmware/controllers/sensors/flex_fuel.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * @file flex_fuel.cpp - * - * GM 12568450 - * GM 12570260 - * GM 13577394 - * GM 13577429 - * - * @author Andrey Belomutskiy, (c) 2012-2018 - * @date Jan 22, 2018 - */ - -#ifndef CONTROLLERS_SENSORS_FLEX_FUEL_CPP_ -#define CONTROLLERS_SENSORS_FLEX_FUEL_CPP_ - -#include "engine.h" - -EXTERN_ENGINE -; - -void initFlexFuelSensor() { - -} - - -#endif /* CONTROLLERS_SENSORS_FLEX_FUEL_CPP_ */ diff --git a/firmware/controllers/sensors/flex_fuel.h b/firmware/controllers/sensors/flex_fuel.h deleted file mode 100644 index 1b860b25e4..0000000000 --- a/firmware/controllers/sensors/flex_fuel.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * @file flex_fuel.h - * - * @author Andrey Belomutskiy, (c) 2012-2018 - * @date Jan 22, 2018 - */ - -#ifndef CONTROLLERS_SENSORS_FLEX_FUEL_H_ -#define CONTROLLERS_SENSORS_FLEX_FUEL_H_ - -void initFlexFuelSensor(); - -#endif /* CONTROLLERS_SENSORS_FLEX_FUEL_H_ */ diff --git a/firmware/controllers/sensors/sensors.mk b/firmware/controllers/sensors/sensors.mk index c9b4c3d1fa..d7f78ec0f2 100644 --- a/firmware/controllers/sensors/sensors.mk +++ b/firmware/controllers/sensors/sensors.mk @@ -10,5 +10,4 @@ CONTROLLERS_SENSORS_SRC_CPP = $(PROJECT_DIR)/controllers/sensors/thermistors.cp $(PROJECT_DIR)/controllers/sensors/ego.cpp \ $(PROJECT_DIR)/controllers/sensors/maf2map.cpp \ $(PROJECT_DIR)/controllers/sensors/hip9011_lookup.cpp \ - $(PROJECT_DIR)/controllers/sensors/flex_fuel.cpp \ $(PROJECT_DIR)/controllers/sensors/oil_pressure.cpp diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e97105be9b..1060c72c8a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -981,7 +981,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, float[FSIO_CURVE_8] fsioCurve4Bins;;"x", 1, 0, -999, 1000.0, 3 float[FSIO_CURVE_8] fsioCurve4;;"y", 1, 0, -999, 1000.0, 3 - brain_input_pin_e flexFuelSensor;+This is the processor pin your Flex-fuel sensor is connected to, this is a non standard item so the pin will always be user defined. + uint8_t unusedFlexFuelSensor; brain_pin_e test557pin pin_output_mode_e stepperDirectionPinMode; adc_channel_e externalKnockSenseAdc; diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 49ba9182f5..1764d70f3d 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1560,7 +1560,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" field = "Fuel level", fuelLevelSensor - field = "Flex fuel", flexFuelSensor field = "Clutch down switch", clutchDownPin field = "Clutch down inverted", clutchDownPinInverted field = "Clutch up switch", clutchUpPin