From c2efaa40dbe5c47b46d17eb73553880c3882d552 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 26 Jun 2016 18:01:52 -0400 Subject: [PATCH] auto-sync --- ...ngine_configuration_generated_structures.h | 13 +++-- firmware/controllers/algo/rusefi_generated.h | 22 ++++---- firmware/integration/rusefi_config.txt | 3 +- firmware/tunerstudio/rusefi.ini | 51 ++++++++++++------- .../models/src/com/rusefi/config/Fields.java | 26 +++++++--- 5 files changed, 74 insertions(+), 41 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 2fa5693222..d1b2ff4198 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 Sun Jun 26 11:58:16 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 12:22:01 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1627,13 +1627,18 @@ typedef struct { */ float egoValueShift; /** + * Aux Pid #1 dTime * offset 2408 */ + int auxPid1DT; + /** + * offset 2412 + */ pid_s auxPid1; /** - * offset 2424 + * offset 2428 */ - int unused[156]; + int unused[155]; /** total size 3048*/ } engine_configuration_s; @@ -1822,4 +1827,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 11:58:16 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 12:22:01 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index becc03ee9d..2677d0e6e5 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -826,17 +826,17 @@ #define mapHighValueVoltage_offset_hex 960 #define egoValueShift_offset 2404 #define egoValueShift_offset_hex 964 -#define auxPid1_offset 2408 -#define auxPid1_offset_hex 968 -#define auxPid1_pFactor_offset 2408 -#define auxPid1_pFactor_offset_hex 968 -#define auxPid1_iFactor_offset 2412 -#define auxPid1_dFactor_offset 2416 -#define auxPid1_dFactor_offset_hex 970 -#define auxPid1_offset_offset 2420 -#define auxPid1_offset_offset_hex 974 -#define unused_offset 2424 -#define unused_offset_hex 978 +#define auxPid1DT_offset 2408 +#define auxPid1DT_offset_hex 968 +#define auxPid1_offset 2412 +#define auxPid1_pFactor_offset 2412 +#define auxPid1_iFactor_offset 2416 +#define auxPid1_iFactor_offset_hex 970 +#define auxPid1_dFactor_offset 2420 +#define auxPid1_dFactor_offset_hex 974 +#define auxPid1_offset_offset 2424 +#define auxPid1_offset_offset_hex 978 +#define unused_offset 2428 #define le_formulas1_offset 3048 #define le_formulas2_offset 3248 #define le_formulas3_offset 3448 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index fb7cd1a5cd..94aa162e52 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -697,8 +697,9 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, 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 auxPid1DT;Aux Pid #1 dTime;"ms", 1, 0, 0, 3000, 0 pid_s auxPid1; - int[156] unused; + int[155] unused; end_struct diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6ade95a6df..e5e93b15d1 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 Sun Jun 26 11:58:16 EDT 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 12:22:01 EDT 2016 pageSize = 17080 page = 1 @@ -573,11 +573,12 @@ page = 1 mapLowValueVoltage = scalar, F32, 2396, "v", 1, 0, 0.0, 10, 2 mapHighValueVoltage = scalar, F32, 2400, "v", 1, 0, 0.0, 10, 2 egoValueShift = scalar, F32, 2404, "value", 1, 0, -10.0, 10, 2 - auxPid1_pFactor = scalar, F32, 2408, "value", 1, 0, 0, 1000, 5 - auxPid1_iFactor = scalar, F32, 2412, "value", 1, 0, 0, 1000, 5 - auxPid1_dFactor = scalar, F32, 2416, "value", 1, 0, 0, 1000, 5 - auxPid1_offset = scalar, F32, 2420, "value", 1, 0, 0, 1000, 3 -;skipping unused offset 2424 + auxPid1DT = scalar, S32, 2408, "ms", 1, 0, 0, 3000, 0 + auxPid1_pFactor = scalar, F32, 2412, "value", 1, 0, 0, 1000, 5 + auxPid1_iFactor = scalar, F32, 2416, "value", 1, 0, 0, 1000, 5 + auxPid1_dFactor = scalar, F32, 2420, "value", 1, 0, 0, 1000, 5 + auxPid1_offset = scalar, F32, 2424, "value", 1, 0, 0, 1000, 3 +;skipping unused offset 2428 le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -1224,6 +1225,7 @@ fileVersion = { 20160430 } subMenu = egoSettings, "EGO Sensor Settings" subMenu = egtInputs, "EGT inputs" subMenu = energySystems, "Battery and Alternator Settings" + subMenu = auxPidDialog, "Aux PID" subMenu = speedSensor, "Speed Sensor Settings" subMenu = tachSettings, "Tachometer output" subMenu = std_separator @@ -1617,24 +1619,35 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "SPI3 MISO", spi3misoPin field = "SPI3 SCK", spi3sckPin + dialog = auxPidDialog, "Aux PID" + field = "Enabled", activateAuxPid1 + field = "FSIO pin #1", fsioPins1 + field = "#target based on FSIO map#1" + field = "control period", auxPid1DT, {activateAuxPid1 == 1} + field = "#PID control" + field = "offset", auxPid1_offset, {activateAuxPid1 == 1} + field = "P factor", auxPid1_pFactor, {activateAuxPid1 == 1} + field = "I factor", auxPid1_iFactor, {activateAuxPid1 == 1} + field = "D factor", auxPid1_dFactor, {activateAuxPid1 == 1} + ; Engine->Battery & Alternator - dialog = battery, "Battery Settings", yAxis + dialog = batteryDialog, "Battery Settings", yAxis field = "vBatt ADC input", vbattAdcChannel field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic - field = "Target", targetVBatt - field = "Pin", alternatorControlPin - field = "Pin Mode", alternatorControlPinMode - field = "Off Above TPS", alternatorOffAboveTps - field = "Verbose", isVerboseAlternator - field = "control period", alternatorDT + field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} + field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} + field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} + field = "Verbose", isVerboseAlternator, {isAlternatorControlEnabled == 1} + field = "control period", alternatorDT, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset - field = "P factor", alternatorControl_pFactor - field = "I factor", alternatorControl_iFactor - field = "D factor", alternatorControl_dFactor + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} field = "#% duty = Pterm + Iterm + Dterm + offset%" @@ -1649,7 +1662,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = energySystems, "Battery and Alternator Settings", yAxis - panel = battery + panel = batteryDialog panel = alternator ; Engine->Speed Sensor diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 91b3abb2fa..c93129ad6c 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 Sat Jun 25 15:31:56 EDT 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 12:22:01 EDT 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -49,8 +49,8 @@ public class Fields { public static final int injector_battLagCorr_offset_hex = 30; public static final int directSelfStimulation_offset = 80; public static final int directSelfStimulation_offset_hex = 50; - public static final int issue_294_1_offset = 80; - public static final int issue_294_1_offset_hex = 50; + public static final int activateAuxPid1_offset = 80; + public static final int activateAuxPid1_offset_hex = 50; public static final int issue_294_2_offset = 80; public static final int issue_294_2_offset_hex = 50; public static final int issue_294_3_offset = 80; @@ -830,8 +830,17 @@ public class Fields { 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 auxPid1DT_offset = 2408; + public static final int auxPid1DT_offset_hex = 968; + public static final int auxPid1_offset = 2412; + public static final int auxPid1_pFactor_offset = 2412; + public static final int auxPid1_iFactor_offset = 2416; + public static final int auxPid1_iFactor_offset_hex = 970; + public static final int auxPid1_dFactor_offset = 2420; + public static final int auxPid1_dFactor_offset_hex = 974; + public static final int auxPid1_offset_offset = 2424; + public static final int auxPid1_offset_offset_hex = 978; + public static final int unused_offset = 2428; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -915,7 +924,7 @@ public class Fields { public static final Field INJECTOR_FLOW = Field.create("INJECTOR_FLOW", 8, FieldType.FLOAT); public static final Field INJECTOR_LAG = Field.create("INJECTOR_LAG", 12, FieldType.FLOAT); public static final Field DIRECTSELFSTIMULATION = Field.create("DIRECTSELFSTIMULATION", 80, FieldType.BIT, 0); - public static final Field ISSUE_294_1 = Field.create("ISSUE_294_1", 80, FieldType.BIT, 1); + public static final Field ACTIVATEAUXPID1 = Field.create("ACTIVATEAUXPID1", 80, FieldType.BIT, 1); public static final Field ISSUE_294_2 = Field.create("ISSUE_294_2", 80, FieldType.BIT, 2); public static final Field ISSUE_294_3 = Field.create("ISSUE_294_3", 80, FieldType.BIT, 3); public static final Field ISSUE_294_4 = Field.create("ISSUE_294_4", 80, FieldType.BIT, 4); @@ -1421,6 +1430,11 @@ public class Fields { 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 AUXPID1DT = Field.create("AUXPID1DT", 2408, FieldType.INT); + public static final Field AUXPID1_PFACTOR = Field.create("AUXPID1_PFACTOR", 2412, FieldType.FLOAT); + public static final Field AUXPID1_IFACTOR = Field.create("AUXPID1_IFACTOR", 2416, FieldType.FLOAT); + public static final Field AUXPID1_DFACTOR = Field.create("AUXPID1_DFACTOR", 2420, FieldType.FLOAT); + public static final Field AUXPID1_OFFSET = Field.create("AUXPID1_OFFSET", 2424, 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);