From b4cb32fda34afcff0373c4f77d0982e46ef5f600 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 13 Feb 2017 22:02:52 -0500 Subject: [PATCH] auto-sync --- .../algo/engine_configuration_generated_structures.h | 8 ++++---- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 4 ++-- firmware/tunerstudio/rusefi.ini | 8 +++----- firmware/tunerstudio/rusefi.input | 2 -- java_console/models/src/com/rusefi/config/Fields.java | 10 +++++----- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 971725bfd6..6a84cd2d48 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 Feb 13 17:43:53 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 21:22:31 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -228,10 +228,10 @@ typedef struct { trigger_type_e type; /** offset 4 bit 0 */ - bool customIsSynchronizationNeeded : 1; + bool unusedCustomIsSynchronizationNeeded : 1; /** offset 4 bit 1 */ - bool customNeedSecondTriggerInput : 1; + bool unusedCustomNeedSecondTriggerInput : 1; /** * This option could be used if your second trigger channel is broken offset 4 bit 2 */ @@ -2049,4 +2049,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 17:43:53 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 21:22:31 EST 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 7683fe5a9d..a703431e2b 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -229,8 +229,8 @@ #define trigger_offset_hex 218 #define trigger_type_offset 536 #define trigger_type_offset_hex 218 -#define trigger_customIsSynchronizationNeeded_offset 540 -#define trigger_customNeedSecondTriggerInput_offset 540 +#define trigger_unusedCustomIsSynchronizationNeeded_offset 540 +#define trigger_unusedCustomNeedSecondTriggerInput_offset 540 #define trigger_useOnlyFirstChannel_offset 540 #define trigger_customTotalToothCount_offset 544 #define trigger_customTotalToothCount_offset_hex 220 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 790aae46ad..65358b737e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -343,8 +343,8 @@ custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true" custom trigger_type_e 4 bits, U32, @OFFSET@, [0:5], @@trigger_type_e_enum@@ trigger_type_e type;set trigger_type X - bit customIsSynchronizationNeeded; - bit customNeedSecondTriggerInput; + bit unusedCustomIsSynchronizationNeeded; + bit unusedCustomNeedSecondTriggerInput; bit useOnlyFirstChannel;+This option could be used if your second trigger channel is broken int customTotalToothCount;;"number", 1, 0.0, 0, 500.0, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 873e1bbc83..a7fdfc5dca 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 Feb 13 17:43:53 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 21:22:31 EST 2017 pageSize = 16376 page = 1 @@ -156,8 +156,8 @@ page = 1 ;skipping overrideCrankingIgnition offset 528 sensorChartFrequency = scalar, S32, 532, "index", 1, 0, 0, 300, 0 ; size 4 trigger_type = bits, U32, 536, [0:5], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "2003 neon crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "trg38", "trg39", "INVALID" - trigger_customIsSynchronizationNeeded= bits, U32, 540, [0:0], "false", "true" - trigger_customNeedSecondTriggerInput= bits, U32, 540, [1:1], "false", "true" + trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 540, [0:0], "false", "true" + trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 540, [1:1], "false", "true" trigger_useOnlyFirstChannel= bits, U32, 540, [2:2], "false", "true" trigger_customTotalToothCount = scalar, S32, 544, "number", 1, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 548, "number", 1, 0.0, 0, 500.0, 0 @@ -1558,13 +1558,11 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "Trigger Angle Offset", globalTriggerAngleOffset field = "#Custom Trigger" - field = "Synchronization Needed?", trigger_customIsSynchronizationNeeded, {trigger_type == 0} field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} ; field = "sync Ratio From", trigger_customSyncRatioFrom, {trigger_type == 0} ; field = "sync Ratio To", trigger_customSyncRatioTo, {trigger_type == 0} field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0} - field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0} dialog = triggerConfiguration_IO, "Settings I/O" field = "!ECU reboot needed to apply pin assignment" field = "#Cam is primary if you have cam sensor" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 1bb0d1f3cd..c2aced09e1 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1490,13 +1490,11 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "Trigger Angle Offset", globalTriggerAngleOffset field = "#Custom Trigger" - field = "Synchronization Needed?", trigger_customIsSynchronizationNeeded, {trigger_type == 0} field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} ; field = "sync Ratio From", trigger_customSyncRatioFrom, {trigger_type == 0} ; field = "sync Ratio To", trigger_customSyncRatioTo, {trigger_type == 0} field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0} - field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0} dialog = triggerConfiguration_IO, "Settings I/O" field = "!ECU reboot needed to apply pin assignment" field = "#Cam is primary if you have cam sensor" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index ebf49d211f..2394a483e5 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 Feb 13 17:43:53 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 21:22:31 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -233,8 +233,8 @@ public class Fields { public static final int trigger_offset_hex = 218; public static final int trigger_type_offset = 536; public static final int trigger_type_offset_hex = 218; - public static final int trigger_customIsSynchronizationNeeded_offset = 540; - public static final int trigger_customNeedSecondTriggerInput_offset = 540; + public static final int trigger_unusedCustomIsSynchronizationNeeded_offset = 540; + public static final int trigger_unusedCustomNeedSecondTriggerInput_offset = 540; public static final int trigger_useOnlyFirstChannel_offset = 540; public static final int trigger_customTotalToothCount_offset = 544; public static final int trigger_customTotalToothCount_offset_hex = 220; @@ -1118,8 +1118,8 @@ public class Fields { public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 532, FieldType.INT); public static final String[] trigger_type_e = {"custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "2003 neon crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "trg38", "trg39", "INVALID"}; public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 536, FieldType.INT, trigger_type_e); - public static final Field TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED = Field.create("TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED", 540, FieldType.BIT, 0); - public static final Field TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT = Field.create("TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT", 540, FieldType.BIT, 1); + public static final Field TRIGGER_UNUSEDCUSTOMISSYNCHRONIZATIONNEEDED = Field.create("TRIGGER_UNUSEDCUSTOMISSYNCHRONIZATIONNEEDED", 540, FieldType.BIT, 0); + public static final Field TRIGGER_UNUSEDCUSTOMNEEDSECONDTRIGGERINPUT = Field.create("TRIGGER_UNUSEDCUSTOMNEEDSECONDTRIGGERINPUT", 540, FieldType.BIT, 1); public static final Field TRIGGER_USEONLYFIRSTCHANNEL = Field.create("TRIGGER_USEONLYFIRSTCHANNEL", 540, FieldType.BIT, 2); public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = Field.create("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 544, FieldType.INT); public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 548, FieldType.INT);