From 338acdecbfb76228118930ec67fec275e15fa9cf Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 23 Jan 2015 13:07:33 -0600 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.h | 7 ------ ...ngine_configuration_generated_structures.h | 24 +++++++++++++++++++ firmware/rusefi.cpp | 2 +- firmware/rusefi_config.ini | 21 ++++++++++++++++ 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index e149b29d83..bfab159b79 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -87,13 +87,6 @@ typedef enum { Internal_ForceMyEnumIntSize_can_device_mode = ENUM_32_BITS, } can_device_mode_e; -typedef struct { - adc_channel_e afrAdcChannel; - float v1; - float value1; - float v2; - float value2; -} afr_sensor_s; #define DWELL_COUNT 8 diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 9d3bb5821e..b5c172a5f8 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -154,3 +154,27 @@ typedef struct { /** total size 28*/ } trigger_config_s; +typedef struct { + /** + * offset 0 + */ + adc_channel_e afrAdcChannel; + /** + * offset 4 + */ + float v1; + /** + * offset 8 + */ + float value1; + /** + * offset 12 + */ + float v2; + /** + * offset 16 + */ + float value2; +/** total size 20*/ +} afr_sensor_s; + diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index e30165c147..9ea22d226c 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -262,5 +262,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150121; + return 20150123; } diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini index b72ce22fda..74649c7621 100644 --- a/firmware/rusefi_config.ini +++ b/firmware/rusefi_config.ini @@ -200,6 +200,27 @@ float globalFuelCorrection; adc_channel_e iatAdcChannel; adc_channel_e mafAdcChannel; +struct afr_sensor_s + adc_channel_e afrAdcChannel; + float v1; + float value1; + float v2; + float value2; + +end_struct + +afr_sensor_s afrSensor;@see hasAfrSensor +float injectionAngle;this is about deciding when the injector starts it's squirt + float crankingTimingAngle; + + float diffLoadEnrichmentCoef; + +air_pressure_sensor_config_s baroSensor;@see hasBaroSensor +float[FUEL_LOAD_COUNT] veLoadBins; + float[FUEL_RPM_COUNT] veRpmBins; + float[FUEL_LOAD_COUNT] afrLoadBins; + float[FUEL_RPM_COUNT] afrRpmBins; + !bits analog_chart_e S32 [0:1], "none", "trigger", "MAP", "INVALID" !analog_chart_e analogChartMode;