diff --git a/firmware/config/boards/cypress/board.mk b/firmware/config/boards/cypress/board.mk index 82a4fb589c..a00629e7bc 100644 --- a/firmware/config/boards/cypress/board.mk +++ b/firmware/config/boards/cypress/board.mk @@ -10,7 +10,8 @@ BOARDSRC = $(BOARD_DIR)/board.c BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp # Required include directories -BOARDINC += $(BOARD_DIR)/config/controllers/algo +BOARDINC += $(BOARD_DIR)/config/controllers/generated \ + $(BOARD_DIR)/config/controllers/algo BOARDINC += $(PDL_DIR)/driver $(PDL_DIR)/driver/gpio $(PDL_DIR)/driver/usb $(PDL_DIR)/driver/mfs $(PDL_DIR)/midware/usb/device diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h b/firmware/config/boards/cypress/config/controllers/generated/engine_configuration_generated_structures_cypress.h similarity index 100% rename from firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h rename to firmware/config/boards/cypress/config/controllers/generated/engine_configuration_generated_structures_cypress.h diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/generated/rusefi_generated_cypress.h similarity index 100% rename from firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h rename to firmware/config/boards/cypress/config/controllers/generated/rusefi_generated_cypress.h diff --git a/firmware/config/boards/cypress/config/gen_cypress_config.sh b/firmware/config/boards/cypress/config/gen_cypress_config.sh index 5af436379f..b8e1afc830 100755 --- a/firmware/config/boards/cypress/config/gen_cypress_config.sh +++ b/firmware/config/boards/cypress/config/gen_cypress_config.sh @@ -34,8 +34,8 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool hellen_cypress_gen_config.bat \ $COMMON_GEN_CONFIG \ - -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated_cypress.h \ - -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures_cypress.h \ + -c_defines ${BOARD_DIR}/config/controllers/generated/rusefi_generated_cypress.h \ + -c_destination ${BOARD_DIR}/config/controllers/generated/engine_configuration_generated_structures_cypress.h \ -enumInputFile controllers/algo/rusefi_hw_enums.h [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } diff --git a/firmware/config/boards/cypress/meta-info.env b/firmware/config/boards/cypress/meta-info.env index 7527a7a7fa..956087f0d7 100644 --- a/firmware/config/boards/cypress/meta-info.env +++ b/firmware/config/boards/cypress/meta-info.env @@ -1,3 +1,4 @@ SHORT_BOARD_NAME=cypress PROJECT_CPU=custom_platform CUSTOM_GEN_CONFIG=config/gen_cypress_config.sh +META_OUTPUT_ROOT_FOLDER=config/boards/cypress/config/ diff --git a/firmware/config/boards/kinetis/board.mk b/firmware/config/boards/kinetis/board.mk index c935a7c30e..50ffd21768 100644 --- a/firmware/config/boards/kinetis/board.mk +++ b/firmware/config/boards/kinetis/board.mk @@ -5,7 +5,8 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp # Required include directories BOARDINC = $(BOARD_DIR) -BOARDINC += $(BOARD_DIR)/config/controllers/algo +BOARDINC += $(BOARD_DIR)/config/controllers/generated \ + $(BOARD_DIR)/config/controllers/algo BOARDCPPSRC += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h b/firmware/config/boards/kinetis/config/controllers/generated/engine_configuration_generated_structures_kin.h similarity index 100% rename from firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h rename to firmware/config/boards/kinetis/config/controllers/generated/engine_configuration_generated_structures_kin.h diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/generated/rusefi_generated_kin.h similarity index 100% rename from firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h rename to firmware/config/boards/kinetis/config/controllers/generated/rusefi_generated_kin.h diff --git a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh index 0c328e3fb0..57cddf5a52 100755 --- a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh +++ b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh @@ -34,8 +34,8 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool kinetis_gen_config.bat \ $COMMON_GEN_CONFIG \ - -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated_kin.h \ - -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures_kin.h \ + -c_defines ${BOARD_DIR}/config/controllers/generated/rusefi_generated_kin.h \ + -c_destination ${BOARD_DIR}/config/controllers/generated/engine_configuration_generated_structures_kin.h \ -enumInputFile controllers/algo/rusefi_hw_enums.h [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } diff --git a/firmware/config/boards/kinetis/meta-info.env b/firmware/config/boards/kinetis/meta-info.env index fbc5e46914..25faa7707f 100644 --- a/firmware/config/boards/kinetis/meta-info.env +++ b/firmware/config/boards/kinetis/meta-info.env @@ -1,3 +1,4 @@ SHORT_BOARD_NAME=kin PROJECT_CPU=custom_platform CUSTOM_GEN_CONFIG=config/gen_kinetis_config.sh +META_OUTPUT_ROOT_FOLDER=config/boards/kinetis/config/ diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index dc86759b89..f40f2c25b0 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -5,7 +5,8 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp \ # board.c from this directory BOARD_C = $(BOARD_DIR)/board.c # Required include directories -BOARDINC += $(BOARD_DIR)/config/controllers/algo +BOARDINC += $(BOARD_DIR)/config/controllers/generated \ + $(BOARD_DIR)/config/controllers/algo #LED DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::G7 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h similarity index 100% rename from firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h rename to firmware/config/boards/subaru_eg33/config/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/generated/rusefi_generated_subaru_eg33_f7.h similarity index 100% rename from firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h rename to firmware/config/boards/subaru_eg33/config/controllers/generated/rusefi_generated_subaru_eg33_f7.h diff --git a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh index 200c737e32..e3a570fb47 100755 --- a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh +++ b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh @@ -34,8 +34,8 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool ${BOARD_DIR}/config/gen_subaru_config.sh \ $COMMON_GEN_CONFIG \ - -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h \ - -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h \ + -c_defines ${BOARD_DIR}/config/controllers/generated/rusefi_generated_subaru_eg33_f7.h \ + -c_destination ${BOARD_DIR}/config/controllers/generated/engine_configuration_generated_structures_subaru_eg33_f7.h \ -enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } diff --git a/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env index 518ba74452..7bbde38789 100644 --- a/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env +++ b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env @@ -3,3 +3,4 @@ PROJECT_CPU=ARCH_STM32F7 USE_OPENBLT=yes CUSTOM_GEN_CONFIG=config/gen_subaru_config.sh SKIP_RATE=50 +META_OUTPUT_ROOT_FOLDER=config/boards/subaru_eg33/config/ \ No newline at end of file diff --git a/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env index 13d43107c4..37d4d05f80 100644 --- a/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env +++ b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env @@ -2,4 +2,5 @@ SHORT_BOARD_NAME=subaru_eg33_f7 PROJECT_CPU=ARCH_STM32F7 CUSTOM_GEN_CONFIG=config/gen_subaru_config.sh SKIP_RATE=50 +META_OUTPUT_ROOT_FOLDER=config/boards/subaru_eg33/config/ diff --git a/firmware/rusefi.mk b/firmware/rusefi.mk index 39832cfaca..f8f5f3c499 100644 --- a/firmware/rusefi.mk +++ b/firmware/rusefi.mk @@ -28,7 +28,7 @@ endif BOARDS_DIR = $(PROJECT_DIR)/config/boards ifneq ($(META_OUTPUT_ROOT_FOLDER),) - ALLINC += $(META_OUTPUT_ROOT_FOLDER)controllers/generated + ALLINC += $(PROJECT_DIR)/$(META_OUTPUT_ROOT_FOLDER)controllers/generated endif # allow passing a custom board dir, otherwise generate it based on the board name