diff --git a/java_console/autotest/src/main/java/com/rusefi/common/MiscTest.java b/java_console/autotest/src/main/java/com/rusefi/common/MiscTest.java index 6d872c8196..f0516c7bbb 100644 --- a/java_console/autotest/src/main/java/com/rusefi/common/MiscTest.java +++ b/java_console/autotest/src/main/java/com/rusefi/common/MiscTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import static com.devexperts.util.TimeUtil.SECOND; import static com.rusefi.IoUtil.sleepSeconds; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class MiscTest extends RusefiTestBase { diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java index 532802fb07..cfdc772d00 100644 --- a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java +++ b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java @@ -3,7 +3,6 @@ package com.rusefi.autodetect; import com.devexperts.logging.Logging; import com.rusefi.NamedThreadFactory; import com.rusefi.io.LinkManager; -import com.rusefi.io.serial.BaudRateHolder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java index 7f40184da7..ffd9cdeb3d 100644 --- a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java +++ b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java @@ -6,13 +6,9 @@ import com.rusefi.config.generated.Fields; import com.rusefi.io.IoStream; import com.rusefi.io.commands.HelloCommand; import com.rusefi.io.serial.BufferedSerialIoStream; -import com.rusefi.io.serial.SerialIoStream; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import static com.rusefi.binaryprotocol.IoHelper.checkResponseCode; diff --git a/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java b/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java index f51665d387..8564e7644a 100644 --- a/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java +++ b/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java @@ -1,18 +1,12 @@ package com.rusefi.io; import com.devexperts.logging.Logging; -import com.rusefi.core.RusEfiSignature; -import com.rusefi.core.SignatureHelper; -import com.rusefi.core.io.BundleUtil; import com.rusefi.binaryprotocol.BinaryProtocol; -import com.rusefi.ui.StatusConsumer; import javax.swing.*; import java.io.IOException; import static com.devexperts.logging.Logging.getLogging; -import static com.rusefi.Timeouts.SECOND; -import static com.rusefi.binaryprotocol.BinaryProtocol.sleep; public class DfuHelper { private static final Logging log = getLogging(DfuHelper.class); diff --git a/java_console/io/src/main/java/com/rusefi/io/IoStream.java b/java_console/io/src/main/java/com/rusefi/io/IoStream.java index 1b6793d44b..ba3dc6b67a 100644 --- a/java_console/io/src/main/java/com/rusefi/io/IoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/IoStream.java @@ -1,6 +1,5 @@ package com.rusefi.io; -import com.devexperts.logging.Logging; import com.opensr5.io.DataListener; import com.opensr5.io.WriteStream; import com.rusefi.binaryprotocol.BinaryProtocol; @@ -15,8 +14,6 @@ import java.io.Closeable; import java.io.EOFException; import java.io.IOException; -import static com.devexperts.logging.Logging.getLogging; - /** * Physical bi-directional controller communication level *

diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java index 35fe040be5..7b2488dabf 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.net.Socket; import java.util.Collection; import java.util.Collections; -import java.util.Date; import static com.devexperts.logging.Logging.getLogging; diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java index 3b639a092e..5d6fe65335 100644 --- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java +++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/BinaryProtocolServerSandbox.java @@ -10,8 +10,6 @@ import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.tune.xml.Constant; -import java.io.File; - /** * Starts a fake device with TCP connector at {@link BinaryProtocolServer#DEFAULT_PROXY_PORT} port * @see TcpServerSandbox what's the difference? diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SerialSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SerialSandbox.java index c2a36e31c3..33d9c59a21 100644 --- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SerialSandbox.java +++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SerialSandbox.java @@ -6,7 +6,6 @@ import com.rusefi.io.HeartBeatListeners; import com.rusefi.io.LinkManager; import java.util.Date; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; public class SerialSandbox { diff --git a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java index 7cfb8b7bf4..5c8f5f12b5 100644 --- a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java +++ b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java @@ -6,7 +6,6 @@ import com.opensr5.ini.field.ScalarIniField; import com.rusefi.binaryprotocol.BinaryProtocolState; import com.rusefi.config.Field; import com.rusefi.config.generated.Fields; -import com.rusefi.core.rusEFIVersion; import com.rusefi.io.IoStream; import com.rusefi.io.LinkConnector; import com.rusefi.io.LinkManager; @@ -28,7 +27,6 @@ import static com.rusefi.config.generated.Fields.TS_FILE_VERSION; import static com.rusefi.config.generated.Fields.TS_FILE_VERSION_OFFSET; import static com.rusefi.io.tcp.TcpConnector.LOCALHOST; import org.junit.Assert; -import static org.junit.Assert.assertTrue; public class TestHelper extends MockitoTestHelper { private static final Logging log = getLogging(TestHelper.class); diff --git a/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java b/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java index 02542434a0..40d6f78e7b 100644 --- a/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java +++ b/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java @@ -1,9 +1,6 @@ package com.rusefi.util; import java.io.*; -import java.nio.file.Paths; -import java.util.Scanner; -import java.util.regex.Pattern; /** * This file would override file content only of content has changed, disregarding the magic tag line. diff --git a/java_console/models/src/main/java/com/rusefi/core/Sensor.java b/java_console/models/src/main/java/com/rusefi/core/Sensor.java index 171439d9ca..b37516f20a 100644 --- a/java_console/models/src/main/java/com/rusefi/core/Sensor.java +++ b/java_console/models/src/main/java/com/rusefi/core/Sensor.java @@ -2,7 +2,6 @@ package com.rusefi.core; import com.rusefi.config.Field; import com.rusefi.config.FieldType; -import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.TsOutputs; import org.jetbrains.annotations.Nullable; diff --git a/java_console/models/src/main/java/com/rusefi/waves/EngineChartParser.java b/java_console/models/src/main/java/com/rusefi/waves/EngineChartParser.java index ce04a22666..14dcb632b0 100644 --- a/java_console/models/src/main/java/com/rusefi/waves/EngineChartParser.java +++ b/java_console/models/src/main/java/com/rusefi/waves/EngineChartParser.java @@ -1,7 +1,5 @@ package com.rusefi.waves; -import com.opensr5.Logger; - import java.util.HashMap; import java.util.Map; diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java b/java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java index 18fd8f9973..2418f343d2 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java @@ -3,9 +3,6 @@ package com.rusefi.core.io; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.InvalidPathException; diff --git a/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java b/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java deleted file mode 100644 index f147083712..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.rusefi; - -import com.rusefi.ui.util.UiUtils; - -import javax.swing.*; -import java.awt.*; - -/** - * 8/13/14 - * Andrey Belomutskiy, (c) 2013-2020 - */ -/* -public class StimulationInputs { - static final int DEFAULT_RPM_MIN = 800; - static final int DEFAULT_RPM_MAX = 7000; - private final JPanel content = new JPanel(new GridLayout(7, 1)); - - private final JSpinner elResistance2 = new JSpinner(new SpinnerNumberModel(10000, 0, 100000, 1)); - private final ValueRangeControl elRange = new ValueRangeControl("engine load", 1.2, 0.213333, 4.4); - - private final ValueRangeControl rpmRange = new ValueRangeControl("RPM", DEFAULT_RPM_MIN, 413.333374, DEFAULT_RPM_MAX); - private final ValueRangeControl cltRange = new ValueRangeControl("CLR r", 100, 100, 100); - - public StimulationInputs(EcuStimulator ecuStimulator) { - - JPanel channelPanel = new JPanel(new FlowLayout()); - channelPanel.add(new JLabel("Input channel")); - content.add(channelPanel); - - - content.add(rpmRange.getContent()); - content.add(elRange.getContent()); - content.add(cltRange.getContent()); - ValueRangeControl iatRange = new ValueRangeControl("IAT r", 100, 100, 9900); - content.add(iatRange.getContent()); - ValueRangeControl tpsRange = new ValueRangeControl("TPS", 1, 0.1, 4.5); - content.add(tpsRange.getContent()); - - content.add(new JLabel("EL resistance")); - content.add(UiUtils.wrap(elResistance2)); - - JButton button = ecuStimulator.createButton(); - content.add(UiUtils.wrap(button)); - } - - public double getEngineLoadMin() { - return elRange.getFrom(); - } - - public double getEngineLoadMax() { - return elRange.getTo(); - } - - public double getRpmFrom() { - return (int) rpmRange.getFrom(); - } - - public double getRpmTo() { - return (int) rpmRange.getTo(); - } - - public double getRpmStep() { - return rpmRange.getStep(); - } - - public int getCltFrom() { - return (int) cltRange.getFrom(); - } - - public int getCltTo() { - return (int) cltRange.getTo(); - } - - public JPanel getContent() { - return content; - } - - public double getEngineLoadR2Resistance() { - return (Integer) elResistance2.getValue(); - } - - public double getEngineLoadStep() { - return elRange.getStep(); - } -} - -*/ \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/logic/test/IgnitionMapBuilderTest.java b/java_console/ui/src/main/java/com/rusefi/logic/test/IgnitionMapBuilderTest.java index e43cbde50f..84f6a08020 100644 --- a/java_console/ui/src/main/java/com/rusefi/logic/test/IgnitionMapBuilderTest.java +++ b/java_console/ui/src/main/java/com/rusefi/logic/test/IgnitionMapBuilderTest.java @@ -1,6 +1,5 @@ package com.rusefi.logic.test; -import com.rusefi.logic.IgnitionMapBuilder; import org.junit.Test; import static com.rusefi.logic.IgnitionMapBuilder.*; diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java index 3ed4e6885e..4f85efdaf7 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java @@ -20,10 +20,8 @@ import java.io.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; /** * @see FirmwareFlasher diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java index 3057b45ad3..69b81b8e8d 100644 --- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java +++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java @@ -9,7 +9,6 @@ import com.rusefi.autodetect.PortDetector; import com.rusefi.autodetect.SerialAutoChecker; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.IncomingDataBuffer; -import com.rusefi.binaryprotocol.MsqFactory; import com.rusefi.config.generated.Fields; import com.rusefi.core.EngineState; import com.rusefi.core.Pair; @@ -20,7 +19,6 @@ import com.rusefi.io.ConnectionStatusLogic; import com.rusefi.io.IoStream; import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.BinaryProtocolServer; -import com.rusefi.io.tcp.ServerSocketReference; import com.rusefi.maintenance.ExecHelper; import com.rusefi.tune.xml.Msq; import com.rusefi.ui.StatusConsumer; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java b/java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java deleted file mode 100644 index cf5b768c51..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.rusefi.ui; - -import com.rusefi.file.BaseMap; -import com.rusefi.models.XYData; -import com.rusefi.core.ui.FrameHelper; - -import javax.swing.*; - -/** - * 7/18/13 - * Andrey Belomutskiy, (c) 2013-2020 - */ -/* -public class ShowMap { - public static void main(String[] args) { -// XYData data = BaseMap.loadData("a.csv", "maf", "af"); -// XYData data2 = BaseMap.loadData("a.csv", "maf", "table_fuel"); - - XYData data = BaseMap.loadData("200.csv", "maf", "dwell"); - XYData data2 = null; - - JPanel jsp = ChartHelper.create3DControl(data, ChartHelper.createDefaultSurfaceModel(data, data2), "MAF<>Fuel Map"); - - new FrameHelper().showFrame(jsp); - } -} -*/ \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java index bcd9696a52..ca8b30c80d 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java @@ -7,8 +7,6 @@ import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.util.ArrayList; -import java.util.List; public class SizeSelectorPanel extends JPanel { public static final int WIDTH = 5; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java index c6d72c034f..8f164d94d8 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java @@ -1,6 +1,5 @@ package com.rusefi.ui; -import com.rusefi.FileLog; import com.rusefi.config.generated.Fields; import com.rusefi.core.MessagesCentral; import com.rusefi.core.preferences.storage.Node; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/config/BaseConfigField.java b/java_console/ui/src/main/java/com/rusefi/ui/config/BaseConfigField.java index 47e9ed8ea8..7803d7aa4d 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/config/BaseConfigField.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/config/BaseConfigField.java @@ -2,13 +2,9 @@ package com.rusefi.ui.config; import com.devexperts.logging.Logging; import com.opensr5.ConfigurationImage; -import com.rusefi.FileLog; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.config.Field; -import com.rusefi.io.CommandQueue; import com.rusefi.io.ConnectionStatusLogic; -import com.rusefi.io.DfuHelper; -import com.rusefi.io.LinkManager; import com.rusefi.ui.UIContext; import org.jetbrains.annotations.NotNull; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferStatusPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferStatusPanel.java index cf56bf52b7..f4a4d73ae7 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferStatusPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferStatusPanel.java @@ -2,7 +2,6 @@ package com.rusefi.ui.engine; import com.rusefi.waves.TimeAxisTranslator; import com.rusefi.waves.EngineReport; -import com.rusefi.waves.ZoomProvider; import com.rusefi.waves.RevolutionLog; import javax.swing.*; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/lua/TextEditor.java b/java_console/ui/src/main/java/com/rusefi/ui/lua/TextEditor.java index 391fa9ece2..9e0c8a30ba 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/lua/TextEditor.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/lua/TextEditor.java @@ -1,7 +1,6 @@ package com.rusefi.ui.lua; import com.rusefi.config.generated.Fields; -import com.rusefi.ui.util.URLLabel; import com.rusefi.ui.util.UiUtils; import org.jetbrains.annotations.NotNull; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java b/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java index 2001e64903..5eb3c74876 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java @@ -1,7 +1,6 @@ package com.rusefi.ui.util; import com.devexperts.logging.Logging; -import com.rusefi.FileLog; import javax.swing.*; import java.awt.*; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/IdleLabel.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/IdleLabel.java deleted file mode 100644 index 9e420662c0..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/IdleLabel.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.rusefi.ui.widgets; - -import com.rusefi.core.Sensor; -import com.rusefi.core.SensorCentral; - -import javax.swing.*; - -/** - * 8/2/13 - * Andrey Belomutskiy, (c) 2013-2020 - */ -public class IdleLabel extends JLabel { - public IdleLabel() { -// SensorCentral.getInstance().addListener(Sensor.IDLE_SWITCH, new SensorCentral.SensorListener() { -// @Override -// public void onSensorUpdate(double value) { -// IdleLabel.this.setText("Idle: " + (value == 0)); -// } -// }); - } -} diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java deleted file mode 100644 index e29da172db..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.rusefi.ui.widgets; - -import com.rusefi.core.MessagesCentral; -//import com.rusefi.EcuStimulator; -import com.rusefi.io.CommandQueue; - -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import java.awt.*; - -/** - * Date: 3/17/13 - * Andrey Belomutskiy, (c) 2013-2020 - */ -/* -public class PotCommand { - public static final double VOLTAGE_CORRECTION = 2.9 / 3; - public final JPanel panel; - final JSpinner potSpinner; - - public PotCommand(final int channel) { - final JLabel rValue = new JLabel(); - - final JSpinner voltageSpinner = new JSpinner(new SpinnerNumberModel(0.0, 0, 5, 0.1)) { - @Override - public Dimension getPreferredSize() { - Dimension size = super.getPreferredSize(); - return new Dimension(100, size.height); - } - }; - ((SpinnerNumberModel) voltageSpinner.getModel()).setStepSize(0.1); - voltageSpinner.setValue(1.0); -/* - voltageSpinner.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - Double Vout = (Double) voltageSpinner.getValue(); - int d = getPotResistance(Vout, SensorCentral.getInstance().getValue(Sensor.VREF) * VOLTAGE_CORRECTION); - potSpinner.setValue(d); - } - }); -*/ -/* - potSpinner = new JSpinner() { - @Override - public Dimension getPreferredSize() { - Dimension size = super.getPreferredSize(); - return new Dimension(100, size.height); - } - }; - potSpinner.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - Integer value = (Integer) potSpinner.getValue(); - try { - requestPotChange(channel, value); - } catch (IllegalArgumentException ignore) { - return; - } - int r = getRbyD(value); - rValue.setText("R=" + r); - } - }); - potSpinner.setValue(10); - - - JPanel upper = new JPanel(new FlowLayout(FlowLayout.LEFT)); - upper.add(new JLabel("set pot" + channel + ": ")); - upper.add(potSpinner); - upper.add(rValue); - - JPanel center = new JPanel(new FlowLayout(FlowLayout.LEFT)); - center.add(new JLabel("volts: ")); - center.add(voltageSpinner); - - panel = new JPanel(new BorderLayout()); - panel.setBorder(BorderFactory.createLineBorder(Color.CYAN)); - panel.add(upper, BorderLayout.NORTH); - panel.add(center, BorderLayout.CENTER); - } - - public static void requestPotChange(int channel, int resistance) { - if (resistance < 0 || resistance > 10000) - throw new IllegalArgumentException("resistance: " + resistance); - CommandQueue commandQueue = null; - commandQueue.write("pot " + channel + " " + resistance); - } - - public static int getPotResistance(double vout, double vRef) { - double r = getR1InVoltageDivider3(vout, vRef, EcuStimulator.getInstance().getInputs().getEngineLoadR2Resistance()); - MessagesCentral.getInstance().postMessage(PotCommand.class, "VRef=" + vRef + ", needed resistance: " + r); - // pot command accept resistance and does the conversion itself - return (int) r; - } - - private static int getRbyD(Integer value) { - return (int) (10000.0 * (256 - value) / 256) + 52; - } - -// private static int getDbyR(double Rwa) { -// return (int) (256 - (Rwa - 52) * 256 / 10000); -// } - - public static double getR1InVoltageDivider3(double Vout, double Vin, double r2) { - return r2 * Vout / Vin; - } - -} -*/ \ No newline at end of file diff --git a/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java b/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java index 3bd8783085..f1fd45ea9f 100644 --- a/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java +++ b/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java @@ -7,13 +7,10 @@ import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.config.generated.Fields; import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.TcpConnector; -import com.rusefi.ui.StatusConsumer; import org.junit.Test; -import java.io.IOException; import java.util.Objects; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicInteger; import static com.rusefi.TestHelper.assertLatch; import static org.junit.Assert.assertEquals; diff --git a/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java b/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java index 4c0a18f1ff..130d6ae8df 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java @@ -5,7 +5,6 @@ import com.opensr5.ini.IniFileModel; import com.opensr5.ini.field.IniField; import com.opensr5.io.ConfigurationImageFile; import com.rusefi.binaryprotocol.MsqFactory; -import com.rusefi.config.generated.Fields; import com.rusefi.tune.xml.Constant; import com.rusefi.tune.xml.Msq; import org.junit.Before; diff --git a/java_console/ui/src/test/java/com/rusefi/ui/test/EngineSnifferPanelTest.java b/java_console/ui/src/test/java/com/rusefi/ui/test/EngineSnifferPanelTest.java index 2b0e9e58b5..fc0bf36fc3 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/test/EngineSnifferPanelTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/test/EngineSnifferPanelTest.java @@ -2,7 +2,6 @@ package com.rusefi.ui.test; import com.rusefi.config.generated.Fields; import com.rusefi.ui.engine.EngineSnifferPanel; -import com.rusefi.ui.engine.NameUtil; import org.junit.Test; import java.util.Set; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java index 95554c563e..7ddd7d8f21 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ExtraUtil.java @@ -1,7 +1,5 @@ package com.rusefi; -import com.rusefi.newparse.DefinitionsState; -import com.rusefi.newparse.parsing.Definition; import com.rusefi.util.LazyFile; import com.rusefi.util.SystemOut; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java b/java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java index b705e2f323..7d21c15166 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java @@ -1,7 +1,5 @@ package com.rusefi; -import static com.rusefi.VariableRegistry.ENUM_SUFFIX; - public enum PinType { OUTPUTS("output_pin_e", "Gpio", "Unassigned"), ANALOG_INPUTS("adc_channel_e", "adc_channel_e", "EFI_ADC_NONE"), diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index 67ec2f4227..6daafb652e 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java @@ -3,12 +3,9 @@ package com.rusefi.ldmp; import com.devexperts.logging.Logging; import com.rusefi.EnumToString; import com.rusefi.InvokeReader; -import com.rusefi.ReaderState; import com.rusefi.ReaderStateImpl; import com.rusefi.RusefiParseErrorStrategy; import com.rusefi.newparse.ParseState; -import com.rusefi.newparse.outputs.CStructWriter; -import com.rusefi.newparse.outputs.OutputChannelWriter; import com.rusefi.newparse.parsing.Definition; import com.rusefi.output.*; import com.rusefi.util.LazyFile; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIteratorWithOffset.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIteratorWithOffset.java index eb7fe80a05..b6c6f47cda 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIteratorWithOffset.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldIteratorWithOffset.java @@ -1,7 +1,6 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import java.util.List; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java index 9d0ac487b9..56bc8cd935 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java @@ -1,7 +1,6 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; import org.jetbrains.annotations.NotNull; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java index cc623c30bc..492bd48eec 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java @@ -1,10 +1,8 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; import com.rusefi.TypesHelper; -import com.rusefi.core.Tuple; import com.rusefi.output.variables.VariableRecord; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java index dd2596d537..9d1b837b45 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java @@ -3,7 +3,6 @@ package com.rusefi.output; import com.rusefi.ConfigField; import com.rusefi.ReaderState; import com.rusefi.TypesHelper; -import com.rusefi.core.Pair; import com.rusefi.output.variables.VariableRecord; import org.jetbrains.annotations.NotNull; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java index a8c99d52df..327a2665cd 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java @@ -1,7 +1,6 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; import java.util.List; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java index 2892ac487f..52384ef1a1 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java @@ -1,7 +1,5 @@ package com.rusefi.output; -import com.rusefi.core.SensorCategory; - import com.rusefi.ConfigField; import com.rusefi.ReaderState; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/variables/VariableRecord.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/variables/VariableRecord.java index bd20c3dc64..f68cdfe057 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/variables/VariableRecord.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/variables/VariableRecord.java @@ -1,7 +1,5 @@ package com.rusefi.output.variables; -import com.rusefi.core.Pair; - public class VariableRecord { public final String type; private final String humanName; diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java index e9c2b41e6f..5bb9cb4123 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java @@ -1,9 +1,6 @@ package com.rusefi.pinout; -import com.rusefi.EnumsReader; -import com.rusefi.ReaderState; import com.rusefi.ReaderStateImpl; -import com.rusefi.VariableRegistry; import com.rusefi.enum_reader.Value; import com.rusefi.newparse.ParseState; import org.junit.Test; diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/InvokeReader.java b/java_tools/enum_to_string/src/main/java/com/rusefi/InvokeReader.java index 37399d2914..22caf670ef 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/InvokeReader.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/InvokeReader.java @@ -2,7 +2,6 @@ package com.rusefi; import com.rusefi.util.SystemOut; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/ToolUtil.java b/java_tools/enum_to_string/src/main/java/com/rusefi/ToolUtil.java index b9baa786aa..d6fff5d9ed 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/ToolUtil.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/ToolUtil.java @@ -1,9 +1,6 @@ package com.rusefi; import com.devexperts.logging.Logging; -import com.rusefi.util.LazyFile; - -import java.net.URISyntaxException; import static com.devexperts.logging.Logging.getLogging;