diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk index be4a5ef03c..27c2bc9210 100644 --- a/firmware/controllers/controllers.mk +++ b/firmware/controllers/controllers.mk @@ -29,5 +29,6 @@ CONTROLLERS_SRC_CPP = \ CONTROLLERS_INC=\ $(CONTROLLERS_DIR) \ $(CONTROLLERS_DIR)/scheduling \ + $(CONTROLLERS_DIR)/generated \ $(CONTROLLERS_DIR)/actuators \ diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h similarity index 99% rename from firmware/controllers/algo/engine_configuration_generated_structures.h rename to firmware/controllers/generated/engine_configuration_generated_structures.h index ec3fbe875f..c3a37922d4 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,7 +1,7 @@ -// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 15 13:52:19 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 15 21:58:40 EDT 2019 // begin -#ifndef CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H -#define CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H +#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H +#define CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #include "rusefi_types.h" // start of pid_s struct pid_s { @@ -2809,4 +2809,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 Sat Jun 15 13:52:19 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jun 15 21:58:40 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h similarity index 100% rename from firmware/controllers/algo/rusefi_generated.h rename to firmware/controllers/generated/rusefi_generated.h diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat index cbe22acfcd..8365528dd3 100644 --- a/firmware/gen_config.bat +++ b/firmware/gen_config.bat @@ -13,8 +13,8 @@ java -Drusefi.generator.lazyfile.enabled=true ^ -definition integration\rusefi_config.txt ^ -romraider integration ^ -ts_destination tunerstudio ^ - -c_defines controllers\algo\rusefi_generated.h ^ - -c_destination controllers\algo\engine_configuration_generated_structures.h ^ + -c_defines controllers\generated\rusefi_generated.h ^ + -c_destination controllers\generated\engine_configuration_generated_structures.h ^ -java_destination ../java_console/models/src/com/rusefi/config/Fields.java ^ -romraider_destination ../java_console/rusefi.xml ^ -skip build/config.gen