diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index f048dfb820..29e0b705b5 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -100,15 +100,12 @@ extern int icuWidthPeriodCounter; extern WaveChart waveChart; #endif /* EFI_ENGINE_SNIFFER */ -// this 'true' value is needed for simulator -static volatile bool fullLog = true; int warningEnabled = true; -//int warningEnabled = FALSE; extern bool hasFirmwareErrorFlag; extern int maxTriggerReentraint; extern uint32_t maxLockedDuration; -#define FULL_LOGGING_KEY "fl" + #if !defined(STATUS_LOGGING_BUFFER_SIZE) #define STATUS_LOGGING_BUFFER_SIZE 1800 @@ -406,9 +403,6 @@ void writeLogLine(void) { #endif /* EFI_FILE_LOGGING */ } -#define INITIAL_FULL_LOG TRUE -//#define INITIAL_FULL_LOG FALSE - volatile int needToReportStatus = FALSE; static int prevCkpEventCounter = -1; @@ -1037,8 +1031,6 @@ void prepareTunerStudioOutputs(void) { #endif /* EFI_TUNER_STUDIO */ void initStatusLoop(void) { - setFullLog(INITIAL_FULL_LOG); - addConsoleActionI(FULL_LOGGING_KEY, setFullLog); addConsoleActionI("warn", setWarningEnabled); #if EFI_ENGINE_CONTROL @@ -1063,13 +1055,3 @@ void startStatusThreads(void) { lcdInstance.Start(); #endif /* EFI_LCD */ } - -void setFullLog(int value) { - print("Setting full logging: %s\r\n", boolToString(value)); - printMsg(&logger, "%s%d", FULL_LOGGING_KEY, value); - fullLog = value; -} - -bool getFullLog(void) { - return fullLog; -} diff --git a/firmware/console/status_loop.h b/firmware/console/status_loop.h index a4e85cf8e9..54dac6d5b7 100644 --- a/firmware/console/status_loop.h +++ b/firmware/console/status_loop.h @@ -2,11 +2,10 @@ * @file status_loop.h * * @date Mar 15, 2013 - * @author Andrey Belomutskiy, (c) 2012-2017 + * @author Andrey Belomutskiy, (c) 2012-2019 */ -#ifndef CONSOLE_LOOP_H_ -#define CONSOLE_LOOP_H_ +#pragma once #include "engine.h" @@ -15,7 +14,4 @@ void prepareTunerStudioOutputs(void); void startStatusThreads(void); void initStatusLoop(void); void writeLogLine(void); -void setFullLog(int value); void printOverallStatus(systime_t nowSeconds); - -#endif /* CONSOLE_LOOP_H_ */ diff --git a/firmware/development/engine_emulator.cpp b/firmware/development/engine_emulator.cpp index bbd28ac21a..2598da02be 100644 --- a/firmware/development/engine_emulator.cpp +++ b/firmware/development/engine_emulator.cpp @@ -41,7 +41,6 @@ static void emulate(void) { print("Emulating...\r\n"); setDiag(1); chThdSleep(1); - setFullLog(1); for (int i = 400; i <= 1300; i++) { if (i % 50 != 0) @@ -52,7 +51,6 @@ static void emulate(void) { setTriggerEmulatorRPM(0 PASS_ENGINE_PARAMETER_SUFFIX); - setFullLog(0); setDiag(0); chThdSleep(1); print("Emulation DONE!\r\n"); diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index 1e53fdc0d7..d6dfb342c1 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -46,7 +46,6 @@ public class AutoTest { // let's make sure 'burn' command works since sometimes it does not bp.burn(Logger.CONSOLE); - sendCommand("fl 1"); // just in case it was disabled sendCommand(getDisableCommand(Fields.CMD_TRIGGER_HW_INPUT)); testCustomEngine(); testMazdaMiata2003(); diff --git a/java_console/ui/src/com/rusefi/ui/widgets/LogModeWidget.java b/java_console/ui/src/com/rusefi/ui/widgets/LogModeWidget.java deleted file mode 100644 index 4ff6833b7d..0000000000 --- a/java_console/ui/src/com/rusefi/ui/widgets/LogModeWidget.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.rusefi.ui.widgets; - -import com.rusefi.io.CommandQueue; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -/** - * Date: 3/29/13 - * (c) Andrey Belomutskiy - */ -public class LogModeWidget { - private final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - - private final JCheckBox mode = new JCheckBox("full logging"); - - public LogModeWidget() { - panel.setBorder(BorderFactory.createLineBorder(Color.black)); - panel.add(mode); - - mode.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - int code = mode.isSelected() ? 1 : 0; - CommandQueue.getInstance().write("fl " + code); - } - }); - } - - public JPanel getPanel() { - return panel; - } -}