From 833c3056b9454e4fdde2e0e3d8e9b3474932de3f Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 13 Jan 2024 01:08:24 -0500 Subject: [PATCH] big move --- build.gradle | 5 ----- playback/build.gradle | 4 +--- {src => reader/src}/main/java/com/rusefi/can/CAN2TS.java | 2 +- {src => reader/src}/main/java/com/rusefi/can/CANPacket.java | 4 +--- .../com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java | 2 +- .../src}/main/java/com/rusefi/can/SensorValue.java | 0 .../src}/main/java/com/rusefi/can/ToolSelector.java | 0 {src => reader/src}/main/java/com/rusefi/can/TrcToMlq.java | 0 {src => reader/src}/main/java/com/rusefi/can/Utils.java | 0 .../main/java/com/rusefi/can/analysis/ByteRateOfChange.java | 0 .../com/rusefi/can/analysis/ByteRateOfChangeReports.java | 0 .../java/com/rusefi/can/analysis/CanMetaDataContext.java | 0 .../java/com/rusefi/can/analysis/CanToMegaLogViewer.java | 0 .../main/java/com/rusefi/can/analysis/ChecksumScanner.java | 0 .../java/com/rusefi/can/analysis/CounterAggregator.java | 0 .../main/java/com/rusefi/can/analysis/CounterScanner.java | 0 .../com/rusefi/can/analysis/J1850_SAE_crc8_Calculator.java | 0 .../src}/main/java/com/rusefi/can/analysis/PerSidDump.java | 4 ++-- .../main/java/com/rusefi/can/deprecated/PacketPayload.java | 0 .../main/java/com/rusefi/can/deprecated/SensorType.java | 0 .../can/deprecated/decoders/AbstractPacketDecoder.java | 5 ++--- .../com/rusefi/can/deprecated/decoders/PacketDecoder.java | 0 .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java | 2 +- .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java | 2 +- .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java | 2 +- .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B6.java | 0 .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java | 2 +- .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java | 2 +- .../java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java | 2 +- .../com/rusefi/can/deprecated/decoders/bmw/BmwRegistry.java | 0 .../src}/main/java/com/rusefi/can/reader/CANLineReader.java | 2 +- .../src}/main/java/com/rusefi/can/reader/README.md | 0 .../src}/main/java/com/rusefi/can/reader/ReaderType.java | 0 .../main/java/com/rusefi/can/reader/ReaderTypeHolder.java | 0 .../src}/main/java/com/rusefi/can/reader/dbc/DbcField.java | 0 .../src}/main/java/com/rusefi/can/reader/dbc/DbcFile.java | 0 .../src}/main/java/com/rusefi/can/reader/dbc/DbcPacket.java | 0 .../java/com/rusefi/can/reader/impl/AutoFormatReader.java | 0 .../main/java/com/rusefi/can/reader/impl/CANoeReader.java | 0 .../java/com/rusefi/can/reader/impl/CanHackerReader.java | 0 .../java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java | 4 +--- .../java/com/rusefi/can/reader/impl/PcanTrcReader2_0.java | 0 .../src}/main/java/com/rusefi/can/writer/CANTextWriter.java | 0 .../src}/main/java/com/rusefi/can/writer/SteveWriter.java | 0 .../src}/main/java/com/rusefi/html/HtmlReport.java | 0 .../src}/main/java/com/rusefi/mlv/LoggingContext.java | 0 .../src}/main/java/com/rusefi/mlv/LoggingStrategy.java | 0 .../main/java/com/rusefi/sensor_logs/BinaryLogEntry.java | 0 .../main/java/com/rusefi/sensor_logs/BinarySensorLog.java | 6 ++---- .../src}/main/java/com/rusefi/sensor_logs/Fields.java | 0 .../src}/main/java/com/rusefi/sensor_logs/SensorLog.java | 0 .../src}/main/java/com/rusefi/util/BitMathUtil.java | 0 .../src}/main/java/com/rusefi/util/FolderUtil.java | 0 .../java/com/rusefi/can/ByteRateOfChangeNissanSandbox.java | 0 .../java/com/rusefi/can/ByteRateOfChangeVagSandbox.java | 0 .../src}/test/java/com/rusefi/can/CanAmMG1Sandbox.java | 0 .../src}/test/java/com/rusefi/can/KiaSandbox.java | 0 .../src}/test/java/com/rusefi/can/NissanSandbox.java | 0 .../src}/test/java/com/rusefi/can/PolarisSandbox.java | 0 .../src}/test/java/com/rusefi/can/VagB6Sandbox.java | 0 .../java/com/rusefi/can/analysis/CounterScannerTest.java | 0 .../src}/test/java/com/rusefi/can/analysis/Crc8Test.java | 0 .../java/com/rusefi/can/deprecated/BmwE65DecoderTest.java | 0 .../rusefi/can/deprecated/BmwPcanCanValidatorSandbox.java | 0 .../java/com/rusefi/can/deprecated/CANoeCanValidator.java | 0 .../java/com/rusefi/can/reader/impl/CANoeReaderTest.java | 0 .../test/java/com/rusefi/can/reader/impl/CanHackerTest.java | 0 .../java/com/rusefi/can/reader/impl/GetValueFromTrc.java | 0 .../test/java/com/rusefi/can/reader/impl/ParseDBCTest.java | 0 .../com/rusefi/can/reader/impl/ParseDBCWithCommentTest.java | 0 .../java/com/rusefi/can/reader/impl/ParseDbcFieldTest.java | 0 .../java/com/rusefi/can/reader/impl/PcanReaderTest.java | 0 .../java/com/rusefi/can/reader/impl/ReadFullVagDbc.java | 0 .../java/com/rusefi/can/reader/impl/TrcToMlqSandbox.java | 0 .../test/java/com/rusefi/can/writer/SteveWriterTest.java | 0 {src => reader/src}/test/resources/med.canhacker | 0 {src => reader/src}/test/resources/vw_mqb_2010.dbc | 0 77 files changed, 18 insertions(+), 32 deletions(-) rename {src => reader/src}/main/java/com/rusefi/can/CAN2TS.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/CANPacket.java (96%) rename {src => reader/src}/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/SensorValue.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/ToolSelector.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/TrcToMlq.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/Utils.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/ByteRateOfChange.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/CanMetaDataContext.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/CanToMegaLogViewer.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/ChecksumScanner.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/CounterAggregator.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/CounterScanner.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/J1850_SAE_crc8_Calculator.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/analysis/PerSidDump.java (94%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/PacketPayload.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/SensorType.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java (77%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/PacketDecoder.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B6.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/deprecated/decoders/bmw/BmwRegistry.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/CANLineReader.java (97%) rename {src => reader/src}/main/java/com/rusefi/can/reader/README.md (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/ReaderType.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/ReaderTypeHolder.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/dbc/DbcField.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/dbc/DbcFile.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/dbc/DbcPacket.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/impl/AutoFormatReader.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/impl/CANoeReader.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/impl/CanHackerReader.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java (87%) rename {src => reader/src}/main/java/com/rusefi/can/reader/impl/PcanTrcReader2_0.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/writer/CANTextWriter.java (100%) rename {src => reader/src}/main/java/com/rusefi/can/writer/SteveWriter.java (100%) rename {src => reader/src}/main/java/com/rusefi/html/HtmlReport.java (100%) rename {src => reader/src}/main/java/com/rusefi/mlv/LoggingContext.java (100%) rename {src => reader/src}/main/java/com/rusefi/mlv/LoggingStrategy.java (100%) rename {src => reader/src}/main/java/com/rusefi/sensor_logs/BinaryLogEntry.java (100%) rename {src => reader/src}/main/java/com/rusefi/sensor_logs/BinarySensorLog.java (95%) rename {src => reader/src}/main/java/com/rusefi/sensor_logs/Fields.java (100%) rename {src => reader/src}/main/java/com/rusefi/sensor_logs/SensorLog.java (100%) rename {src => reader/src}/main/java/com/rusefi/util/BitMathUtil.java (100%) rename {src => reader/src}/main/java/com/rusefi/util/FolderUtil.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/ByteRateOfChangeNissanSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/ByteRateOfChangeVagSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/CanAmMG1Sandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/KiaSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/NissanSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/PolarisSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/VagB6Sandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/analysis/CounterScannerTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/analysis/Crc8Test.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/deprecated/BmwE65DecoderTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/deprecated/BmwPcanCanValidatorSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/deprecated/CANoeCanValidator.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/CANoeReaderTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/CanHackerTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/GetValueFromTrc.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/ParseDBCTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/ParseDBCWithCommentTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/ParseDbcFieldTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/PcanReaderTest.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/ReadFullVagDbc.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/reader/impl/TrcToMlqSandbox.java (100%) rename {src => reader/src}/test/java/com/rusefi/can/writer/SteveWriterTest.java (100%) rename {src => reader/src}/test/resources/med.canhacker (100%) rename {src => reader/src}/test/resources/vw_mqb_2010.dbc (100%) diff --git a/build.gradle b/build.gradle index f4d2991..85f3dd8 100644 --- a/build.gradle +++ b/build.gradle @@ -13,11 +13,6 @@ allprojects { } } -dependencies { - implementation libs.snakeyaml - testImplementation libs.junit -} - defaultTasks 'jar' jar { diff --git a/playback/build.gradle b/playback/build.gradle index fe9254f..e376555 100644 --- a/playback/build.gradle +++ b/playback/build.gradle @@ -3,10 +3,8 @@ plugins { id 'java-library' } -apply from: '../dependencies.gradle' - dependencies { - api rootProject + api project(':reader') api project(':peak-can-basic') api libs.annotations api group: 'tel.schich', name: 'javacan-core', version: "$javaCanVersion" diff --git a/src/main/java/com/rusefi/can/CAN2TS.java b/reader/src/main/java/com/rusefi/can/CAN2TS.java similarity index 100% rename from src/main/java/com/rusefi/can/CAN2TS.java rename to reader/src/main/java/com/rusefi/can/CAN2TS.java index 4b5b3fd..bad8caf 100644 --- a/src/main/java/com/rusefi/can/CAN2TS.java +++ b/reader/src/main/java/com/rusefi/can/CAN2TS.java @@ -1,9 +1,9 @@ package com.rusefi.can; +import com.rusefi.can.reader.impl.CANoeReader; import com.rusefi.can.deprecated.decoders.PacketDecoder; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.decoders.bmw.BmwRegistry; -import com.rusefi.can.reader.impl.CANoeReader; import java.io.FileWriter; import java.io.IOException; diff --git a/src/main/java/com/rusefi/can/CANPacket.java b/reader/src/main/java/com/rusefi/can/CANPacket.java similarity index 96% rename from src/main/java/com/rusefi/can/CANPacket.java rename to reader/src/main/java/com/rusefi/can/CANPacket.java index 7e1d527..89bd99c 100644 --- a/src/main/java/com/rusefi/can/CANPacket.java +++ b/reader/src/main/java/com/rusefi/can/CANPacket.java @@ -2,8 +2,6 @@ package com.rusefi.can; import com.rusefi.util.BitMathUtil; -import static com.rusefi.can.Utils.bytesToHexWithSpaces; - public class CANPacket { private final double timeStamp; private final int id; @@ -68,7 +66,7 @@ public class CANPacket { public void assertThat(String msg, PackerAssertion assertion) { if (!assertion.test(this)) - throw new IllegalStateException("Not " + msg + " " + bytesToHexWithSpaces(data)); + throw new IllegalStateException("Not " + msg + " " + Utils.bytesToHexWithSpaces(data)); } public int getUnsignedInt(int index) { diff --git a/src/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java b/reader/src/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java similarity index 100% rename from src/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java rename to reader/src/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java index 735f959..199f75b 100644 --- a/src/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java +++ b/reader/src/main/java/com/rusefi/can/ConvertTrcToMegaLogViewerWithDBC.java @@ -1,7 +1,7 @@ package com.rusefi.can; -import com.rusefi.can.reader.CANLineReader; import com.rusefi.can.reader.dbc.DbcFile; +import com.rusefi.can.reader.CANLineReader; import com.rusefi.mlv.LoggingStrategy; import com.rusefi.util.FolderUtil; diff --git a/src/main/java/com/rusefi/can/SensorValue.java b/reader/src/main/java/com/rusefi/can/SensorValue.java similarity index 100% rename from src/main/java/com/rusefi/can/SensorValue.java rename to reader/src/main/java/com/rusefi/can/SensorValue.java diff --git a/src/main/java/com/rusefi/can/ToolSelector.java b/reader/src/main/java/com/rusefi/can/ToolSelector.java similarity index 100% rename from src/main/java/com/rusefi/can/ToolSelector.java rename to reader/src/main/java/com/rusefi/can/ToolSelector.java diff --git a/src/main/java/com/rusefi/can/TrcToMlq.java b/reader/src/main/java/com/rusefi/can/TrcToMlq.java similarity index 100% rename from src/main/java/com/rusefi/can/TrcToMlq.java rename to reader/src/main/java/com/rusefi/can/TrcToMlq.java diff --git a/src/main/java/com/rusefi/can/Utils.java b/reader/src/main/java/com/rusefi/can/Utils.java similarity index 100% rename from src/main/java/com/rusefi/can/Utils.java rename to reader/src/main/java/com/rusefi/can/Utils.java diff --git a/src/main/java/com/rusefi/can/analysis/ByteRateOfChange.java b/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChange.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/ByteRateOfChange.java rename to reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChange.java diff --git a/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java b/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java rename to reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java diff --git a/src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java b/reader/src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java rename to reader/src/main/java/com/rusefi/can/analysis/CanMetaDataContext.java diff --git a/src/main/java/com/rusefi/can/analysis/CanToMegaLogViewer.java b/reader/src/main/java/com/rusefi/can/analysis/CanToMegaLogViewer.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/CanToMegaLogViewer.java rename to reader/src/main/java/com/rusefi/can/analysis/CanToMegaLogViewer.java diff --git a/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java b/reader/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/ChecksumScanner.java rename to reader/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java diff --git a/src/main/java/com/rusefi/can/analysis/CounterAggregator.java b/reader/src/main/java/com/rusefi/can/analysis/CounterAggregator.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/CounterAggregator.java rename to reader/src/main/java/com/rusefi/can/analysis/CounterAggregator.java diff --git a/src/main/java/com/rusefi/can/analysis/CounterScanner.java b/reader/src/main/java/com/rusefi/can/analysis/CounterScanner.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/CounterScanner.java rename to reader/src/main/java/com/rusefi/can/analysis/CounterScanner.java diff --git a/src/main/java/com/rusefi/can/analysis/J1850_SAE_crc8_Calculator.java b/reader/src/main/java/com/rusefi/can/analysis/J1850_SAE_crc8_Calculator.java similarity index 100% rename from src/main/java/com/rusefi/can/analysis/J1850_SAE_crc8_Calculator.java rename to reader/src/main/java/com/rusefi/can/analysis/J1850_SAE_crc8_Calculator.java diff --git a/src/main/java/com/rusefi/can/analysis/PerSidDump.java b/reader/src/main/java/com/rusefi/can/analysis/PerSidDump.java similarity index 94% rename from src/main/java/com/rusefi/can/analysis/PerSidDump.java rename to reader/src/main/java/com/rusefi/can/analysis/PerSidDump.java index 2fd3cde..6729108 100644 --- a/src/main/java/com/rusefi/can/analysis/PerSidDump.java +++ b/reader/src/main/java/com/rusefi/can/analysis/PerSidDump.java @@ -29,7 +29,7 @@ public class PerSidDump { // O(n*M) is not so bad for (int sid : sids) { - String outputFileName = filteredDestinationFolder + File.separator + simpleFileName + "_filtered_" + dualSid(sid, "_") + ".txt"; + String outputFileName = filteredDestinationFolder + File.separator + simpleFileName + "_filtered_" + ByteRateOfChange.dualSid(sid, "_") + ".txt"; PrintWriter pw = new PrintWriter(new FileOutputStream(outputFileName)); List filteredPackets = new ArrayList<>(); @@ -47,7 +47,7 @@ public class PerSidDump { int middleIndex = filteredPackets.size() / 2; CANPacket middlePacket = filteredPackets.get(middleIndex); - String middleOutputFileName = filteredDestinationFolder + File.separator + simpleFileName + "_filtered_" + dualSid(sid, "_") + "_middle.txt"; + String middleOutputFileName = filteredDestinationFolder + File.separator + simpleFileName + "_filtered_" + ByteRateOfChange.dualSid(sid, "_") + "_middle.txt"; PrintWriter middle = new PrintWriter(new FileOutputStream(middleOutputFileName)); String decAndHex = middlePacket.getId() + "_" + Integer.toHexString(middlePacket.getId()); diff --git a/src/main/java/com/rusefi/can/deprecated/PacketPayload.java b/reader/src/main/java/com/rusefi/can/deprecated/PacketPayload.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/PacketPayload.java rename to reader/src/main/java/com/rusefi/can/deprecated/PacketPayload.java diff --git a/src/main/java/com/rusefi/can/deprecated/SensorType.java b/reader/src/main/java/com/rusefi/can/deprecated/SensorType.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/SensorType.java rename to reader/src/main/java/com/rusefi/can/deprecated/SensorType.java diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java similarity index 77% rename from src/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java index bf4f7ed..f0f629d 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/AbstractPacketDecoder.java @@ -1,8 +1,7 @@ package com.rusefi.can.deprecated.decoders; import com.rusefi.can.CANPacket; - -import static com.rusefi.can.Utils.bytesToHexWithSpaces; +import com.rusefi.can.Utils; public abstract class AbstractPacketDecoder implements PacketDecoder { private final int id; @@ -21,6 +20,6 @@ public abstract class AbstractPacketDecoder implements PacketDecoder { } protected IllegalStateException unexpected(String reason, CANPacket packet) { - return new IllegalStateException(reason + ": " + bytesToHexWithSpaces(packet.getData())); + return new IllegalStateException(reason + ": " + Utils.bytesToHexWithSpaces(packet.getData())); } } diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/PacketDecoder.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/PacketDecoder.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/PacketDecoder.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/PacketDecoder.java diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java index a21b4e7..852f6e5 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0A9.java @@ -1,9 +1,9 @@ package com.rusefi.can.deprecated.decoders.bmw; import com.rusefi.can.CANPacket; +import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.SensorType; -import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.decoders.AbstractPacketDecoder; public class Bmw0A9 extends AbstractPacketDecoder { diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java index ea0cb74..f8612f5 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0AA.java @@ -1,9 +1,9 @@ package com.rusefi.can.deprecated.decoders.bmw; import com.rusefi.can.CANPacket; +import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.SensorType; -import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.decoders.AbstractPacketDecoder; public class Bmw0AA extends AbstractPacketDecoder { diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java index 880f60f..405e942 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B5.java @@ -1,9 +1,9 @@ package com.rusefi.can.deprecated.decoders.bmw; import com.rusefi.can.CANPacket; +import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.SensorType; -import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.decoders.AbstractPacketDecoder; public class Bmw0B5 extends AbstractPacketDecoder { diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B6.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B6.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B6.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0B6.java diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java index 2aabd73..0100a14 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw0BA.java @@ -1,9 +1,9 @@ package com.rusefi.can.deprecated.decoders.bmw; import com.rusefi.can.CANPacket; +import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.SensorType; -import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.decoders.AbstractPacketDecoder; public class Bmw0BA extends AbstractPacketDecoder { diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java index c1b09c6..12153e1 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw192.java @@ -1,9 +1,9 @@ package com.rusefi.can.deprecated.decoders.bmw; import com.rusefi.can.CANPacket; +import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.SensorType; -import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.decoders.AbstractPacketDecoder; /** diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java index d2baf68..8a17914 100644 --- a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java +++ b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/Bmw1D0.java @@ -1,9 +1,9 @@ package com.rusefi.can.deprecated.decoders.bmw; import com.rusefi.can.CANPacket; +import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.PacketPayload; import com.rusefi.can.deprecated.SensorType; -import com.rusefi.can.SensorValue; import com.rusefi.can.deprecated.decoders.AbstractPacketDecoder; public class Bmw1D0 extends AbstractPacketDecoder { diff --git a/src/main/java/com/rusefi/can/deprecated/decoders/bmw/BmwRegistry.java b/reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/BmwRegistry.java similarity index 100% rename from src/main/java/com/rusefi/can/deprecated/decoders/bmw/BmwRegistry.java rename to reader/src/main/java/com/rusefi/can/deprecated/decoders/bmw/BmwRegistry.java diff --git a/src/main/java/com/rusefi/can/reader/CANLineReader.java b/reader/src/main/java/com/rusefi/can/reader/CANLineReader.java similarity index 97% rename from src/main/java/com/rusefi/can/reader/CANLineReader.java rename to reader/src/main/java/com/rusefi/can/reader/CANLineReader.java index 190458d..d6a5c77 100644 --- a/src/main/java/com/rusefi/can/reader/CANLineReader.java +++ b/reader/src/main/java/com/rusefi/can/reader/CANLineReader.java @@ -1,9 +1,9 @@ package com.rusefi.can.reader; import com.rusefi.can.CANPacket; +import com.rusefi.can.reader.impl.AutoFormatReader; import com.rusefi.can.reader.impl.CANoeReader; import com.rusefi.can.reader.impl.CanHackerReader; -import com.rusefi.can.reader.impl.*; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/com/rusefi/can/reader/README.md b/reader/src/main/java/com/rusefi/can/reader/README.md similarity index 100% rename from src/main/java/com/rusefi/can/reader/README.md rename to reader/src/main/java/com/rusefi/can/reader/README.md diff --git a/src/main/java/com/rusefi/can/reader/ReaderType.java b/reader/src/main/java/com/rusefi/can/reader/ReaderType.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/ReaderType.java rename to reader/src/main/java/com/rusefi/can/reader/ReaderType.java diff --git a/src/main/java/com/rusefi/can/reader/ReaderTypeHolder.java b/reader/src/main/java/com/rusefi/can/reader/ReaderTypeHolder.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/ReaderTypeHolder.java rename to reader/src/main/java/com/rusefi/can/reader/ReaderTypeHolder.java diff --git a/src/main/java/com/rusefi/can/reader/dbc/DbcField.java b/reader/src/main/java/com/rusefi/can/reader/dbc/DbcField.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/dbc/DbcField.java rename to reader/src/main/java/com/rusefi/can/reader/dbc/DbcField.java diff --git a/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java b/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/dbc/DbcFile.java rename to reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java diff --git a/src/main/java/com/rusefi/can/reader/dbc/DbcPacket.java b/reader/src/main/java/com/rusefi/can/reader/dbc/DbcPacket.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/dbc/DbcPacket.java rename to reader/src/main/java/com/rusefi/can/reader/dbc/DbcPacket.java diff --git a/src/main/java/com/rusefi/can/reader/impl/AutoFormatReader.java b/reader/src/main/java/com/rusefi/can/reader/impl/AutoFormatReader.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/impl/AutoFormatReader.java rename to reader/src/main/java/com/rusefi/can/reader/impl/AutoFormatReader.java diff --git a/src/main/java/com/rusefi/can/reader/impl/CANoeReader.java b/reader/src/main/java/com/rusefi/can/reader/impl/CANoeReader.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/impl/CANoeReader.java rename to reader/src/main/java/com/rusefi/can/reader/impl/CANoeReader.java diff --git a/src/main/java/com/rusefi/can/reader/impl/CanHackerReader.java b/reader/src/main/java/com/rusefi/can/reader/impl/CanHackerReader.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/impl/CanHackerReader.java rename to reader/src/main/java/com/rusefi/can/reader/impl/CanHackerReader.java diff --git a/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java b/reader/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java similarity index 87% rename from src/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java rename to reader/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java index 1f55b2b..f7127d4 100644 --- a/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java +++ b/reader/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader1_1.java @@ -3,8 +3,6 @@ package com.rusefi.can.reader.impl; import com.rusefi.can.CANPacket; import com.rusefi.can.reader.CANLineReader; -import static com.rusefi.can.reader.impl.PcanTrcReader2_0.FILEVERSION; - /** * @see PcanTrcReader2_0 for version 2.0 format * TODO: merge these two? @@ -15,7 +13,7 @@ public class PcanTrcReader1_1 implements CANLineReader { @Override public CANPacket readLine(String line, String fileName, int lineIndex) { line = line.trim(); - if (line.startsWith(FILEVERSION) && !line.startsWith(FILEVERSION + "=1.1")) + if (line.startsWith(PcanTrcReader2_0.FILEVERSION) && !line.startsWith(PcanTrcReader2_0.FILEVERSION + "=1.1")) throw new IllegalStateException("Unexpected fileversion " + line); if (line.startsWith(";")) return null; diff --git a/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader2_0.java b/reader/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader2_0.java similarity index 100% rename from src/main/java/com/rusefi/can/reader/impl/PcanTrcReader2_0.java rename to reader/src/main/java/com/rusefi/can/reader/impl/PcanTrcReader2_0.java diff --git a/src/main/java/com/rusefi/can/writer/CANTextWriter.java b/reader/src/main/java/com/rusefi/can/writer/CANTextWriter.java similarity index 100% rename from src/main/java/com/rusefi/can/writer/CANTextWriter.java rename to reader/src/main/java/com/rusefi/can/writer/CANTextWriter.java diff --git a/src/main/java/com/rusefi/can/writer/SteveWriter.java b/reader/src/main/java/com/rusefi/can/writer/SteveWriter.java similarity index 100% rename from src/main/java/com/rusefi/can/writer/SteveWriter.java rename to reader/src/main/java/com/rusefi/can/writer/SteveWriter.java diff --git a/src/main/java/com/rusefi/html/HtmlReport.java b/reader/src/main/java/com/rusefi/html/HtmlReport.java similarity index 100% rename from src/main/java/com/rusefi/html/HtmlReport.java rename to reader/src/main/java/com/rusefi/html/HtmlReport.java diff --git a/src/main/java/com/rusefi/mlv/LoggingContext.java b/reader/src/main/java/com/rusefi/mlv/LoggingContext.java similarity index 100% rename from src/main/java/com/rusefi/mlv/LoggingContext.java rename to reader/src/main/java/com/rusefi/mlv/LoggingContext.java diff --git a/src/main/java/com/rusefi/mlv/LoggingStrategy.java b/reader/src/main/java/com/rusefi/mlv/LoggingStrategy.java similarity index 100% rename from src/main/java/com/rusefi/mlv/LoggingStrategy.java rename to reader/src/main/java/com/rusefi/mlv/LoggingStrategy.java diff --git a/src/main/java/com/rusefi/sensor_logs/BinaryLogEntry.java b/reader/src/main/java/com/rusefi/sensor_logs/BinaryLogEntry.java similarity index 100% rename from src/main/java/com/rusefi/sensor_logs/BinaryLogEntry.java rename to reader/src/main/java/com/rusefi/sensor_logs/BinaryLogEntry.java diff --git a/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java b/reader/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java similarity index 95% rename from src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java rename to reader/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java index b1391be..1608ccb 100644 --- a/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java +++ b/reader/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java @@ -4,8 +4,6 @@ import java.io.*; import java.util.*; import java.util.function.Function; -import static com.rusefi.sensor_logs.Fields.MLQ_FIELD_HEADER_NAME_OR_CATEGORY; - /** * MLV .mlq binary log file * https://www.efianalytics.com/TunerStudio/docs/MLG_Binary_LogFormat_1.0.pdf @@ -123,7 +121,7 @@ public class BinarySensorLog implements SensorLog, Aut // 0000h type enum stream.write(7); // 0001h - writeLine(stream, name, MLQ_FIELD_HEADER_NAME_OR_CATEGORY); + writeLine(stream, name, Fields.MLQ_FIELD_HEADER_NAME_OR_CATEGORY); // 0023h writeLine(stream, unit, 10); stream.write(0); // Display Style, 0=Float @@ -133,7 +131,7 @@ public class BinarySensorLog implements SensorLog, Aut stream.writeFloat(0); // 0036h precision digits stream.write(2); - writeLine(stream, sensor.getCategory(), MLQ_FIELD_HEADER_NAME_OR_CATEGORY); + writeLine(stream, sensor.getCategory(), Fields.MLQ_FIELD_HEADER_NAME_OR_CATEGORY); } if (stream.size() != infoDataStart) throw new IllegalStateException("We are doing something wrong :( stream.size=" + stream.size() + "/" + infoDataStart); diff --git a/src/main/java/com/rusefi/sensor_logs/Fields.java b/reader/src/main/java/com/rusefi/sensor_logs/Fields.java similarity index 100% rename from src/main/java/com/rusefi/sensor_logs/Fields.java rename to reader/src/main/java/com/rusefi/sensor_logs/Fields.java diff --git a/src/main/java/com/rusefi/sensor_logs/SensorLog.java b/reader/src/main/java/com/rusefi/sensor_logs/SensorLog.java similarity index 100% rename from src/main/java/com/rusefi/sensor_logs/SensorLog.java rename to reader/src/main/java/com/rusefi/sensor_logs/SensorLog.java diff --git a/src/main/java/com/rusefi/util/BitMathUtil.java b/reader/src/main/java/com/rusefi/util/BitMathUtil.java similarity index 100% rename from src/main/java/com/rusefi/util/BitMathUtil.java rename to reader/src/main/java/com/rusefi/util/BitMathUtil.java diff --git a/src/main/java/com/rusefi/util/FolderUtil.java b/reader/src/main/java/com/rusefi/util/FolderUtil.java similarity index 100% rename from src/main/java/com/rusefi/util/FolderUtil.java rename to reader/src/main/java/com/rusefi/util/FolderUtil.java diff --git a/src/test/java/com/rusefi/can/ByteRateOfChangeNissanSandbox.java b/reader/src/test/java/com/rusefi/can/ByteRateOfChangeNissanSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/ByteRateOfChangeNissanSandbox.java rename to reader/src/test/java/com/rusefi/can/ByteRateOfChangeNissanSandbox.java diff --git a/src/test/java/com/rusefi/can/ByteRateOfChangeVagSandbox.java b/reader/src/test/java/com/rusefi/can/ByteRateOfChangeVagSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/ByteRateOfChangeVagSandbox.java rename to reader/src/test/java/com/rusefi/can/ByteRateOfChangeVagSandbox.java diff --git a/src/test/java/com/rusefi/can/CanAmMG1Sandbox.java b/reader/src/test/java/com/rusefi/can/CanAmMG1Sandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/CanAmMG1Sandbox.java rename to reader/src/test/java/com/rusefi/can/CanAmMG1Sandbox.java diff --git a/src/test/java/com/rusefi/can/KiaSandbox.java b/reader/src/test/java/com/rusefi/can/KiaSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/KiaSandbox.java rename to reader/src/test/java/com/rusefi/can/KiaSandbox.java diff --git a/src/test/java/com/rusefi/can/NissanSandbox.java b/reader/src/test/java/com/rusefi/can/NissanSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/NissanSandbox.java rename to reader/src/test/java/com/rusefi/can/NissanSandbox.java diff --git a/src/test/java/com/rusefi/can/PolarisSandbox.java b/reader/src/test/java/com/rusefi/can/PolarisSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/PolarisSandbox.java rename to reader/src/test/java/com/rusefi/can/PolarisSandbox.java diff --git a/src/test/java/com/rusefi/can/VagB6Sandbox.java b/reader/src/test/java/com/rusefi/can/VagB6Sandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/VagB6Sandbox.java rename to reader/src/test/java/com/rusefi/can/VagB6Sandbox.java diff --git a/src/test/java/com/rusefi/can/analysis/CounterScannerTest.java b/reader/src/test/java/com/rusefi/can/analysis/CounterScannerTest.java similarity index 100% rename from src/test/java/com/rusefi/can/analysis/CounterScannerTest.java rename to reader/src/test/java/com/rusefi/can/analysis/CounterScannerTest.java diff --git a/src/test/java/com/rusefi/can/analysis/Crc8Test.java b/reader/src/test/java/com/rusefi/can/analysis/Crc8Test.java similarity index 100% rename from src/test/java/com/rusefi/can/analysis/Crc8Test.java rename to reader/src/test/java/com/rusefi/can/analysis/Crc8Test.java diff --git a/src/test/java/com/rusefi/can/deprecated/BmwE65DecoderTest.java b/reader/src/test/java/com/rusefi/can/deprecated/BmwE65DecoderTest.java similarity index 100% rename from src/test/java/com/rusefi/can/deprecated/BmwE65DecoderTest.java rename to reader/src/test/java/com/rusefi/can/deprecated/BmwE65DecoderTest.java diff --git a/src/test/java/com/rusefi/can/deprecated/BmwPcanCanValidatorSandbox.java b/reader/src/test/java/com/rusefi/can/deprecated/BmwPcanCanValidatorSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/deprecated/BmwPcanCanValidatorSandbox.java rename to reader/src/test/java/com/rusefi/can/deprecated/BmwPcanCanValidatorSandbox.java diff --git a/src/test/java/com/rusefi/can/deprecated/CANoeCanValidator.java b/reader/src/test/java/com/rusefi/can/deprecated/CANoeCanValidator.java similarity index 100% rename from src/test/java/com/rusefi/can/deprecated/CANoeCanValidator.java rename to reader/src/test/java/com/rusefi/can/deprecated/CANoeCanValidator.java diff --git a/src/test/java/com/rusefi/can/reader/impl/CANoeReaderTest.java b/reader/src/test/java/com/rusefi/can/reader/impl/CANoeReaderTest.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/CANoeReaderTest.java rename to reader/src/test/java/com/rusefi/can/reader/impl/CANoeReaderTest.java diff --git a/src/test/java/com/rusefi/can/reader/impl/CanHackerTest.java b/reader/src/test/java/com/rusefi/can/reader/impl/CanHackerTest.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/CanHackerTest.java rename to reader/src/test/java/com/rusefi/can/reader/impl/CanHackerTest.java diff --git a/src/test/java/com/rusefi/can/reader/impl/GetValueFromTrc.java b/reader/src/test/java/com/rusefi/can/reader/impl/GetValueFromTrc.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/GetValueFromTrc.java rename to reader/src/test/java/com/rusefi/can/reader/impl/GetValueFromTrc.java diff --git a/src/test/java/com/rusefi/can/reader/impl/ParseDBCTest.java b/reader/src/test/java/com/rusefi/can/reader/impl/ParseDBCTest.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/ParseDBCTest.java rename to reader/src/test/java/com/rusefi/can/reader/impl/ParseDBCTest.java diff --git a/src/test/java/com/rusefi/can/reader/impl/ParseDBCWithCommentTest.java b/reader/src/test/java/com/rusefi/can/reader/impl/ParseDBCWithCommentTest.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/ParseDBCWithCommentTest.java rename to reader/src/test/java/com/rusefi/can/reader/impl/ParseDBCWithCommentTest.java diff --git a/src/test/java/com/rusefi/can/reader/impl/ParseDbcFieldTest.java b/reader/src/test/java/com/rusefi/can/reader/impl/ParseDbcFieldTest.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/ParseDbcFieldTest.java rename to reader/src/test/java/com/rusefi/can/reader/impl/ParseDbcFieldTest.java diff --git a/src/test/java/com/rusefi/can/reader/impl/PcanReaderTest.java b/reader/src/test/java/com/rusefi/can/reader/impl/PcanReaderTest.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/PcanReaderTest.java rename to reader/src/test/java/com/rusefi/can/reader/impl/PcanReaderTest.java diff --git a/src/test/java/com/rusefi/can/reader/impl/ReadFullVagDbc.java b/reader/src/test/java/com/rusefi/can/reader/impl/ReadFullVagDbc.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/ReadFullVagDbc.java rename to reader/src/test/java/com/rusefi/can/reader/impl/ReadFullVagDbc.java diff --git a/src/test/java/com/rusefi/can/reader/impl/TrcToMlqSandbox.java b/reader/src/test/java/com/rusefi/can/reader/impl/TrcToMlqSandbox.java similarity index 100% rename from src/test/java/com/rusefi/can/reader/impl/TrcToMlqSandbox.java rename to reader/src/test/java/com/rusefi/can/reader/impl/TrcToMlqSandbox.java diff --git a/src/test/java/com/rusefi/can/writer/SteveWriterTest.java b/reader/src/test/java/com/rusefi/can/writer/SteveWriterTest.java similarity index 100% rename from src/test/java/com/rusefi/can/writer/SteveWriterTest.java rename to reader/src/test/java/com/rusefi/can/writer/SteveWriterTest.java diff --git a/src/test/resources/med.canhacker b/reader/src/test/resources/med.canhacker similarity index 100% rename from src/test/resources/med.canhacker rename to reader/src/test/resources/med.canhacker diff --git a/src/test/resources/vw_mqb_2010.dbc b/reader/src/test/resources/vw_mqb_2010.dbc similarity index 100% rename from src/test/resources/vw_mqb_2010.dbc rename to reader/src/test/resources/vw_mqb_2010.dbc