From 489b115611ebcb9b7a087c8a0a4a8bed4a043874 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 27 May 2019 20:06:01 -0400 Subject: [PATCH] generator progress --- ...ngine_configuration_generated_structures.h | 8 ++++---- java_tools/ConfigDefinition.jar | Bin 60595 -> 60845 bytes .../runConfigurations/ConfigDefinition.xml | 2 +- .../src/com/rusefi/ConfigDefinition.java | 6 +----- .../com/rusefi/output/CHeaderConsumer.java | 12 ++++++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 7059c7b658..75cadd4a4c 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,7 +1,7 @@ -// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 19:21:18 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 20:05:22 EDT 2019 // begin -#ifndef ENGINE_CONFIGURATION_GENERATED_H_ -#define ENGINE_CONFIGURATION_GENERATED_H_ +#ifndef CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H +#define CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #include "rusefi_types.h" // start of pid_s struct pid_s { @@ -2788,4 +2788,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 19:21:18 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 20:05:22 EDT 2019 diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index b0f08df4aec22ec3856ae8c887f239baa91d9855..962d73e6409eb427f5ec0b054af90ab2a345bb92 100644 GIT binary patch delta 11146 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 P|F`Cq$;TJ|bHe`tXdeWx diff --git a/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml b/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml index 8638714b55..23175c3bc9 100644 --- a/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml +++ b/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml @@ -2,7 +2,7 @@