rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-11-16 19:02:10 -05:00
parent f3ccb307c1
commit 2fa08f9150
8 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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

4
firmware/controllers/algo/rusefi_generated.h
View File

@ -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

2
firmware/controllers/trigger/trigger_central.cpp
View File

@ -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();

2
firmware/integration/rusefi_config.txt
View File

@ -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

2
firmware/rusefi.cpp
View File

@ -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;
}

5
firmware/tunerstudio/rusefi.ini
View File

@ -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

1
firmware/tunerstudio/rusefi.input
View File

@ -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

8
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -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);