diff --git a/firmware/.gitignore b/firmware/.gitignore index 02c65c8d52..3167e5acaf 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -1,5 +1,3 @@ openocd benchmark.txt -gen_config.log -gen_config_board.log -gen_enum_to_string.log +gen_*.log diff --git a/firmware/controllers/generated/thermistor.h b/firmware/controllers/generated/thermistor.h index 4db466f4dd..973faea12f 100644 --- a/firmware/controllers/generated/thermistor.h +++ b/firmware/controllers/generated/thermistor.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on integration/thermistor.txt Sat Jun 15 17:39:00 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Mon Jun 17 20:32:33 EDT 2019 // begin #ifndef CONTROLLERS_GENERATED_THERMISTOR_H #define CONTROLLERS_GENERATED_THERMISTOR_H @@ -24,4 +24,4 @@ typedef struct thermistor_state_s thermistor_state_s; #endif // end -// this section was generated automatically by ConfigDefinition.jar based on integration/thermistor.txt Sat Jun 15 17:39:00 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Mon Jun 17 20:32:33 EDT 2019 diff --git a/java_console/models/src/com/rusefi/config/generated/ThermistorState.java b/java_console/models/src/com/rusefi/config/generated/ThermistorState.java index c4b8a769b2..94287a586b 100644 --- a/java_console/models/src/com/rusefi/config/generated/ThermistorState.java +++ b/java_console/models/src/com/rusefi/config/generated/ThermistorState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by ConfigDefinition.jar based on integration/thermistor.txt Sun Jun 16 22:18:54 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Mon Jun 17 20:32:33 EDT 2019 import com.rusefi.config.*; diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/ThermistorMeta.java b/java_console/ui/src/com/rusefi/ldmp/generated/ThermistorsMeta.java similarity index 94% rename from java_console/ui/src/com/rusefi/ldmp/generated/ThermistorMeta.java rename to java_console/ui/src/com/rusefi/ldmp/generated/ThermistorsMeta.java index c6de6efa1b..2abfea1c60 100644 --- a/java_console/ui/src/com/rusefi/ldmp/generated/ThermistorMeta.java +++ b/java_console/ui/src/com/rusefi/ldmp/generated/ThermistorsMeta.java @@ -2,7 +2,7 @@ package com.rusefi.ldmp.generated; import com.rusefi.ldmp.*; -public class ThermistorMeta { +public class ThermistorsMeta { public static final Request[] CONTENT = new Request[]{ new TextRequest("Analog_MCU_reads"), new FieldRequest("voltageMCU"), diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java b/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java index 947261b9c3..390fa890c7 100644 --- a/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java +++ b/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java @@ -8,7 +8,7 @@ import com.rusefi.ldmp.ConfigRequest; import com.rusefi.ldmp.FieldRequest; import com.rusefi.ldmp.Request; import com.rusefi.ldmp.TextRequest; -import com.rusefi.ldmp.generated.ThermistorMeta; +import com.rusefi.ldmp.generated.ThermistorsMeta; import net.miginfocom.swing.MigLayout; import org.jetbrains.annotations.NotNull; @@ -23,7 +23,7 @@ public class LiveDocPanel { JPanel panel = new JPanel(new MigLayout()); panel.setBorder(BorderFactory.createTitledBorder(title)); - List actions = createComponents(panel, ThermistorMeta.CONTENT, values, instancePrefix); + List actions = createComponents(panel, ThermistorsMeta.CONTENT, values, instancePrefix); LiveDocHolder holder = new LiveDocHolder(id, actions, values) { @Override