From 73cfb18d8667329f8758aab287f3703c9debba2c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 23 Jun 2016 00:01:55 -0400 Subject: [PATCH] auto-sync --- ...ngine_configuration_generated_structures.h | 21 ++++++++++++++++--- firmware/controllers/algo/rusefi_generated.h | 8 ++++++- firmware/controllers/sensors/ego.cpp | 3 ++- firmware/integration/rusefi_config.txt | 5 ++++- .../models/src/com/rusefi/config/Fields.java | 13 ++++++++++-- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 9ad8c2626b..25549886f4 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1612,9 +1612,24 @@ typedef struct { */ float fixedTiming; /** + * MAP voltage for low point * offset 2396 */ - int unused[163]; + float mapLowValueVoltage; + /** + * MAP voltage for low point + * offset 2400 + */ + float mapHighValueVoltage; + /** + * EGO value correction + * offset 2404 + */ + float egoValueShift; + /** + * offset 2408 + */ + int unused[160]; /** total size 3048*/ } engine_configuration_s; @@ -1803,4 +1818,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 081877ee17..5bd377e0d6 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -821,7 +821,13 @@ #define fsioAdc4_offset_hex 954 #define fixedTiming_offset 2392 #define fixedTiming_offset_hex 958 -#define unused_offset 2396 +#define mapLowValueVoltage_offset 2396 +#define mapHighValueVoltage_offset 2400 +#define mapHighValueVoltage_offset_hex 960 +#define egoValueShift_offset 2404 +#define egoValueShift_offset_hex 964 +#define unused_offset 2408 +#define unused_offset_hex 968 #define le_formulas1_offset 3048 #define le_formulas2_offset 3248 #define le_formulas3_offset 3448 diff --git a/firmware/controllers/sensors/ego.cpp b/firmware/controllers/sensors/ego.cpp index 01925e6f2f..3799456d86 100644 --- a/firmware/controllers/sensors/ego.cpp +++ b/firmware/controllers/sensors/ego.cpp @@ -13,7 +13,8 @@ float getAfr(DECLARE_ENGINE_PARAMETER_F) { float volts = getVoltageDivided("ego", sensor->hwChannel); - return interpolate(sensor->v1, sensor->value1, sensor->v2, sensor->value2, volts); + return interpolate(sensor->v1, sensor->value1, sensor->v2, sensor->value2, volts) + + engineConfiguration->egoValueShift; } static void initEgoSensor(afr_sensor_s *sensor, ego_sensor_e type) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7caf0bfddd..42d60f172d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -694,7 +694,10 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, pin_output_mode_e dizzySparkOutputPinMode; adc_channel_e[FSIO_ADC_COUNT iterate] fsioAdc; float fixedTiming;Fixed timing, useful for TDC testing;"deg", 1, 0, -720, 720, 2 - int[163] unused; + float mapLowValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2 + float mapHighValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2 + float egoValueShift;EGO value correction;"value", 1, 0, -10.0, 10, 2 + int[160] unused; end_struct diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index fa79c28065..429e500568 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -825,7 +825,13 @@ public class Fields { public static final int fsioAdc4_offset_hex = 954; public static final int fixedTiming_offset = 2392; public static final int fixedTiming_offset_hex = 958; - public static final int unused_offset = 2396; + public static final int mapLowValueVoltage_offset = 2396; + public static final int mapHighValueVoltage_offset = 2400; + public static final int mapHighValueVoltage_offset_hex = 960; + public static final int egoValueShift_offset = 2404; + public static final int egoValueShift_offset_hex = 964; + public static final int unused_offset = 2408; + public static final int unused_offset_hex = 968; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -1412,6 +1418,9 @@ public class Fields { public static final Field FSIOADC3 = Field.create("FSIOADC3", 2384, FieldType.INT, adc_channel_e); public static final Field FSIOADC4 = Field.create("FSIOADC4", 2388, FieldType.INT, adc_channel_e); public static final Field FIXEDTIMING = Field.create("FIXEDTIMING", 2392, FieldType.FLOAT); + public static final Field MAPLOWVALUEVOLTAGE = Field.create("MAPLOWVALUEVOLTAGE", 2396, FieldType.FLOAT); + public static final Field MAPHIGHVALUEVOLTAGE = Field.create("MAPHIGHVALUEVOLTAGE", 2400, FieldType.FLOAT); + public static final Field EGOVALUESHIFT = Field.create("EGOVALUESHIFT", 2404, FieldType.FLOAT); public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT); public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT); public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);