From becbf9dcbb54d39075795b7e213e94e783ed832e Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 22 Jan 2017 12:06:10 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_vvt.cpp | 2 +- firmware/controllers/algo/aux_pid.cpp | 4 ++-- .../algo/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 2 +- firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 1 + java_console/models/src/com/rusefi/config/Fields.java | 6 +++--- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 2bcfbf7a67..2e68b08ffe 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -118,7 +118,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // set vvt_mode 3 engineConfiguration->vvtMode = MIATA_NB2; boardConfiguration->vvtCamSensorUseRise = true; - engineConfiguration->vvtOffset = -70; + engineConfiguration->vvtOffset = 83; engineConfiguration->activateAuxPid1 = true; // todo: remove this field? engineConfiguration->auxPidFrequency[0] = 300; diff --git a/firmware/controllers/algo/aux_pid.cpp b/firmware/controllers/algo/aux_pid.cpp index 9b5c6be7e0..7ba5fbffe8 100644 --- a/firmware/controllers/algo/aux_pid.cpp +++ b/firmware/controllers/algo/aux_pid.cpp @@ -34,7 +34,7 @@ static SimplePwm auxPidPwm[AUX_PID_COUNT]; static OutputPin auxPidPin[AUX_PID_COUNT]; static pid_s *auxPidS = &persistentState.persistentConfiguration.engineConfiguration.auxPid[0]; -static Pid auxPid(auxPidS, 1, 90); +static Pid auxPid(auxPidS, 0, 90); static Logging *logger; static bool isEnabled(int index) { @@ -73,7 +73,7 @@ static msg_t auxPidThread(int param) { } - float value = getVBatt(PASS_ENGINE_PARAMETER_F); // that's temporary + float value = engine->triggerCentral.vvtPosition; // getVBatt(PASS_ENGINE_PARAMETER_F); // that's temporary float targetValue = fsioTable1.getValue(rpm, getEngineLoadT(PASS_ENGINE_PARAMETER_F)); float pwm = auxPid.getValue(targetValue, value, 1); diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 3f5807dfd8..263a9572f5 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 Thu Jan 12 23:31:45 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 11:23:24 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1179,7 +1179,7 @@ typedef struct { board_configuration_s bc; /** offset 1488 bit 0 */ - bool unusedBit__4 : 1; + bool vvtDisplayInverted : 1; /** offset 1488 bit 1 */ bool unusedBit__1 : 1; @@ -2006,4 +2006,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 12 23:31:45 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 11:23:24 EST 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index a74f811927..ba1f5772e9 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -615,7 +615,7 @@ #define fsioDigitalInputs15_offset 1476 #define fsioDigitalInputs16_offset 1480 #define frequencyReportingMapInputPin_offset 1484 -#define unusedBit__4_offset 1488 +#define vvtDisplayInverted_offset 1488 #define unusedBit__1_offset 1488 #define unusedBit__5_offset 1488 #define unusedBit__6_offset 1488 diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 79d5b8e696..4f3006aa4b 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -125,7 +125,7 @@ void hwHandleVvtCamSignal(trigger_value_e front) { vvtPosition -= tdcPosition(); fixAngle(vvtPosition, "vvtPosition"); - tc->vvtPosition = vvtPosition + engineConfiguration->vvtOffset; + tc->vvtPosition = (engineConfiguration->vvtDisplayInverted ? -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 9fddc37a2f..69fc57cd9e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -573,7 +573,7 @@ end_struct custom le_formula_t 200 array, U08, @OFFSET@, [200],"char", 1, 0, 0.0, 3.0, 2 board_configuration_s bc; -bit unusedBit__4 +bit vvtDisplayInverted bit unusedBit__1 bit unusedBit__5 bit unusedBit__6 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 92b2dbb4fc..977a929188 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 Fri Jan 13 09:40:34 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 11:23:24 EST 2017 pageSize = 16376 page = 1 @@ -421,7 +421,7 @@ page = 1 fsioDigitalInputs15 = bits, U32, 1476, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" fsioDigitalInputs16 = bits, U32, 1480, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" frequencyReportingMapInputPin = bits, U32, 1484, [0:6], "INVALID", "INVALID", "PA2", "PA3", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedBit__4 = bits, U32, 1488, [0:0], "false", "true" + vvtDisplayInverted = bits, U32, 1488, [0:0], "false", "true" unusedBit__1 = bits, U32, 1488, [1:1], "false", "true" unusedBit__5 = bits, U32, 1488, [2:2], "false", "true" unusedBit__6 = bits, U32, 1488, [3:3], "false", "true" @@ -1551,6 +1551,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset + field = "VVT display inverted", vvtDisplayInverted field = "NB2 from temp", nb2ratioFrom field = "NB2 to temp", nb2ratioTo field = "nbVvtIndex", nbVvtIndex diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 92204253df..e6696dc573 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1496,6 +1496,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} field = "VVT position display offset", vvtOffset + field = "VVT display inverted", vvtDisplayInverted field = "NB2 from temp", nb2ratioFrom field = "NB2 to temp", nb2ratioTo field = "nbVvtIndex", nbVvtIndex diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 2b19116619..0f6a385136 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 Jan 02 18:37:17 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 11:23:24 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -619,7 +619,7 @@ public class Fields { public static final int fsioDigitalInputs15_offset = 1476; public static final int fsioDigitalInputs16_offset = 1480; public static final int frequencyReportingMapInputPin_offset = 1484; - public static final int unusedBit__4_offset = 1488; + public static final int vvtDisplayInverted_offset = 1488; public static final int unusedBit__1_offset = 1488; public static final int unusedBit__5_offset = 1488; public static final int unusedBit__6_offset = 1488; @@ -1372,7 +1372,7 @@ public class Fields { public static final Field FSIODIGITALINPUTS15 = Field.create("FSIODIGITALINPUTS15", 1476, FieldType.INT, brain_pin_e); public static final Field FSIODIGITALINPUTS16 = Field.create("FSIODIGITALINPUTS16", 1480, FieldType.INT, brain_pin_e); public static final Field FREQUENCYREPORTINGMAPINPUTPIN = Field.create("FREQUENCYREPORTINGMAPINPUTPIN", 1484, FieldType.INT, brain_input_pin_e); - public static final Field UNUSEDBIT__4 = Field.create("UNUSEDBIT__4", 1488, FieldType.BIT, 0); + public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1488, FieldType.BIT, 0); public static final Field UNUSEDBIT__1 = Field.create("UNUSEDBIT__1", 1488, FieldType.BIT, 1); public static final Field UNUSEDBIT__5 = Field.create("UNUSEDBIT__5", 1488, FieldType.BIT, 2); public static final Field UNUSEDBIT__6 = Field.create("UNUSEDBIT__6", 1488, FieldType.BIT, 3);