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-06-23 00:01:55 -04:00
parent 5146628bd8
commit 8a87aba3c4
6 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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 Tue Jun 14 02:28:29 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1612,9 +1612,24 @@ typedef struct {
*/
float fixedTiming;
/**
* MAP voltage for low point
* offset 2396
*/
int unused[163];
float mapLowValueVoltage;
/**
* MAP voltage for low point
* offset 2400
*/
float mapHighValueVoltage;
/**
* EGO value correction
* offset 2404
*/
float egoValueShift;
/**
* offset 2408
*/
int unused[160];
/** total size 3048*/
} engine_configuration_s;
@ -1803,4 +1818,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016

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

@ -821,7 +821,13 @@
#define fsioAdc4_offset_hex 954
#define fixedTiming_offset 2392
#define fixedTiming_offset_hex 958
#define unused_offset 2396
#define mapLowValueVoltage_offset 2396
#define mapHighValueVoltage_offset 2400
#define mapHighValueVoltage_offset_hex 960
#define egoValueShift_offset 2404
#define egoValueShift_offset_hex 964
#define unused_offset 2408
#define unused_offset_hex 968
#define le_formulas1_offset 3048
#define le_formulas2_offset 3248
#define le_formulas3_offset 3448

3
firmware/controllers/sensors/ego.cpp
View File

@ -13,7 +13,8 @@ float getAfr(DECLARE_ENGINE_PARAMETER_F) {
float volts = getVoltageDivided("ego", sensor->hwChannel);
return interpolate(sensor->v1, sensor->value1, sensor->v2, sensor->value2, volts);
return interpolate(sensor->v1, sensor->value1, sensor->v2, sensor->value2, volts)
+ engineConfiguration->egoValueShift;
}
static void initEgoSensor(afr_sensor_s *sensor, ego_sensor_e type) {

5
firmware/integration/rusefi_config.txt
View File

@ -694,7 +694,10 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
pin_output_mode_e dizzySparkOutputPinMode;
adc_channel_e[FSIO_ADC_COUNT iterate] fsioAdc;
float fixedTiming;Fixed timing, useful for TDC testing;"deg", 1, 0, -720, 720, 2
int[163] unused;
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[160] unused;
end_struct

8
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 Tue Jun 14 02:28:29 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
pageSize = 17080
page = 1
@ -570,7 +570,10 @@ page = 1
fsioAdc3 = bits, U32, 2384, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
fsioAdc4 = bits, U32, 2388, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
fixedTiming = scalar, F32, 2392, "deg", 1, 0, -720, 720, 2
;skipping unused offset 2396
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
;skipping unused offset 2408
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
@ -1511,6 +1514,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "low value", afr_value1
field = "high voltage", afr_v2
field = "high value", afr_value2
field = "Correction", egoValueShift
dialog = egoSettings_IO, "EGO Sensor I/O"
field = "AFR ADC input", afr_hwChannel
field = "O2 heater pin", o2heaterPin

13
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 Tue Jun 14 02:28:29 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 22 23:17:14 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -825,7 +825,13 @@ public class Fields {
public static final int fsioAdc4_offset_hex = 954;
public static final int fixedTiming_offset = 2392;
public static final int fixedTiming_offset_hex = 958;
public static final int unused_offset = 2396;
public static final int mapLowValueVoltage_offset = 2396;
public static final int mapHighValueVoltage_offset = 2400;
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 le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448;
@ -1412,6 +1418,9 @@ public class Fields {
public static final Field FSIOADC3 = Field.create("FSIOADC3", 2384, FieldType.INT, adc_channel_e);
public static final Field FSIOADC4 = Field.create("FSIOADC4", 2388, FieldType.INT, adc_channel_e);
public static final Field FIXEDTIMING = Field.create("FIXEDTIMING", 2392, FieldType.FLOAT);
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 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);