diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 9957bd80cb..d59cd99613 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -65,3 +65,56 @@ typedef struct { float s_h_c; /** total size 40*/ } ThermistorConf; + + +typedef struct { + /** + * kPa value at zero volts + * offset 0 + */ + float customValueAt0; + /** + * kPa value at 5 volts + * offset 4 + */ + float customValueAt5; + /** + * offset 8 + */ + air_pressure_sensor_type_e sensorType; + /** + * offset 12 + */ + adc_channel_e hwChannel; +/** total size 16*/ +} air_pressure_sensor_config_s; + + /** + * @brief MAP averaging configuration + + */ +typedef struct { + /** + * offset 0 + */ + float samplingAngleBins[MAP_ANGLE_SIZE]; + /** + * @brief MAP averaging sampling start angle, by RPM + * offset 32 + */ + float samplingAngle[MAP_ANGLE_SIZE]; + /** + * offset 64 + */ + float samplingWindowBins[MAP_WINDOW_SIZE]; + /** + * @brief MAP averaging angle duration, by RPM + * offset 96 + */ + float samplingWindow[MAP_WINDOW_SIZE]; + /** + * offset 128 + */ + air_pressure_sensor_config_s sensor; +/** total size 144*/ +} MAP_sensor_config_s; diff --git a/firmware/controllers/sensors/sensor_types.h b/firmware/controllers/sensors/sensor_types.h index b4447b7aa4..0cc5b65d50 100644 --- a/firmware/controllers/sensors/sensor_types.h +++ b/firmware/controllers/sensors/sensor_types.h @@ -14,40 +14,6 @@ #include "rusefi_enums.h" #include "engine_configuration_generated_structures.h" -typedef struct { - /** - * kPa value at zero volts - */ - float customValueAt0; - /** - * kPa value at 5 volts - */ - float customValueAt5; - air_pressure_sensor_type_e sensorType; - adc_channel_e hwChannel; -} air_pressure_sensor_config_s; - -/** - * @brief MAP averaging configuration - */ -typedef struct { - float samplingAngleBins[MAP_ANGLE_SIZE]; - /** - * @brief MAP averaging sampling start angle, by RPM - */ - float samplingAngle[MAP_ANGLE_SIZE]; - - float samplingWindowBins[MAP_WINDOW_SIZE]; - /** - * @brief MAP averaging angle duration, by RPM - */ - float samplingWindow[MAP_WINDOW_SIZE]; - - air_pressure_sensor_config_s sensor; - -} MAP_sensor_config_s; - - typedef struct { ThermistorConf *config; adc_channel_e channel;