From 2fa08f9150323d9a50783e73dbf57340dd8f6727 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 16 Nov 2016 19:02:10 -0500 Subject: [PATCH] auto-sync --- .../algo/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 1 + java_console/models/src/com/rusefi/config/Fields.java | 8 ++++---- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d635b37954..da5ebd0c71 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 Mon Nov 14 21:45:04 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Nov 15 20:55:28 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1580,7 +1580,7 @@ typedef struct { /** * offset 2192 */ - float unused213; + float vvtOffset; /** * offset 2196 */ @@ -1992,4 +1992,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Nov 14 21:45:04 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Nov 15 20:55:28 EST 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 588d699c0d..283dfaf3c7 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -781,8 +781,8 @@ #define tpsAccelLength_offset 2184 #define tpsAccelLength_offset_hex 888 #define tpsAccelEnrichmentThreshold_offset 2188 -#define unused213_offset 2192 -#define unused213_offset_hex 890 +#define vvtOffset_offset 2192 +#define vvtOffset_offset_hex 890 #define engineLoadAccelLength_offset 2196 #define engineLoadAccelLength_offset_hex 894 #define engineLoadDecelEnleanmentThreshold_offset 2200 diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 814f2ee594..7d50c97a41 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -122,7 +122,7 @@ void hwHandleVvtCamSignal(trigger_value_e front) { vvtPosition -= tdcPosition(); fixAngle(vvtPosition); - tc->vvtPosition = vvtPosition; + tc->vvtPosition = vvtPosition + engineConfiguration->vvtOffset; if (engineConfiguration->vvtMode == VVT_FIRST_HALF) { bool isEven = tc->triggerState.isEvenRevolution(); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 608921d096..01a3d87175 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -705,7 +705,7 @@ baro_corr_table_t baroCorrTable; int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0 float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 - float unused213;;"coeff", 1, 0, 0, 200, 3 + float vvtOffset;;"value", 1, 0, -720, 1000, 5 int engineLoadAccelLength;;"cycles", 1, 0, 1, 200, 0 diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 3c2f99c62c..dc09175ed0 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -290,5 +290,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20161114; + return 20161115; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6bccf19143..e61cc108cd 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Nov 14 21:45:04 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Nov 15 20:55:28 EST 2016 pageSize = 16376 page = 1 @@ -541,7 +541,7 @@ page = 1 alternatorControl_offset = scalar, F32, 2180, "value", 1, 0, 0, 1000, 3 tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 - unused213 = scalar, F32, 2192, "coeff", 1, 0, 0, 200, 3 + vvtOffset = scalar, F32, 2192, "value", 1, 0, -720, 1000, 5 engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0 engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3 engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3 @@ -1515,6 +1515,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "Cam Sync/VVT input", camInput field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} + field = "VVT position display offset", vvtOffset field = "NB2 from temp", nb2ratioFrom field = "NB2 to temp", nb2ratioTo field = "Trigger error LED", triggerErrorPin diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 2ebb6a37ab..36e5e5b4e2 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1482,6 +1482,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "Cam Sync/VVT input", camInput field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} + field = "VVT position display offset", vvtOffset field = "NB2 from temp", nb2ratioFrom field = "NB2 to temp", nb2ratioTo field = "Trigger error LED", triggerErrorPin diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 5780887181..99b8bfa966 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 Mon Nov 14 21:45:04 EST 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Nov 15 20:55:28 EST 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -785,8 +785,8 @@ public class Fields { public static final int tpsAccelLength_offset = 2184; public static final int tpsAccelLength_offset_hex = 888; public static final int tpsAccelEnrichmentThreshold_offset = 2188; - public static final int unused213_offset = 2192; - public static final int unused213_offset_hex = 890; + public static final int vvtOffset_offset = 2192; + public static final int vvtOffset_offset_hex = 890; public static final int engineLoadAccelLength_offset = 2196; public static final int engineLoadAccelLength_offset_hex = 894; public static final int engineLoadDecelEnleanmentThreshold_offset = 2200; @@ -1454,7 +1454,7 @@ public class Fields { public static final Field ALTERNATORCONTROL_OFFSET = Field.create("ALTERNATORCONTROL_OFFSET", 2180, FieldType.FLOAT); public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2184, FieldType.INT); public static final Field TPSACCELENRICHMENTTHRESHOLD = Field.create("TPSACCELENRICHMENTTHRESHOLD", 2188, FieldType.FLOAT); - public static final Field UNUSED213 = Field.create("UNUSED213", 2192, FieldType.FLOAT); + public static final Field VVTOFFSET = Field.create("VVTOFFSET", 2192, FieldType.FLOAT); public static final Field ENGINELOADACCELLENGTH = Field.create("ENGINELOADACCELLENGTH", 2196, FieldType.INT); public static final Field ENGINELOADDECELENLEANMENTTHRESHOLD = Field.create("ENGINELOADDECELENLEANMENTTHRESHOLD", 2200, FieldType.FLOAT); public static final Field ENGINELOADDECELENLEANMENTMULTIPLIER = Field.create("ENGINELOADDECELENLEANMENTMULTIPLIER", 2204, FieldType.FLOAT);