rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

let's separate Android from not Android

This commit is contained in:
rusefillc 2022-10-15 18:56:28 -04:00
parent a5e0068fce
commit 09a5b5e9a1
18 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/dependencies.gradle
View File

@ -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",

1
java_console/autotest/build.gradle
View File

@ -6,4 +6,5 @@ apply from: '../../java_tools/dependencies.gradle'
dependencies {
api project(':ecu_io')
implementation global_libs.junit
}

2
java_console/autoupdate/build.gradle
View File

@ -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
}

3
java_console/build.xml
View File

@ -88,7 +88,6 @@
<javac debug="yes" destdir="build/classes"
classpath="${lib_list}">
<src path="autotest/src/main/java"/>
<src path="autotest/src/test/java"/>
<src path="autoupdate/src/main/java"/>
<src path="../java_tools/configuration_definition/src/main/java"/>
<src path="../java_tools/configuration_definition/build/generated-src/antlr/main"/>
@ -98,7 +97,7 @@
<src path="io/src/main/java"/>
<src path="io/src/test/java"/>
<src path="io/src/testFixtures/java"/>
<src path="luaformatter/src"/>
<src path="luaformatter/src/main/java"/>
<src path="models/src/main/java"/>
<src path="models/src/test/java"/>
<src path="inifile/src/main/java"/>

2
java_console/io/build.gradle
View File

@ -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
}

2
java_console/luaformatter_module/luaformatter.iml
View File

@ -4,7 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../luaformatter">
<sourceFolder url="file://$MODULE_DIR$/../luaformatter/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../luaformatter/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../luaformatter/src/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

10
java_console/ui/build.gradle
View File

@ -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 {

10
java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
View File

@ -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());

10
java_console/ui/src/main/java/com/rusefi/EcuStimulator.java
View File

@ -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<Double> dwells = r.getDwells();
List<Double> advances = r.getAdvances();
@ -302,6 +304,7 @@ public class EcuStimulator {
}
LinkManager.engineState.timeListeners.remove(listener);
*/
/*
return result;
}
@ -318,3 +321,4 @@ public class EcuStimulator {
}
}
}
*/

2
java_console/ui/src/main/java/com/rusefi/StimulationInputs.java
View File

@ -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 {
}
}
*/

10
java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java
View File

@ -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());
}
}
*/

6
java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java
View File

@ -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;
}
}
*/

2
java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java
View File

@ -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);
}
}
*/

4
java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java
View File

@ -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);
}
}
*/

6
java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java
View File

@ -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 {
}
}
*/

4
java_console/ui/src/test/java/com/rusefi/test/EcuStimulatorSandbox.java
View File

@ -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());
}
}

8
java_console/ui/src/test/java/com/rusefi/test/VoltageDividerTest.java
View File

@ -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));
}
}

2
java_tools/settings.gradle
View File

@ -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')