From 09a5b5e9a19a7aac301900c81c858330c7008d44 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 15 Oct 2022 18:56:28 -0400 Subject: [PATCH] let's separate Android from not Android --- android/dependencies.gradle | 1 - java_console/autotest/build.gradle | 1 + java_console/autoupdate/build.gradle | 2 +- java_console/build.xml | 3 +-- java_console/io/build.gradle | 2 +- java_console/luaformatter_module/luaformatter.iml | 2 +- java_console/ui/build.gradle | 10 ++++++++++ .../ui/src/main/java/com/rusefi/ConsoleUI.java | 10 +++++----- .../ui/src/main/java/com/rusefi/EcuStimulator.java | 10 +++++++--- .../ui/src/main/java/com/rusefi/StimulationInputs.java | 2 ++ .../ui/src/main/java/com/rusefi/ui/ChartHelper.java | 10 ++++++---- .../ui/src/main/java/com/rusefi/ui/Live3DReport.java | 6 ++++-- .../ui/src/main/java/com/rusefi/ui/ShowMap.java | 2 ++ .../main/java/com/rusefi/ui/widgets/MafCommand.java | 4 +++- .../main/java/com/rusefi/ui/widgets/PotCommand.java | 6 ++++-- .../java/com/rusefi/test/EcuStimulatorSandbox.java | 4 ++-- .../test/java/com/rusefi/test/VoltageDividerTest.java | 8 ++++---- java_tools/settings.gradle | 2 ++ 18 files changed, 56 insertions(+), 29 deletions(-) diff --git a/android/dependencies.gradle b/android/dependencies.gradle index 69ae069487..da46e468a6 100644 --- a/android/dependencies.gradle +++ b/android/dependencies.gradle @@ -1,6 +1,5 @@ ext { libs = [ - mockito : "org.mockito:mockito-all:1.10.19", javaxJson : "javax.json:javax.json-api:1.1.4", snakeyaml : "org.yaml:snakeyaml:1.26", commons_logging: "commons-logging:commons-logging:1.2", diff --git a/java_console/autotest/build.gradle b/java_console/autotest/build.gradle index dba4a77956..95ff846451 100644 --- a/java_console/autotest/build.gradle +++ b/java_console/autotest/build.gradle @@ -6,4 +6,5 @@ apply from: '../../java_tools/dependencies.gradle' dependencies { api project(':ecu_io') + implementation global_libs.junit } diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle index a50b82c57e..c3ffa77c08 100644 --- a/java_console/autoupdate/build.gradle +++ b/java_console/autoupdate/build.gradle @@ -21,5 +21,5 @@ dependencies { // junit 4.13 does not mix well with httpclient :( testImplementation group: 'junit', name: 'junit', version: '4.8.2' - testImplementation libs.mockito + testImplementation global_libs.mockito } \ No newline at end of file diff --git a/java_console/build.xml b/java_console/build.xml index cd559676a4..d42b9128c4 100644 --- a/java_console/build.xml +++ b/java_console/build.xml @@ -88,7 +88,6 @@ - @@ -98,7 +97,7 @@ - + diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index fbf6c47e8d..b908ac9851 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -28,7 +28,7 @@ dependencies { // junit 4.13 does not mix well with httpclient :( testImplementation group: 'junit', name: 'junit', version: '4.8.2' - testFixturesImplementation libs.mockito + testFixturesImplementation global_libs.mockito testFixturesApi global_libs.annotations testFixturesApi global_libs.junit } \ No newline at end of file diff --git a/java_console/luaformatter_module/luaformatter.iml b/java_console/luaformatter_module/luaformatter.iml index fc6b6052a7..cc23469054 100644 --- a/java_console/luaformatter_module/luaformatter.iml +++ b/java_console/luaformatter_module/luaformatter.iml @@ -4,7 +4,7 @@ - + diff --git a/java_console/ui/build.gradle b/java_console/ui/build.gradle index 617fc561cf..56df942f6d 100644 --- a/java_console/ui/build.gradle +++ b/java_console/ui/build.gradle @@ -4,8 +4,18 @@ plugins { dependencies { implementation project(':shared_ui') + implementation project(':autotest') + implementation project(':luaformatter') + implementation project(':config_definition') implementation global_libs.antlr implementation 'com.miglayout:miglayout-swing:4.1' + implementation files('../lib/dfu/dfu_java.jar') + implementation files('../lib/SteelSeries-3.9.30.jar') + implementation files('../lib/dfu/IntelHexParser.jar') + + testImplementation global_libs.mockito + testImplementation project(':proxy_server') + testImplementation testFixtures(project(':ecu_io')) } //compileJava { diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java index 0febd36cda..d257dde4cb 100644 --- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java @@ -117,11 +117,11 @@ public class ConsoleUI { // tabbedPane.addTab("LE controls", new FlexibleControls().getPanel()); // tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel()); - if (tabbedPane.paneSettings.showStimulatorPane && !LinkManager.isSimulationMode && !LinkManager.isLogViewerMode(port)) { - // todo: rethink this UI? special command line key to enable it? - EcuStimulator stimulator = EcuStimulator.getInstance(); - tabbedPane.addTab("ECU stimulation", stimulator.getPanel()); - } +// if (tabbedPane.paneSettings.showStimulatorPane && !LinkManager.isSimulationMode && !LinkManager.isLogViewerMode(port)) { +// // todo: rethink this UI? special command line key to enable it? +// EcuStimulator stimulator = EcuStimulator.getInstance(); +// tabbedPane.addTab("ECU stimulation", stimulator.getPanel()); +// } // tabbedPane.addTab("live map adjustment", new Live3DReport().getControl()); // tabbedPane.add("Wizards", new Wizard().createPane()); diff --git a/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java b/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java index 4cd19ab60f..57659d13ac 100644 --- a/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java +++ b/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java @@ -7,11 +7,10 @@ import com.rusefi.file.TableGenerator; import com.rusefi.models.Point3D; import com.rusefi.models.Range; import com.rusefi.models.XYData; -import com.rusefi.ui.ChartHelper; +//import com.rusefi.ui.ChartHelper; import com.rusefi.ui.RpmModel; -import com.rusefi.ui.widgets.PotCommand; +//import com.rusefi.ui.widgets.PotCommand; import com.rusefi.ui.widgets.RpmCommand; -import net.ericaro.surfaceplotter.DefaultSurfaceModel; import javax.swing.*; import java.awt.*; @@ -29,6 +28,7 @@ import java.util.concurrent.CountDownLatch; * Date: 3/24/13 * Andrey Belomutskiy, (c) 2013-2020 */ +/* public class EcuStimulator { private static final String DELIMITER = ","; private static final long SLEEP_TIME = 300; @@ -137,6 +137,7 @@ public class EcuStimulator { /** * Let's give the firmware some time to react */ +/* sleepRuntime(SLEEP_TIME); statusLabel.setText("RPM " + rpm + ", el " + engineLoad + ", CLT " + clt); @@ -144,6 +145,7 @@ public class EcuStimulator { /** * We are making a number of measurements and then we take the middle one */ +/* MultipleMeasurements r = waitForMultipleResults(dwellSensor, null); List dwells = r.getDwells(); List advances = r.getAdvances(); @@ -302,6 +304,7 @@ public class EcuStimulator { } LinkManager.engineState.timeListeners.remove(listener); */ +/* return result; } @@ -318,3 +321,4 @@ public class EcuStimulator { } } } +*/ \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java b/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java index 7868777571..f147083712 100644 --- a/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java +++ b/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java @@ -9,6 +9,7 @@ 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; @@ -83,3 +84,4 @@ public class StimulationInputs { } } +*/ \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java b/java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java index 3e3aac8ab7..15b6a3f282 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java @@ -5,10 +5,10 @@ import com.rusefi.models.Range; import com.rusefi.models.XYData; import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.util.JTextFieldWithWidth; -import net.ericaro.surfaceplotter.DefaultSurfaceModel; -import net.ericaro.surfaceplotter.JSurfacePanel; -import net.ericaro.surfaceplotter.Mapper; -import net.ericaro.surfaceplotter.surface.SurfaceModel; +//import net.ericaro.surfaceplotter.DefaultSurfaceModel; +//import net.ericaro.surfaceplotter.JSurfacePanel; +//import net.ericaro.surfaceplotter.Mapper; +//import net.ericaro.surfaceplotter.surface.SurfaceModel; import javax.swing.*; import java.awt.*; @@ -21,6 +21,7 @@ import static com.rusefi.models.Utils.parseIntWithReason; * Date: 1/22/13 * Andrey Belomutskiy, (c) 2013-2020 */ +/* public class ChartHelper { private ChartHelper() { } @@ -142,3 +143,4 @@ public class ChartHelper { sm.setYMax(yRange.getMax()); } } +*/ \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java b/java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java index b4a6df8a8b..3fa31aebfe 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java @@ -1,11 +1,11 @@ package com.rusefi.ui; -import com.rusefi.EcuStimulator; +//import com.rusefi.EcuStimulator; import com.rusefi.core.MessagesCentral; import com.rusefi.models.Point3D; import com.rusefi.models.Range; import com.rusefi.models.XYData; -import net.ericaro.surfaceplotter.DefaultSurfaceModel; +//import net.ericaro.surfaceplotter.DefaultSurfaceModel; import javax.swing.*; import java.awt.*; @@ -14,6 +14,7 @@ import java.awt.*; * 7/22/13 * Andrey Belomutskiy, (c) 2013-2020 */ +/* public class Live3DReport { public static final Range KEY_RANGE = new Range(1.5f, 4.0f); private final XYData primary = new XYData(); @@ -62,3 +63,4 @@ public class Live3DReport { return control; } } +*/ \ No newline at end of file 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 index 292874ab2c..cf5b768c51 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java @@ -10,6 +10,7 @@ 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"); @@ -23,3 +24,4 @@ public class ShowMap { new FrameHelper().showFrame(jsp); } } +*/ \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java index 581d12b227..d7b15015ba 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java @@ -1,6 +1,6 @@ package com.rusefi.ui.widgets; -import com.rusefi.EcuStimulator; +//import com.rusefi.EcuStimulator; import com.rusefi.core.Sensor; import javax.swing.*; @@ -12,6 +12,7 @@ import java.awt.*; * 6/30/13 * Andrey Belomutskiy, (c) 2013-2020 */ +/* public class MafCommand extends JPanel { public MafCommand() { setBorder(BorderFactory.createLineBorder(Color.BLACK)); @@ -40,3 +41,4 @@ public class MafCommand extends JPanel { add(maf); } } +*/ \ No newline at end of file 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 index 4c2866cbd0..e29da172db 100644 --- 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 @@ -1,7 +1,7 @@ package com.rusefi.ui.widgets; import com.rusefi.core.MessagesCentral; -import com.rusefi.EcuStimulator; +//import com.rusefi.EcuStimulator; import com.rusefi.io.CommandQueue; import javax.swing.*; @@ -13,6 +13,7 @@ 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; @@ -40,7 +41,7 @@ public class PotCommand { } }); */ - +/* potSpinner = new JSpinner() { @Override public Dimension getPreferredSize() { @@ -106,3 +107,4 @@ public class PotCommand { } } +*/ \ No newline at end of file diff --git a/java_console/ui/src/test/java/com/rusefi/test/EcuStimulatorSandbox.java b/java_console/ui/src/test/java/com/rusefi/test/EcuStimulatorSandbox.java index 50191d2710..538b8b9016 100644 --- a/java_console/ui/src/test/java/com/rusefi/test/EcuStimulatorSandbox.java +++ b/java_console/ui/src/test/java/com/rusefi/test/EcuStimulatorSandbox.java @@ -1,6 +1,6 @@ package com.rusefi.test; -import com.rusefi.EcuStimulator; +//import com.rusefi.EcuStimulator; import com.rusefi.core.ui.FrameHelper; /** @@ -9,6 +9,6 @@ import com.rusefi.core.ui.FrameHelper; */ public class EcuStimulatorSandbox extends FrameHelper { public static void main(String[] args) { - new EcuStimulatorSandbox().showFrame(EcuStimulator.getInstance().getPanel()); +// new EcuStimulatorSandbox().showFrame(EcuStimulator.getInstance().getPanel()); } } diff --git a/java_console/ui/src/test/java/com/rusefi/test/VoltageDividerTest.java b/java_console/ui/src/test/java/com/rusefi/test/VoltageDividerTest.java index ee05cc3e46..4fec0eb91e 100644 --- a/java_console/ui/src/test/java/com/rusefi/test/VoltageDividerTest.java +++ b/java_console/ui/src/test/java/com/rusefi/test/VoltageDividerTest.java @@ -1,6 +1,6 @@ package com.rusefi.test; -import com.rusefi.ui.widgets.PotCommand; +//import com.rusefi.ui.widgets.PotCommand; import junit.framework.TestCase; import org.junit.Test; @@ -8,8 +8,8 @@ public class VoltageDividerTest extends TestCase { @Test public void testR1() { - assertEquals(2000.0, PotCommand.getR1InVoltageDivider3(1, 5, 10000)); - - assertEquals(2040.816326530612, PotCommand.getR1InVoltageDivider3(1, 4.9, 10000)); +// assertEquals(2000.0, PotCommand.getR1InVoltageDivider3(1, 5, 10000)); +// +// assertEquals(2040.816326530612, PotCommand.getR1InVoltageDivider3(1, 4.9, 10000)); } } \ No newline at end of file diff --git a/java_tools/settings.gradle b/java_tools/settings.gradle index 6ab45166c1..9b108bc8a6 100644 --- a/java_tools/settings.gradle +++ b/java_tools/settings.gradle @@ -40,3 +40,5 @@ include ':autotest' project(':autotest').projectDir = new File('../java_console/autotest') include ':ui' project(':ui').projectDir = new File('../java_console/ui') +include ':luaformatter' +project(':luaformatter').projectDir = new File('../java_console/luaformatter')