Move cypress, kinetis, and subaru generated from algo/ to generated/

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
 

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; }

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/

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)
 

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; }

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/

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

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; }

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/

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/
 

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