From 4858124edbb2d4d12695a650f47bf3387bd8c04c Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 31 Aug 2019 23:12:39 -0400 Subject: [PATCH] unified names for generated headers --- firmware/controllers/algo/accel_enrichment.h | 2 +- firmware/controllers/algo/engine_parts.h | 2 +- .../generated/{thermistor.h => thermistor_generated.h} | 8 ++++---- .../generated/{trigger_structs.h => trigger_generated.h} | 8 ++++---- .../generated/{wall_fuel.h => wall_fuel_generated.h} | 8 ++++---- firmware/controllers/trigger/trigger_central.h | 2 +- firmware/gen_config2.bat | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) rename firmware/controllers/generated/{thermistor.h => thermistor_generated.h} (66%) rename firmware/controllers/generated/{trigger_structs.h => trigger_generated.h} (64%) rename firmware/controllers/generated/{wall_fuel.h => wall_fuel_generated.h} (70%) diff --git a/firmware/controllers/algo/accel_enrichment.h b/firmware/controllers/algo/accel_enrichment.h index 7bda88fd1d..2020643010 100644 --- a/firmware/controllers/algo/accel_enrichment.h +++ b/firmware/controllers/algo/accel_enrichment.h @@ -13,7 +13,7 @@ #include "global.h" #include "cyclic_buffer.h" #include "table_helper.h" -#include "wall_fuel.h" +#include "wall_fuel_generated.h" typedef Map3D tps_tps_Map3D_t; diff --git a/firmware/controllers/algo/engine_parts.h b/firmware/controllers/algo/engine_parts.h index 6b9859e210..25a66ed7e5 100644 --- a/firmware/controllers/algo/engine_parts.h +++ b/firmware/controllers/algo/engine_parts.h @@ -11,7 +11,7 @@ #include "global.h" #include "engine_configuration_generated_structures.h" #include "cyclic_buffer.h" -#include "thermistor.h" +#include "thermistor_generated.h" #define MOCK_ADC_SIZE 16 diff --git a/firmware/controllers/generated/thermistor.h b/firmware/controllers/generated/thermistor_generated.h similarity index 66% rename from firmware/controllers/generated/thermistor.h rename to firmware/controllers/generated/thermistor_generated.h index 544fe9b6ad..095c73ec81 100644 --- a/firmware/controllers/generated/thermistor.h +++ b/firmware/controllers/generated/thermistor_generated.h @@ -1,8 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Sun Jul 21 16:36:56 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Sat Aug 31 23:11:36 EDT 2019 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_THERMISTOR_H -#define CONTROLLERS_GENERATED_THERMISTOR_H +#ifndef CONTROLLERS_GENERATED_THERMISTOR_GENERATED_H +#define CONTROLLERS_GENERATED_THERMISTOR_GENERATED_H #include "rusefi_types.h" // start of thermistor_state_s struct thermistor_state_s { @@ -25,4 +25,4 @@ typedef struct thermistor_state_s thermistor_state_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Sun Jul 21 16:36:56 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/thermistor.txt Sat Aug 31 23:11:36 EDT 2019 diff --git a/firmware/controllers/generated/trigger_structs.h b/firmware/controllers/generated/trigger_generated.h similarity index 64% rename from firmware/controllers/generated/trigger_structs.h rename to firmware/controllers/generated/trigger_generated.h index 980221ad61..30488ad3a8 100644 --- a/firmware/controllers/generated/trigger_structs.h +++ b/firmware/controllers/generated/trigger_generated.h @@ -1,8 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger.txt Sat Jul 20 12:29:51 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger.txt Sat Aug 31 23:11:37 EDT 2019 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_TRIGGER_STRUCTS_H -#define CONTROLLERS_GENERATED_TRIGGER_STRUCTS_H +#ifndef CONTROLLERS_GENERATED_TRIGGER_GENERATED_H +#define CONTROLLERS_GENERATED_TRIGGER_GENERATED_H #include "rusefi_types.h" #define HW_EVENT_TYPES 6 // start of trigger_central_s @@ -19,4 +19,4 @@ typedef struct trigger_central_s trigger_central_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger.txt Sat Jul 20 12:29:51 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger.txt Sat Aug 31 23:11:37 EDT 2019 diff --git a/firmware/controllers/generated/wall_fuel.h b/firmware/controllers/generated/wall_fuel_generated.h similarity index 70% rename from firmware/controllers/generated/wall_fuel.h rename to firmware/controllers/generated/wall_fuel_generated.h index 5066230b26..5f8a42108c 100644 --- a/firmware/controllers/generated/wall_fuel.h +++ b/firmware/controllers/generated/wall_fuel_generated.h @@ -1,8 +1,8 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel.txt Sun Jul 21 16:36:58 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel.txt Sat Aug 31 23:11:37 EDT 2019 // by class com.rusefi.output.CHeaderConsumer // begin -#ifndef CONTROLLERS_GENERATED_WALL_FUEL_H -#define CONTROLLERS_GENERATED_WALL_FUEL_H +#ifndef CONTROLLERS_GENERATED_WALL_FUEL_GENERATED_H +#define CONTROLLERS_GENERATED_WALL_FUEL_GENERATED_H #include "rusefi_types.h" // start of wall_fuel_state struct wall_fuel_state { @@ -23,4 +23,4 @@ typedef struct wall_fuel_state wall_fuel_state; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel.txt Sun Jul 21 16:36:58 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel.txt Sat Aug 31 23:11:37 EDT 2019 diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h index 07a6823740..b73f7e15d9 100644 --- a/firmware/controllers/trigger/trigger_central.h +++ b/firmware/controllers/trigger/trigger_central.h @@ -11,7 +11,7 @@ #include "rusefi_enums.h" #include "listener_array.h" #include "trigger_decoder.h" -#include "trigger_structs.h" +#include "trigger_generated.h" class Engine; typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX); diff --git a/firmware/gen_config2.bat b/firmware/gen_config2.bat index 4fd5ff91d4..050006e7b2 100644 --- a/firmware/gen_config2.bat +++ b/firmware/gen_config2.bat @@ -12,19 +12,19 @@ java -DSystemOut.name=gen_config2 ^ -jar ../java_tools/ConfigDefinition.jar ^ -definition integration/thermistor.txt ^ -java_destination ../java_console/models/src/com/rusefi/config/generated/ThermistorState.java ^ - -c_destination controllers/generated/thermistor.h + -c_destination controllers/generated/thermistor_generated.h java -DSystemOut.name=gen_config2 ^ -jar ../java_tools/ConfigDefinition.jar ^ -definition integration/trigger.txt ^ -java_destination ../java_console/models/src/com/rusefi/config/generated/TriggerState.java ^ - -c_destination controllers/generated/trigger_structs.h + -c_destination controllers/generated/trigger_generated.h java -DSystemOut.name=gen_config2 ^ -jar ../java_tools/ConfigDefinition.jar ^ -definition integration/wall_fuel.txt ^ -java_destination ../java_console/models/src/com/rusefi/config/generated/WallFuelState.java ^ - -c_destination controllers/generated/wall_fuel.h + -c_destination controllers/generated/wall_fuel_generated.h java -DSystemOut.name=gen_config2 ^ -cp ../java_tools/ConfigDefinition.jar;../java_tools/configuration_definition/lib/snakeyaml.jar ^