From bf123b85ee8ae882f29248eb299e069906455255 Mon Sep 17 00:00:00 2001
From: rusefi <arro239+rusefi@gmail.com>
Date: Fri, 26 Jan 2018 11:37:18 -0500
Subject: [PATCH] toolset progress

---
 firmware/gen_enum_to_string.bat               |   3 +++
 firmware/gen_trigger_images.bat               |   1 +
 java_tools/enum2string.jar                    | Bin 6071 -> 6217 bytes
 .../src/com/rusefi/EnumToString.java          |  21 ++++++++++++------
 4 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 firmware/gen_enum_to_string.bat

diff --git a/firmware/gen_enum_to_string.bat b/firmware/gen_enum_to_string.bat
new file mode 100644
index 0000000000..235caef322
--- /dev/null
+++ b/firmware/gen_enum_to_string.bat
@@ -0,0 +1,3 @@
+rem This batch files reads rusefi_enums.h and produses auto_generated_enums.* files
+
+java -jar ../java_tools/enum2string.jar . controllers/algo
diff --git a/firmware/gen_trigger_images.bat b/firmware/gen_trigger_images.bat
index de051ce931..25c5677c62 100644
--- a/firmware/gen_trigger_images.bat
+++ b/firmware/gen_trigger_images.bat
@@ -1,3 +1,4 @@
 rem This takes triggers.txt generated by unit_test binary and produces a bunch of .png files
+rem these images are published at
 
 java -cp ../java_console_binary/rusefi_console.jar com.rusefi.TriggerImage
\ No newline at end of file
diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar
index 17a22f39763964b7b752ce9b7721c81996d57c36..c48eb7c210ccf0c0f22ed7284fb00a964cbbb19f 100644
GIT binary patch
literal 6217
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
G2>2ghtOqgx

literal 6071
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

diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java
index 188f215261..64e8463baa 100644
--- a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java
+++ b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java
@@ -1,6 +1,7 @@
 package com.rusefi;
 
 import java.io.*;
+import java.util.Date;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -17,21 +18,22 @@ public class EnumToString {
     private final static StringBuilder header = new StringBuilder();
 
     public static void main(String[] args) throws IOException {
-        if (args.length != 1) {
-            System.out.println("Please specify one parameter: path to firmware folder");
+        if (args.length != 2) {
+            System.out.println("Please specify two parameters: path to firmware folder and path to output folder");
             return;
         }
-        String path = args[0];
+        String inputPath = args[0];
+        String outputPath = args[1];
 
         header.append("#ifndef _A_H_HEADER_\r\n");
         header.append("#define _A_H_HEADER_\r\n");
 
-        process(path + File.separator + "controllers/algo/io_pins.h");
-        process(path + File.separator + "controllers/algo/rusefi_enums.h");
+//        process(path + File.separator + "controllers/algo/io_pins.h");
+        process(inputPath + File.separator + "controllers/algo/rusefi_enums.h");
 
         header.append("#endif /*_A_H_HEADER_ */\r\n");
 
-        writeResult("auto_generated_enums");
+        writeResult(outputPath + File.separator + "auto_generated_enums");
     }
 
     private static void writeResult(String outFileName) throws IOException {
@@ -48,7 +50,12 @@ public class EnumToString {
         BufferedReader reader;
 
         String header = "// auto-generated from" + inFileName + "\r\n" +
-                "// by enum2string.jar tool\r\n\r\n";
+                "// by enum2string.jar tool\r\n" +
+                "// on " + new Date() +"\r\n" +
+                "// see also gen_config_and_enums.bat\r\n" +
+                "\r\n" +
+                "\r\n" +
+                "\r\n";
         result.append(header);
         EnumToString.header.append(header);