From 5c5705c0a10ff53c266fb04a8d8e8def86831f99 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 15 Jan 2015 16:03:57 -0600 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.h | 83 +++++++++++++------ firmware/rusefi_config.ini | 19 ++++- 2 files changed, 76 insertions(+), 26 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 887ac2566a..fa6a853fc5 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -296,47 +296,82 @@ typedef struct { * todo: re-arrange this structure one we have a stable code version */ typedef struct { - // WARNING: by default, our small enums are ONE BYTE. but if the are surrounded by non-enums - alignments do the trick + // this section was generated by config_definition.jar on Thu Jan 15 15:59:00 EST 2015 + // begin + /** + * http://rusefi.com/wiki/index.php?title=Manual:Engine_Type + * offset 0 + */ engine_type_e engineType; /** * this magic number is used to make sure that what we read from Flash is in fact some configuration - */ + * offset 4 + */ int headerMagicValue; - - float battInjectorLagCorrBins[VBAT_INJECTOR_CURVE_SIZE]; // size 32, offset 8 - float battInjectorLagCorr[VBAT_INJECTOR_CURVE_SIZE]; // size 32, offset 40 - - float cltFuelCorrBins[CLT_CURVE_SIZE]; // size 64, offset 72 - float cltFuelCorr[CLT_CURVE_SIZE]; // size 64, offset 136 - - float iatFuelCorrBins[IAT_CURVE_SIZE]; // size 64, offset 200 - float iatFuelCorr[IAT_CURVE_SIZE]; // size 64, offset 264 - + /** + * offset 8 + */ + float battInjectorLagCorrBins[VBAT_INJECTOR_CURVE_SIZE]; + /** + * offset 40 + */ + float battInjectorLagCorr[VBAT_INJECTOR_CURVE_SIZE]; + /** + * offset 72 + */ + float cltFuelCorrBins[CLT_CURVE_SIZE]; + /** + * offset 136 + */ + float cltFuelCorr[CLT_CURVE_SIZE]; + /** + * offset 200 + */ + float iatFuelCorrBins[IAT_CURVE_SIZE]; + /** + * offset 264 + */ + float iatFuelCorr[IAT_CURVE_SIZE]; /** * Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires? * PS: Funny name, right? :) * todo: make this a bit on some bit field - */ - int16_t directSelfStimulation; // size 2, offset 328 - - // todo: extract these two fields into a structure - // todo: we need two sets of TPS parameters - modern ETBs have to sensors - int16_t tpsMin; // size 2, offset 330 - // tpsMax value as 10 bit ADC value. Not Voltage! - int16_t tpsMax; // size 2, offset 332 + * offset 328 + */ + int16_t directSelfStimulation; + /** + * todo: extract these two fields into a structure + * todo: we need two sets of TPS parameters - modern ETBs have to sensors + * offset 330 + */ + int16_t tpsMin; + /** + * tpsMax value as 10 bit ADC value. Not Voltage! + * offset 332 + */ + int16_t tpsMax; + /** + * offset 334 + */ int16_t analogChartMode; - /** * todo: finish implementation. These values are used for TPS disconnect detection - */ + * offset 336 + */ int16_t tpsErrorLowValue; + /** + * offset 338 + */ int16_t tpsErrorHighValue; - + /** + * offset 340 + */ float primingSquirtDurationMs; /** * 360 for two-stroke * 720 for four-stroke - */ + * offset 344 + */ int engineCycle; cranking_parameters_s crankingSettings; diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini index e64d615d3a..4fc1aef9bd 100644 --- a/firmware/rusefi_config.ini +++ b/firmware/rusefi_config.ini @@ -7,6 +7,17 @@ ! each field is declared as ! type;name;comment + +struct cranking_parameters_s + +end_struct + + + + + + + engine_type_e;engineType;http://rusefi.com/wiki/index.php?title=Manual:Engine_Type int;headerMagicValue;this magic number is used to make sure that what we read from Flash is in fact some configuration @@ -30,8 +41,12 @@ array float IAT_CURVE_SIZE;iatFuelCorr; int16_t;directSelfStimulation;Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)\ntodo: make this a bit on some bit field int16_t;tpsMin;todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have to sensors +int16_t;tpsMax;tpsMax value as 10 bit ADC value. Not Voltage! -int16_t;analogChartMode;todo: finish implementation. These values are used for TPS disconnect detection -int16_t;tpsErrorLowValue; +int16_t;analogChartMode; + +int16_t;tpsErrorLowValue;todo: finish implementation. These values are used for TPS disconnect detection int16_t;tpsErrorHighValue +float;primingSquirtDurationMs +int;engineCycle;360 for two-stroke\n720 for four-stroke \ No newline at end of file