rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

explicit folder for generated java stuff

This commit is contained in:
rusefi 2019-06-16 22:06:05 -04:00
parent 8bed1bb0ed
commit 97a976dadd
24 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/gen_config.bat
View File

@ -15,7 +15,7 @@ java -Drusefi.generator.lazyfile.enabled=true ^
-ts_destination tunerstudio ^ -ts_destination tunerstudio ^
-c_defines controllers\generated\rusefi_generated.h ^ -c_defines controllers\generated\rusefi_generated.h ^
-c_destination controllers\generated\engine_configuration_generated_structures.h ^ -c_destination controllers\generated\engine_configuration_generated_structures.h ^
-java_destination ../java_console/models/src/com/rusefi/config/Fields.java ^ -java_destination ../java_console/models/src/com/rusefi/config/generated/Fields.java ^
-romraider_destination ../java_console/rusefi.xml ^ -romraider_destination ../java_console/rusefi.xml ^
-skip build/config.gen -skip build/config.gen
IF NOT ERRORLEVEL 0 echo ERROR generating IF NOT ERRORLEVEL 0 echo ERROR generating

3
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -7,7 +7,7 @@ import com.rusefi.ConfigurationImageDiff;
import com.rusefi.FileLog; import com.rusefi.FileLog;
import com.rusefi.Timeouts; import com.rusefi.Timeouts;
import com.rusefi.config.FieldType; import com.rusefi.config.FieldType;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.Pair; import com.rusefi.core.Pair;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;
@ -19,7 +19,6 @@ import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

2
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocolCommands.java
View File

