From 0fac846dec2ffae66fcf344fb1d29df2a041ac72 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 25 Jul 2017 20:32:54 -0400 Subject: [PATCH] FSIO-based timing correction --- .../engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 13 +++++++++++++ .../models/src/com/rusefi/config/Fields.java | 6 +++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d8adbf5559..d150062d0e 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 Sat Jul 15 15:30:50 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jul 25 20:21:45 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1234,7 +1234,7 @@ typedef struct { bool useLinearIatSensor : 1; /** offset 1488 bit 11 */ - bool unusedbit_9 : 1; + bool useFSIO16ForTimingAdjustment : 1; /** offset 1488 bit 12 */ bool unusedbit_10 : 1; @@ -2131,4 +2131,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jul 25 20:21:45 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 321530e76d..3abedbe1b6 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -860,8 +860,8 @@ #define canWriteEnabled_offset_hex 5d0 #define useLinearIatSensor_offset 1488 #define useLinearIatSensor_offset_hex 5d0 -#define unusedbit_9_offset 1488 -#define unusedbit_9_offset_hex 5d0 +#define useFSIO16ForTimingAdjustment_offset 1488 +#define useFSIO16ForTimingAdjustment_offset_hex 5d0 #define unusedbit_10_offset 1488 #define unusedbit_10_offset_hex 5d0 #define isAlternatorControlEnabled_offset 1488 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index f6e878c53c..efeccabd82 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -600,7 +600,7 @@ bit vvtDisplayInverted bit canReadEnabled bit canWriteEnabled bit useLinearIatSensor - bit unusedbit_9 + bit useFSIO16ForTimingAdjustment bit unusedbit_10 bit isAlternatorControlEnabled bit unusedBit__3 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 951440cfb4..409aa1b52a 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1704,6 +1704,19 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "#2", fsioFormulas2 field = "#3", fsioFormulas3 field = "#4", fsioFormulas4 + field = "#5", fsioFormulas5 + field = "#6", fsioFormulas6 + field = "#7", fsioFormulas7 + field = "#8", fsioFormulas8 + field = "#9", fsioFormulas9 + field = "#10", fsioFormulas10 + field = "#11", fsioFormulas11 + field = "#12", fsioFormulas12 + field = "#13", fsioFormulas13 + field = "#14", fsioFormulas14 + field = "#15", fsioFormulas15 + field = "use FSIO #16 for timing adjustment", useFSIO16ForTimingAdjustment + field = "#16", fsioFormulas16 dialog = fsioInputsDialog, "FSIO inputs" field = "ADC #1", fsioAdc1 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 47dac7f9c8..85f15ca61b 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 Sun Jul 23 20:33:56 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jul 25 20:21:45 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -632,7 +632,7 @@ public class Fields { public static final int canReadEnabled_offset = 1488; public static final int canWriteEnabled_offset = 1488; public static final int useLinearIatSensor_offset = 1488; - public static final int unusedbit_9_offset = 1488; + public static final int useFSIO16ForTimingAdjustment_offset = 1488; public static final int unusedbit_10_offset = 1488; public static final int isAlternatorControlEnabled_offset = 1488; public static final int unusedBit__3_offset = 1488; @@ -1493,7 +1493,7 @@ public class Fields { public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8); public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9); public static final Field USELINEARIATSENSOR = Field.create("USELINEARIATSENSOR", 1488, FieldType.BIT, 10); - public static final Field UNUSEDBIT_9 = Field.create("UNUSEDBIT_9", 1488, FieldType.BIT, 11); + public static final Field USEFSIO16FORTIMINGADJUSTMENT = Field.create("USEFSIO16FORTIMINGADJUSTMENT", 1488, FieldType.BIT, 11); public static final Field UNUSEDBIT_10 = Field.create("UNUSEDBIT_10", 1488, FieldType.BIT, 12); public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13); public static final Field UNUSEDBIT__3 = Field.create("UNUSEDBIT__3", 1488, FieldType.BIT, 14);