From 626b92fd2492de2cf6d26573bf4656511173f368 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 15 Feb 2024 21:21:27 -0500 Subject: [PATCH] better name into counters --- .../java/com/rusefi/can/analysis/ByteRateOfChangeReports.java | 4 ++-- .../main/java/com/rusefi/can/analysis/ChecksumScanner.java | 3 ++- .../src/main/java/com/rusefi/can/analysis/CounterScanner.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java b/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java index 85b1123..0d655b9 100644 --- a/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java +++ b/reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java @@ -105,8 +105,8 @@ public class ByteRateOfChangeReports { PerSidDump.handle(reportDestinationFolder, simpleFileName, logFileContent); // at the moment we overwrite counter detection report after we process each file - CounterScanner.scanForCounters(reportDestinationFolder, logFileContent); - ChecksumScanner.scanForChecksums(reportDestinationFolder, logFileContent); + CounterScanner.scanForCounters(reportDestinationFolder, simpleFileName, logFileContent); + ChecksumScanner.scanForChecksums(reportDestinationFolder, simpleFileName, logFileContent); CanToMegaLogViewer.createMegaLogViewer(reportDestinationFolder, logFileContent, simpleFileName); diff --git a/reader/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java b/reader/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java index b278daf..964473a 100644 --- a/reader/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java +++ b/reader/src/main/java/com/rusefi/can/analysis/ChecksumScanner.java @@ -13,7 +13,7 @@ public class ChecksumScanner { public static final String CHECKSUM_YAML = "checksum.yaml"; - public static void scanForChecksums(String reportDestinationFolder, List packets) throws IOException { + public static void scanForChecksums(String reportDestinationFolder, String simpleFileName, List packets) throws IOException { Map isChecksumMap = new HashMap<>(); J1850_SAE_crc8_Calculator c = new J1850_SAE_crc8_Calculator(); @@ -43,6 +43,7 @@ public class ChecksumScanner { } withChecksum.sort(Comparator.naturalOrder()); Yaml yaml = new Yaml(); + // simpleFileName + "_" + String yamlCountersReportFileName = reportDestinationFolder + File.separator + CHECKSUM_YAML; System.out.println(new Date() + " Writing report to " + yamlCountersReportFileName); yaml.dump(withChecksum, new FileWriter(yamlCountersReportFileName)); diff --git a/reader/src/main/java/com/rusefi/can/analysis/CounterScanner.java b/reader/src/main/java/com/rusefi/can/analysis/CounterScanner.java index 07f8428..17c467c 100644 --- a/reader/src/main/java/com/rusefi/can/analysis/CounterScanner.java +++ b/reader/src/main/java/com/rusefi/can/analysis/CounterScanner.java @@ -10,9 +10,9 @@ public class CounterScanner { public static final String COUNTERS_YAML = "counters.yaml"; - public static void scanForCounters(String reportDestinationFolder, List packets) throws IOException { + public static void scanForCounters(String reportDestinationFolder, String simpleFileName, List packets) throws IOException { - String outputFileName = reportDestinationFolder + File.separator + "counter_report.txt"; + String outputFileName = reportDestinationFolder + File.separator + simpleFileName + "_counter_report.txt"; PrintWriter pw = new PrintWriter(new FileOutputStream(outputFileName)); Map bitStates = new TreeMap<>();