From fa6737cb587e9e7d4a955bec4ac6ca5a46d23c9f Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 4 Sep 2024 11:26:22 -0400 Subject: [PATCH] explicit-folder-for-livedata-generated-headers #6886 --- firmware/common.mk | 3 ++- .../actuators => live_data_generated}/ac_control_generated.h | 0 .../antilag_system_state_generated.h | 0 .../boost_control_generated.h | 0 .../actuators => live_data_generated}/dc_motors_generated.h | 0 .../electronic_throttle_generated.h | 0 .../algo => live_data_generated}/engine_state_generated.h | 0 .../actuators => live_data_generated}/fan_control_generated.h | 0 .../fuel => live_data_generated}/fuel_computer_generated.h | 0 .../fuel_pump_control_generated.h | 0 .../high_pressure_fuel_pump_generated.h | 0 .../actuators => live_data_generated}/idle_state_generated.h | 0 .../algo => live_data_generated}/ignition_state_generated.h | 0 .../fuel => live_data_generated}/injector_model_generated.h | 0 .../knock_controller_generated.h | 0 .../math => live_data_generated}/lambda_monitor_generated.h | 0 .../launch_control_state_generated.h | 0 .../actuators => live_data_generated}/main_relay_generated.h | 0 .../binary => live_data_generated}/output_channels_generated.h | 0 .../{util/math => live_data_generated}/pid_state_generated.h | 0 .../sensors => live_data_generated}/sent_state_generated.h | 0 .../tcu => live_data_generated}/tcu_controller_generated.h | 0 .../math => live_data_generated}/throttle_model_generated.h | 0 .../algo => live_data_generated}/tps_accel_state_generated.h | 0 .../trigger_central_generated.h | 0 .../trigger => live_data_generated}/trigger_state_generated.h | 0 .../trigger_state_primary_generated.h | 0 .../actuators => live_data_generated}/vvt_generated.h | 0 .../algo => live_data_generated}/wall_fuel_state_generated.h | 0 .../sensors => live_data_generated}/wideband_state_generated.h | 0 firmware/pch/pch.h | 2 +- .../src/main/java/com/rusefi/ldmp/LiveDataProcessor.java | 2 +- 32 files changed, 4 insertions(+), 3 deletions(-) rename firmware/{controllers/actuators => live_data_generated}/ac_control_generated.h (100%) rename firmware/{controllers/algo => live_data_generated}/antilag_system_state_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/boost_control_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/dc_motors_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/electronic_throttle_generated.h (100%) rename firmware/{controllers/algo => live_data_generated}/engine_state_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/fan_control_generated.h (100%) rename firmware/{controllers/algo/fuel => live_data_generated}/fuel_computer_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/fuel_pump_control_generated.h (100%) rename firmware/{controllers/engine_cycle => live_data_generated}/high_pressure_fuel_pump_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/idle_state_generated.h (100%) rename firmware/{controllers/algo => live_data_generated}/ignition_state_generated.h (100%) rename firmware/{controllers/algo/fuel => live_data_generated}/injector_model_generated.h (100%) rename firmware/{controllers/engine_cycle => live_data_generated}/knock_controller_generated.h (100%) rename firmware/{controllers/math => live_data_generated}/lambda_monitor_generated.h (100%) rename firmware/{controllers/algo => live_data_generated}/launch_control_state_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/main_relay_generated.h (100%) rename firmware/{console/binary => live_data_generated}/output_channels_generated.h (100%) rename firmware/{util/math => live_data_generated}/pid_state_generated.h (100%) rename firmware/{controllers/sensors => live_data_generated}/sent_state_generated.h (100%) rename firmware/{controllers/tcu => live_data_generated}/tcu_controller_generated.h (100%) rename firmware/{controllers/math => live_data_generated}/throttle_model_generated.h (100%) rename firmware/{controllers/algo => live_data_generated}/tps_accel_state_generated.h (100%) rename firmware/{controllers/trigger => live_data_generated}/trigger_central_generated.h (100%) rename firmware/{controllers/trigger => live_data_generated}/trigger_state_generated.h (100%) rename firmware/{controllers/trigger => live_data_generated}/trigger_state_primary_generated.h (100%) rename firmware/{controllers/actuators => live_data_generated}/vvt_generated.h (100%) rename firmware/{controllers/algo => live_data_generated}/wall_fuel_state_generated.h (100%) rename firmware/{controllers/sensors => live_data_generated}/wideband_state_generated.h (100%) diff --git a/firmware/common.mk b/firmware/common.mk index 916bdae8d9..77d088096d 100644 --- a/firmware/common.mk +++ b/firmware/common.mk @@ -35,6 +35,7 @@ ALLINC += \ $(DEVELOPMENT_DIR) \ $(ENGINES_INC) \ $(PROJECT_DIR)/config/engines \ + $(PROJECT_DIR)/live_data_generated \ $(BOARDS_DIR) \ $(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/init \ @@ -46,4 +47,4 @@ ALLINC += \ $(CONTROLLERS_SENSORS_INC) \ $(CONTROLLERS_INC) \ $(PROJECT_DIR)/console/binary/generated \ - + diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/live_data_generated/ac_control_generated.h similarity index 100% rename from firmware/controllers/actuators/ac_control_generated.h rename to firmware/live_data_generated/ac_control_generated.h diff --git a/firmware/controllers/algo/antilag_system_state_generated.h b/firmware/live_data_generated/antilag_system_state_generated.h similarity index 100% rename from firmware/controllers/algo/antilag_system_state_generated.h rename to firmware/live_data_generated/antilag_system_state_generated.h diff --git a/firmware/controllers/actuators/boost_control_generated.h b/firmware/live_data_generated/boost_control_generated.h similarity index 100% rename from firmware/controllers/actuators/boost_control_generated.h rename to firmware/live_data_generated/boost_control_generated.h diff --git a/firmware/controllers/actuators/dc_motors_generated.h b/firmware/live_data_generated/dc_motors_generated.h similarity index 100% rename from firmware/controllers/actuators/dc_motors_generated.h rename to firmware/live_data_generated/dc_motors_generated.h diff --git a/firmware/controllers/actuators/electronic_throttle_generated.h b/firmware/live_data_generated/electronic_throttle_generated.h similarity index 100% rename from firmware/controllers/actuators/electronic_throttle_generated.h rename to firmware/live_data_generated/electronic_throttle_generated.h diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/live_data_generated/engine_state_generated.h similarity index 100% rename from firmware/controllers/algo/engine_state_generated.h rename to firmware/live_data_generated/engine_state_generated.h diff --git a/firmware/controllers/actuators/fan_control_generated.h b/firmware/live_data_generated/fan_control_generated.h similarity index 100% rename from firmware/controllers/actuators/fan_control_generated.h rename to firmware/live_data_generated/fan_control_generated.h diff --git a/firmware/controllers/algo/fuel/fuel_computer_generated.h b/firmware/live_data_generated/fuel_computer_generated.h similarity index 100% rename from firmware/controllers/algo/fuel/fuel_computer_generated.h rename to firmware/live_data_generated/fuel_computer_generated.h diff --git a/firmware/controllers/actuators/fuel_pump_control_generated.h b/firmware/live_data_generated/fuel_pump_control_generated.h similarity index 100% rename from firmware/controllers/actuators/fuel_pump_control_generated.h rename to firmware/live_data_generated/fuel_pump_control_generated.h diff --git a/firmware/controllers/engine_cycle/high_pressure_fuel_pump_generated.h b/firmware/live_data_generated/high_pressure_fuel_pump_generated.h similarity index 100% rename from firmware/controllers/engine_cycle/high_pressure_fuel_pump_generated.h rename to firmware/live_data_generated/high_pressure_fuel_pump_generated.h diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/live_data_generated/idle_state_generated.h similarity index 100% rename from firmware/controllers/actuators/idle_state_generated.h rename to firmware/live_data_generated/idle_state_generated.h diff --git a/firmware/controllers/algo/ignition_state_generated.h b/firmware/live_data_generated/ignition_state_generated.h similarity index 100% rename from firmware/controllers/algo/ignition_state_generated.h rename to firmware/live_data_generated/ignition_state_generated.h diff --git a/firmware/controllers/algo/fuel/injector_model_generated.h b/firmware/live_data_generated/injector_model_generated.h similarity index 100% rename from firmware/controllers/algo/fuel/injector_model_generated.h rename to firmware/live_data_generated/injector_model_generated.h diff --git a/firmware/controllers/engine_cycle/knock_controller_generated.h b/firmware/live_data_generated/knock_controller_generated.h similarity index 100% rename from firmware/controllers/engine_cycle/knock_controller_generated.h rename to firmware/live_data_generated/knock_controller_generated.h diff --git a/firmware/controllers/math/lambda_monitor_generated.h b/firmware/live_data_generated/lambda_monitor_generated.h similarity index 100% rename from firmware/controllers/math/lambda_monitor_generated.h rename to firmware/live_data_generated/lambda_monitor_generated.h diff --git a/firmware/controllers/algo/launch_control_state_generated.h b/firmware/live_data_generated/launch_control_state_generated.h similarity index 100% rename from firmware/controllers/algo/launch_control_state_generated.h rename to firmware/live_data_generated/launch_control_state_generated.h diff --git a/firmware/controllers/actuators/main_relay_generated.h b/firmware/live_data_generated/main_relay_generated.h similarity index 100% rename from firmware/controllers/actuators/main_relay_generated.h rename to firmware/live_data_generated/main_relay_generated.h diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/live_data_generated/output_channels_generated.h similarity index 100% rename from firmware/console/binary/output_channels_generated.h rename to firmware/live_data_generated/output_channels_generated.h diff --git a/firmware/util/math/pid_state_generated.h b/firmware/live_data_generated/pid_state_generated.h similarity index 100% rename from firmware/util/math/pid_state_generated.h rename to firmware/live_data_generated/pid_state_generated.h diff --git a/firmware/controllers/sensors/sent_state_generated.h b/firmware/live_data_generated/sent_state_generated.h similarity index 100% rename from firmware/controllers/sensors/sent_state_generated.h rename to firmware/live_data_generated/sent_state_generated.h diff --git a/firmware/controllers/tcu/tcu_controller_generated.h b/firmware/live_data_generated/tcu_controller_generated.h similarity index 100% rename from firmware/controllers/tcu/tcu_controller_generated.h rename to firmware/live_data_generated/tcu_controller_generated.h diff --git a/firmware/controllers/math/throttle_model_generated.h b/firmware/live_data_generated/throttle_model_generated.h similarity index 100% rename from firmware/controllers/math/throttle_model_generated.h rename to firmware/live_data_generated/throttle_model_generated.h diff --git a/firmware/controllers/algo/tps_accel_state_generated.h b/firmware/live_data_generated/tps_accel_state_generated.h similarity index 100% rename from firmware/controllers/algo/tps_accel_state_generated.h rename to firmware/live_data_generated/tps_accel_state_generated.h diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/live_data_generated/trigger_central_generated.h similarity index 100% rename from firmware/controllers/trigger/trigger_central_generated.h rename to firmware/live_data_generated/trigger_central_generated.h diff --git a/firmware/controllers/trigger/trigger_state_generated.h b/firmware/live_data_generated/trigger_state_generated.h similarity index 100% rename from firmware/controllers/trigger/trigger_state_generated.h rename to firmware/live_data_generated/trigger_state_generated.h diff --git a/firmware/controllers/trigger/trigger_state_primary_generated.h b/firmware/live_data_generated/trigger_state_primary_generated.h similarity index 100% rename from firmware/controllers/trigger/trigger_state_primary_generated.h rename to firmware/live_data_generated/trigger_state_primary_generated.h diff --git a/firmware/controllers/actuators/vvt_generated.h b/firmware/live_data_generated/vvt_generated.h similarity index 100% rename from firmware/controllers/actuators/vvt_generated.h rename to firmware/live_data_generated/vvt_generated.h diff --git a/firmware/controllers/algo/wall_fuel_state_generated.h b/firmware/live_data_generated/wall_fuel_state_generated.h similarity index 100% rename from firmware/controllers/algo/wall_fuel_state_generated.h rename to firmware/live_data_generated/wall_fuel_state_generated.h diff --git a/firmware/controllers/sensors/wideband_state_generated.h b/firmware/live_data_generated/wideband_state_generated.h similarity index 100% rename from firmware/controllers/sensors/wideband_state_generated.h rename to firmware/live_data_generated/wideband_state_generated.h diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h index f9f082fb2f..6e8b2bc711 100644 --- a/firmware/pch/pch.h +++ b/firmware/pch/pch.h @@ -22,8 +22,8 @@ #include "loggingcentral.h" #include "error_handling.h" #include "efi_gpio.h" -#include "tunerstudio_outputs.h" #ifndef EFI_BOOTLOADER +#include "tunerstudio_outputs.h" #include "engine.h" #endif // EFI_BOOTLOADER #include "engine_configuration.h" diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index e66865d274..6acb3debe0 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java @@ -276,7 +276,7 @@ public class LiveDataProcessor { outFolder = inputOutputFolder; } - handler.onEntry(name, java, inputFolder, prepend, withCDefines, outputNamesArr, constexpr, conditional, engineModule, isPtr, cppFileName, outFolder); + handler.onEntry(name, java, inputFolder, prepend, withCDefines, outputNamesArr, constexpr, conditional, engineModule, isPtr, cppFileName, "live_data_generated"); String enumName = "LDS_" + name; String type = name + "_s"; // convention