From 2781a25bb4358f48fca26fa58c6dcf18513d1e3e Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 17 Dec 2017 00:37:52 -0500 Subject: [PATCH] removing dead code --- firmware/console/status_loop.cpp | 34 +---------------- firmware/controllers/algo/rusefi_outputs.h | 43 ---------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 firmware/controllers/algo/rusefi_outputs.h diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 9520111824..1c092214e7 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -57,7 +57,6 @@ #include "engine.h" #include "lcd_controller.h" #include "settings.h" -#include "rusefi_outputs.h" extern fuel_Map3D_t veMap; extern afr_Map3D_t afrMap; @@ -79,8 +78,6 @@ extern bool main_loop_started; #include "fsio_impl.h" #endif /* EFI_FSIO */ -static bool subscription[(int) RO_LAST_ELEMENT]; - // this 'true' value is needed for simulator static volatile bool fullLog = true; int warningEnabled = true; @@ -357,19 +354,7 @@ static void printState(void) { // ITM_SendChar(msg[i]); // } - if (subscription[(int) RO_TOTAL_REVOLUTION_COUNTER]) - debugInt(&logger, "ckp_c", getCrankEventCounter()); - if (subscription[(int) RO_RUNNING_REVOLUTION_COUNTER]) - debugInt(&logger, "ckp_r", engine->triggerCentral.triggerState.runningRevolutionCounter); - if (subscription[(int) RO_RUNNING_TRIGGER_ERROR]) - debugInt(&logger, "trg_r_errors", engine->triggerCentral.triggerState.runningTriggerErrorCounter); - - if (subscription[(int) RO_RUNNING_ORDERING_TRIGGER_ERROR]) - debugInt(&logger, "trg_r_order_errors", engine->triggerCentral.triggerState.runningOrderingErrorCounter); - - if (subscription[(int) RO_WAVE_CHART_CURRENT_SIZE]) - debugInt(&logger, "wave_chart_current", 0); // debugInt(&logger, "idl", getIdleSwitch()); @@ -785,7 +770,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ } break; case DBG_FSIO_EXPRESSION: -#if EFI_FSIO || defined(__DOXYGEN__) +#if EFI_PROD_CODE && EFI_FSIO || defined(__DOXYGEN__) tsOutputChannels->debugFloatField1 = getFsioOutputValue(0 PASS_ENGINE_PARAMETER_SUFFIX); tsOutputChannels->debugFloatField2 = getFsioOutputValue(1 PASS_ENGINE_PARAMETER_SUFFIX); tsOutputChannels->debugFloatField3 = getFsioOutputValue(2 PASS_ENGINE_PARAMETER_SUFFIX); @@ -820,7 +805,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->debugFloatField7 = (engineConfiguration->afr.hwChannel != EFI_ADC_NONE) ? getVoltageDivided("ego", engineConfiguration->afr.hwChannel) : 0.0f; break; case DBG_INSTANT_RPM: - int prevIndex; { float instantRpm = engine->triggerCentral.triggerState.instantRpm; tsOutputChannels->debugFloatField1 = instantRpm; @@ -915,14 +899,6 @@ void prepareTunerStudioOutputs(void) { #endif /* EFI_TUNER_STUDIO */ -static void subscribe(int outputOrdinal) { - subscription[outputOrdinal] = true; -} - -static void unsubscribe(int outputOrdinal) { - subscription[outputOrdinal] = false; -} - void initStatusLoop(void) { setFullLog(INITIAL_FULL_LOG); addConsoleActionI(FULL_LOGGING_KEY, setFullLog); @@ -934,15 +910,7 @@ void initStatusLoop(void) { #endif #if EFI_PROD_CODE || defined(__DOXYGEN__) - subscription[(int) RO_TRG1_DUTY] = true; - subscription[(int) RO_TRG2_DUTY] = true; - subscription[(int) RO_TRG3_DUTY] = false; - subscription[(int) RO_TRG4_DUTY] = false; - subscription[(int) RO_TOTAL_REVOLUTION_COUNTER] = true; - subscription[(int) RO_RUNNING_REVOLUTION_COUNTER] = false; - addConsoleActionI("subscribe", subscribe); - addConsoleActionI("unsubscribe", unsubscribe); addConsoleActionI("set_led_blinking_period", setBlinkingPeriod); addConsoleAction("status", printStatus); diff --git a/firmware/controllers/algo/rusefi_outputs.h b/firmware/controllers/algo/rusefi_outputs.h deleted file mode 100644 index f52f8992ad..0000000000 --- a/firmware/controllers/algo/rusefi_outputs.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file rusefi_outputs.h - * - * rusEfi output channels enum is needed for subscription/un-subscription - * - * @date Jan 17, 2015 - * @author Andrey Belomutskiy, (c) 2012-2017 - */ -#ifndef CONTROLLERS_ALGO_RUSEFI_OUTPUTS_H_ -#define CONTROLLERS_ALGO_RUSEFI_OUTPUTS_H_ - -/** - * this enum is part of the console protocol API, it should be in sync with com/rusefi/OutputChannel.java - */ - -/** - * For example, - * subscribe 10 - * unsubscribe 9 - */ - -typedef enum { - RO_TPS_ADC_VALUE = 0, - RO_MAF = 1, - RO_MAP = 2, - RO_TRG1_DUTY = 3, - RO_TRG2_DUTY = 4, - RO_TRG3_DUTY = 5, - RO_TRG4_DUTY = 6, - RO_INJECTOR_LAG = 7, - RO_VBATT = 8, - RO_TOTAL_REVOLUTION_COUNTER = 9, - RO_RUNNING_REVOLUTION_COUNTER = 10, - RO_WAVE_CHART_CURRENT_SIZE = 11, - RO_RUNNING_TRIGGER_ERROR = 12, - RO_RUNNING_ORDERING_TRIGGER_ERROR = 13, - - RO_LAST_ELEMENT = 14 -} rusefi_output_e; - - - -#endif /* CONTROLLERS_ALGO_RUSEFI_OUTPUTS_H_ */