@ -1,6 +1,6 @@
package com.rusefi.binaryprotocol; package com.rusefi.binaryprotocol;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
/** /**
* (c) Andrey Belomutskiy * (c) Andrey Belomutskiy

2
java_console/io/src/com/rusefi/io/tcp/BinaryProtocolServer.java
View File

@ -5,7 +5,7 @@ import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolCommands; import com.rusefi.binaryprotocol.BinaryProtocolCommands;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.binaryprotocol.IoHelper; import com.rusefi.binaryprotocol.IoHelper;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import java.io.*; import java.io.*;
import java.net.ServerSocket; import java.net.ServerSocket;

2
java_console/io/src/com/rusefi/io/tcp/test/BinaryProtocolServerSandbox.java
View File

@ -4,7 +4,7 @@ import com.opensr5.ConfigurationImage;
import com.rusefi.FileLog; import com.rusefi.FileLog;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.BinaryProtocolServer;
import com.rusefi.io.tcp.TcpIoStream; import com.rusefi.io.tcp.TcpIoStream;

2
java_console/models/src/com/rusefi/autotune/AfrDataPoint.java
View File

@ -1,6 +1,6 @@
package com.rusefi.autotune; package com.rusefi.autotune;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
/** /**
* Air/Fuel ratio data point * Air/Fuel ratio data point

4
java_console/models/src/com/rusefi/autotune/FuelAutoTune.java
View File

@ -3,8 +3,8 @@ package com.rusefi.autotune;
import java.util.Collection; import java.util.Collection;
import static com.rusefi.autotune.MathUtil.square; import static com.rusefi.autotune.MathUtil.square;
import static com.rusefi.config.Fields.FUEL_LOAD_COUNT; import static com.rusefi.config.generated.Fields.FUEL_LOAD_COUNT;
import static com.rusefi.config.Fields.FUEL_RPM_COUNT; import static com.rusefi.config.generated.Fields.FUEL_RPM_COUNT;
/** /**
* 1/5/2016 * 1/5/2016

2
java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java
View File

@ -1,7 +1,7 @@
package com.rusefi.autotune.test; package com.rusefi.autotune.test;
import com.rusefi.autotune.*; import com.rusefi.autotune.*;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import org.junit.Test; import org.junit.Test;
import java.util.ArrayList; import java.util.ArrayList;

1
java_console/models/src/com/rusefi/config/Field.java
View File

@ -1,5 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
import com.rusefi.config.generated.Fields;
import com.rusefi.core.Pair; import com.rusefi.core.Pair;
import static com.rusefi.config.FieldType.*; import static com.rusefi.config.FieldType.*;

2
java_console/models/src/com/rusefi/config/FieldsMap.java
View File

@ -1,5 +1,7 @@
package com.rusefi.config; package com.rusefi.config;
import com.rusefi.config.generated.Fields;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

4
java_console/models/src/com/rusefi/config/Fields.java → java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config.generated;
// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 15 14:03:05 EDT 2019 // this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 16 22:00:08 EDT 2019
public class Fields { public class Fields {
public static final int accelerometerSpiDevice_offset = 2736; public static final int accelerometerSpiDevice_offset = 2736;
public static final int acCutoffHighRpm_offset = 1498; public static final int acCutoffHighRpm_offset = 1498;

3
java_console/models/src/com/rusefi/config/generated/readme.md Normal file
View File

@ -0,0 +1,3 @@
All classes in this folder are generated using ConfigGenerator
See ```gen_config.bat```

4
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -1,7 +1,7 @@
package com.rusefi.core; package com.rusefi.core;
import com.rusefi.config.FieldType; import com.rusefi.config.FieldType;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import eu.hansolo.steelseries.tools.BackgroundColor; import eu.hansolo.steelseries.tools.BackgroundColor;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -10,7 +10,7 @@ import java.util.Comparator;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import static com.rusefi.config.Fields.*; import static com.rusefi.config.generated.Fields.*;
/** /**
* @author Andrey Belomutskiy * @author Andrey Belomutskiy

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -3,7 +3,7 @@ package com.rusefi;
import com.fathzer.soft.javaluator.DoubleEvaluator; import com.fathzer.soft.javaluator.DoubleEvaluator;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.EngineState; import com.rusefi.core.EngineState;
import com.rusefi.core.MessagesCentral; import com.rusefi.core.MessagesCentral;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;

2
java_console/ui/src/com/rusefi/SensorLogger.java
View File

@ -3,7 +3,7 @@ package com.rusefi;
import com.opensr5.ConfigurationImage; import com.opensr5.ConfigurationImage;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;
import com.rusefi.io.ConnectionStatus; import com.rusefi.io.ConnectionStatus;

2
java_console/ui/src/com/rusefi/SensorSnifferPane.java
View File

@ -1,6 +1,6 @@
package com.rusefi; package com.rusefi;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.ui.RpmLabel; import com.rusefi.ui.RpmLabel;
import com.rusefi.ui.RpmModel; import com.rusefi.ui.RpmModel;
import com.rusefi.ui.config.ConfigField; import com.rusefi.ui.config.ConfigField;

2
java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java
View File

@ -6,7 +6,7 @@ import com.opensr5.io.ConfigurationImageFile;
import com.romraider.editor.ecu.ECUEditor; import com.romraider.editor.ecu.ECUEditor;
import com.rusefi.RomRaiderWrapper; import com.rusefi.RomRaiderWrapper;
import com.rusefi.UploadChanges; import com.rusefi.UploadChanges;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.io.serial.SerialIoStreamJSSC; import com.rusefi.io.serial.SerialIoStreamJSSC;
import jssc.SerialPort; import jssc.SerialPort;

2
java_console/ui/src/com/rusefi/ui/FormulasPane.java
View File

@ -4,7 +4,7 @@ import com.opensr5.ConfigurationImage;
import com.rusefi.FileLog; import com.rusefi.FileLog;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;
import com.rusefi.ui.config.ConfigField; import com.rusefi.ui.config.ConfigField;

2
java_console/ui/src/com/rusefi/ui/FuelTunePane.java
View File

@ -14,7 +14,7 @@ import com.rusefi.autotune.Result;
import com.rusefi.autotune.AfrDataPoint; import com.rusefi.autotune.AfrDataPoint;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.ISensorCentral; import com.rusefi.core.ISensorCentral;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;

2
java_console/ui/src/com/rusefi/ui/config/BitConfigField.java
View File

@ -2,7 +2,7 @@ package com.rusefi.ui.config;
import com.opensr5.ConfigurationImage; import com.opensr5.ConfigurationImage;
import com.rusefi.config.Field; import com.rusefi.config.Field;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.MessagesCentral; import com.rusefi.core.MessagesCentral;
import javax.swing.*; import javax.swing.*;

2
java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java
View File

@ -1,7 +1,7 @@
package com.rusefi.ui.engine; package com.rusefi.ui.engine;
import com.rusefi.FileLog; import com.rusefi.FileLog;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.EngineState; import com.rusefi.core.EngineState;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;

2
java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java
View File

@ -1,6 +1,6 @@
package com.rusefi.ui.widgets; package com.rusefi.ui.widgets;
import com.rusefi.config.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.io.CommandQueue; import com.rusefi.io.CommandQueue;
import com.rusefi.io.LinkManager; import com.rusefi.io.LinkManager;

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

2
java_tools/configuration_definition/src/com/rusefi/output/JavaFieldsConsumer.java
View File

@ -15,7 +15,7 @@ import static com.rusefi.ConfigDefinition.EOL;
*/ */
public class JavaFieldsConsumer implements ConfigurationConsumer { public class JavaFieldsConsumer implements ConfigurationConsumer {
private static final Set<String> javaEnums = new HashSet<>(); private static final Set<String> javaEnums = new HashSet<>();
private static final String JAVA_PACKAGE = "com.rusefi.config"; private static final String JAVA_PACKAGE = "com.rusefi.config.generated";
private final CharArrayWriter javaFieldsWriter; private final CharArrayWriter javaFieldsWriter;
private final ReaderState state; private final ReaderState state;