From 12fa6ea513290713183c7edfcb2617741a67cc50 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 11 Mar 2017 19:52:41 -0500 Subject: [PATCH] progress #371 --- ...ngine_configuration_generated_structures.h | 10 +++++-- firmware/controllers/algo/rusefi_generated.h | 14 +++++++++- firmware/controllers/algo/rusefi_types.h | 1 + firmware/integration/rusefi_config.txt | 6 +++- .../models/src/com/rusefi/config/Fields.java | 28 +++++++++++++++++-- 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d8c2b64c6f..b53458515b 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 Feb 28 17:46:37 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 19:47:37 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1837,7 +1837,11 @@ typedef struct { /** * offset 2776 */ - int unused[68]; + float_t timing_offset_cylinder[IGNITION_PIN_COUNT]; + /** + * offset 2824 + */ + int unused[56]; /** total size 3048*/ } engine_configuration_s; @@ -2052,4 +2056,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Feb 28 17:46:37 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 19:47:37 EST 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index ccc9170f28..14e41beca6 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -932,7 +932,19 @@ #define stepperEnablePinMode_offset 2764 #define cj125ua_offset 2768 #define cj125ur_offset 2772 -#define unused_offset 2776 +#define timing_offset_cylinder1_offset 2776 +#define timing_offset_cylinder2_offset 2780 +#define timing_offset_cylinder3_offset 2784 +#define timing_offset_cylinder4_offset 2788 +#define timing_offset_cylinder5_offset 2792 +#define timing_offset_cylinder6_offset 2796 +#define timing_offset_cylinder7_offset 2800 +#define timing_offset_cylinder8_offset 2804 +#define timing_offset_cylinder9_offset 2808 +#define timing_offset_cylinder10_offset 2812 +#define timing_offset_cylinder11_offset 2816 +#define timing_offset_cylinder12_offset 2820 +#define unused_offset 2824 #define le_formulas1_offset 3048 #define le_formulas2_offset 3248 #define le_formulas3_offset 3448 diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index 9f17f392b5..2b1b4bb087 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -90,6 +90,7 @@ typedef int32_t bool32_t; typedef int16_t fsio_pwm_freq_t; typedef float fsio_setting_t; +typedef float float_t; typedef brain_pin_e brain_input_pin_e; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index d56c8a902e..fd23ffcf01 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -780,7 +780,11 @@ int16_t etbFreq;;"Hz", 1, 0, 0, 500, 10 pin_mode_e stepperEnablePinMode; adc_channel_e cj125ua;lampda input adc_channel_e cj125ur;heater input - int[68] unused; + + custom float_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 4 + float_t[IGNITION_PIN_COUNT iterate] timing_offset_cylinder; + + int[56] 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 4074fad239..1da80d2051 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 Wed Feb 22 21:26:04 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 19:47:37 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -936,7 +936,19 @@ public class Fields { public static final int stepperEnablePinMode_offset = 2764; public static final int cj125ua_offset = 2768; public static final int cj125ur_offset = 2772; - public static final int unused_offset = 2776; + public static final int timing_offset_cylinder1_offset = 2776; + public static final int timing_offset_cylinder2_offset = 2780; + public static final int timing_offset_cylinder3_offset = 2784; + public static final int timing_offset_cylinder4_offset = 2788; + public static final int timing_offset_cylinder5_offset = 2792; + public static final int timing_offset_cylinder6_offset = 2796; + public static final int timing_offset_cylinder7_offset = 2800; + public static final int timing_offset_cylinder8_offset = 2804; + public static final int timing_offset_cylinder9_offset = 2808; + public static final int timing_offset_cylinder10_offset = 2812; + public static final int timing_offset_cylinder11_offset = 2816; + public static final int timing_offset_cylinder12_offset = 2820; + public static final int unused_offset = 2824; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -1610,6 +1622,18 @@ public class Fields { public static final Field STEPPERENABLEPINMODE = Field.create("STEPPERENABLEPINMODE", 2764, FieldType.INT, pin_mode_e); public static final Field CJ125UA = Field.create("CJ125UA", 2768, FieldType.INT, adc_channel_e); public static final Field CJ125UR = Field.create("CJ125UR", 2772, FieldType.INT, adc_channel_e); + public static final Field TIMING_OFFSET_CYLINDER1 = Field.create("TIMING_OFFSET_CYLINDER1", 2776, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER2 = Field.create("TIMING_OFFSET_CYLINDER2", 2780, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER3 = Field.create("TIMING_OFFSET_CYLINDER3", 2784, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER4 = Field.create("TIMING_OFFSET_CYLINDER4", 2788, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER5 = Field.create("TIMING_OFFSET_CYLINDER5", 2792, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER6 = Field.create("TIMING_OFFSET_CYLINDER6", 2796, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER7 = Field.create("TIMING_OFFSET_CYLINDER7", 2800, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER8 = Field.create("TIMING_OFFSET_CYLINDER8", 2804, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER9 = Field.create("TIMING_OFFSET_CYLINDER9", 2808, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER10 = Field.create("TIMING_OFFSET_CYLINDER10", 2812, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER11 = Field.create("TIMING_OFFSET_CYLINDER11", 2816, FieldType.INT); + public static final Field TIMING_OFFSET_CYLINDER12 = Field.create("TIMING_OFFSET_CYLINDER12", 2820, FieldType.INT); 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);