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

auto-sync

This commit is contained in:
rusEfi 2015-11-18 19:01:34 -05:00
parent 84474c5281
commit fd5dc4d09d
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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 Thu Nov 12 12:52:17 EST 2015 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 18:02:47 EST 2015
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -1365,9 +1365,14 @@ typedef struct {
*/ */
pid_s etb; pid_s etb;
/** /**
* CLT-based target RPM for automatic idle controller
* offset 2028 * offset 2028
*/ */
int unused3[32]; float cltIdleCorrRpmBins[CLT_CURVE_SIZE];
/**
* offset 2092
*/
float cltIdleRpm[CLT_CURVE_SIZE];
/** /**
* offset 2156 * offset 2156
*/ */
@ -1571,4 +1576,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 12 12:52:17 EST 2015 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 18:02:47 EST 2015

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

@ -695,7 +695,8 @@
#define etb_pFactor_offset 2016 #define etb_pFactor_offset 2016
#define etb_iFactor_offset 2020 #define etb_iFactor_offset 2020
#define etb_dFactor_offset 2024 #define etb_dFactor_offset 2024
#define unused3_offset 2028 #define cltIdleCorrRpmBins_offset 2028
#define cltIdleRpm_offset 2092
#define targetVBatt_offset 2156 #define targetVBatt_offset 2156
#define alternatorOffAboveTps_offset 2160 #define alternatorOffAboveTps_offset 2160
#define alternatorOffAboveTps_offset_hex 870 #define alternatorOffAboveTps_offset_hex 870

3
firmware/integration/rusefi_config.txt
View File

@ -601,7 +601,8 @@ baro_corr_table_t baroCorrTable;
float[8] knockNoise; float[8] knockNoise;
pid_s etb; pid_s etb;
int[32] unused3; float[CLT_CURVE_SIZE] cltIdleCorrRpmBins;CLT-based target RPM for automatic idle controller;"C", 1, 0, -100.0, 250.0, 2
float[CLT_CURVE_SIZE] cltIdleRpm;;"RPM", 1, 0, 0.0, 400.0, 0
float targetVBatt;;"Volts", 1, 0, 0,30, 1 float targetVBatt;;"Volts", 1, 0, 0,30, 1
float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2 float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2

5
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 12 10:32:55 EST 2015 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 18:02:47 EST 2015
pageSize = 15288 pageSize = 15288
page = 1 page = 1
@ -493,7 +493,8 @@ page = 1
etb_pFactor = scalar, F32, 2016, "value", 1, 0, 0, 1000, 2 etb_pFactor = scalar, F32, 2016, "value", 1, 0, 0, 1000, 2
etb_iFactor = scalar, F32, 2020, "value", 1, 0, 0, 1000, 2 etb_iFactor = scalar, F32, 2020, "value", 1, 0, 0, 1000, 2
etb_dFactor = scalar, F32, 2024, "value", 1, 0, 0, 1000, 2 etb_dFactor = scalar, F32, 2024, "value", 1, 0, 0, 1000, 2
;skipping unused3 offset 2028 cltIdleCorrRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2
cltIdleRpm = array, F32, 2092, [16], "RPM", 1, 0, 0.0, 400.0, 0
targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1
alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2 alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2
alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0 alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0

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

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 11 21:40:26 EST 2015 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 18 18:02:47 EST 2015
public class Fields { public class Fields {
public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT); public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT);
public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT); public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT);
@ -45,7 +45,7 @@ public class Fields {
public static final Field CYLINDERSCOUNT = new Field("CYLINDERSCOUNT", 404, FieldType.INT); public static final Field CYLINDERSCOUNT = new Field("CYLINDERSCOUNT", 404, FieldType.INT);
public static final Field FIRINGORDER = new Field("FIRINGORDER", 408, FieldType.INT); public static final Field FIRINGORDER = new Field("FIRINGORDER", 408, FieldType.INT);
public static final Field CYLINDERBORE = new Field("CYLINDERBORE", 412, FieldType.FLOAT); public static final Field CYLINDERBORE = new Field("CYLINDERBORE", 412, FieldType.FLOAT);
public static final Field ENGINECYCLE = new Field("ENGINECYCLE", 416, FieldType.INT); public static final Field ENGINECYCLEDURATION = new Field("ENGINECYCLEDURATION", 416, FieldType.INT);
public static final Field RPMHARDLIMIT = new Field("RPMHARDLIMIT", 420, FieldType.INT); public static final Field RPMHARDLIMIT = new Field("RPMHARDLIMIT", 420, FieldType.INT);
public static final String[] engine_load_mode_e = {"MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"}; public static final String[] engine_load_mode_e = {"MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"};
public static final Field ALGORITHM = new Field("ALGORITHM", 424, FieldType.INT, engine_load_mode_e); public static final Field ALGORITHM = new Field("ALGORITHM", 424, FieldType.INT, engine_load_mode_e);
@ -425,9 +425,9 @@ public class Fields {
public static final Field MAPERRORLOWVALUE = new Field("MAPERRORLOWVALUE", 1896, FieldType.FLOAT); public static final Field MAPERRORLOWVALUE = new Field("MAPERRORLOWVALUE", 1896, FieldType.FLOAT);
public static final Field MAPERRORHIGHVALUE = new Field("MAPERRORHIGHVALUE", 1900, FieldType.FLOAT); public static final Field MAPERRORHIGHVALUE = new Field("MAPERRORHIGHVALUE", 1900, FieldType.FLOAT);
public static final Field STEP1RPMWINDOW = new Field("STEP1RPMWINDOW", 1904, FieldType.INT); public static final Field STEP1RPMWINDOW = new Field("STEP1RPMWINDOW", 1904, FieldType.INT);
public static final Field IDLEPFACTOR = new Field("IDLEPFACTOR", 1908, FieldType.FLOAT); public static final Field IDLEPID_PFACTOR = new Field("IDLEPID_PFACTOR", 1908, FieldType.FLOAT);
public static final Field IDLEIFACTOR = new Field("IDLEIFACTOR", 1912, FieldType.FLOAT); public static final Field IDLEPID_IFACTOR = new Field("IDLEPID_IFACTOR", 1912, FieldType.FLOAT);
public static final Field IDLEDFACTOR = new Field("IDLEDFACTOR", 1916, FieldType.FLOAT); public static final Field IDLEPID_DFACTOR = new Field("IDLEPID_DFACTOR", 1916, FieldType.FLOAT);
public static final Field IDLEDT = new Field("IDLEDT", 1920, FieldType.INT); public static final Field IDLEDT = new Field("IDLEDT", 1920, FieldType.INT);
public static final Field IDLECONTROL = new Field("IDLECONTROL", 1924, FieldType.INT); public static final Field IDLECONTROL = new Field("IDLECONTROL", 1924, FieldType.INT);
public static final Field COMMUNICATIONPIN = new Field("COMMUNICATIONPIN", 1928, FieldType.INT, brain_pin_e); public static final Field COMMUNICATIONPIN = new Field("COMMUNICATIONPIN", 1928, FieldType.INT, brain_pin_e);
@ -436,16 +436,16 @@ public class Fields {
public static final Field BINARYSERIALRXPIN = new Field("BINARYSERIALRXPIN", 1940, FieldType.INT, brain_pin_e); public static final Field BINARYSERIALRXPIN = new Field("BINARYSERIALRXPIN", 1940, FieldType.INT, brain_pin_e);
public static final Field CONSOLESERIALTXPIN = new Field("CONSOLESERIALTXPIN", 1944, FieldType.INT, brain_pin_e); public static final Field CONSOLESERIALTXPIN = new Field("CONSOLESERIALTXPIN", 1944, FieldType.INT, brain_pin_e);
public static final Field CONSOLESERIALRXPIN = new Field("CONSOLESERIALRXPIN", 1948, FieldType.INT, brain_pin_e); public static final Field CONSOLESERIALRXPIN = new Field("CONSOLESERIALRXPIN", 1948, FieldType.INT, brain_pin_e);
public static final Field ETBPFACTOR = new Field("ETBPFACTOR", 2016, FieldType.FLOAT); public static final Field ETB_PFACTOR = new Field("ETB_PFACTOR", 2016, FieldType.FLOAT);
public static final Field ETBIFACTOR = new Field("ETBIFACTOR", 2020, FieldType.FLOAT); public static final Field ETB_IFACTOR = new Field("ETB_IFACTOR", 2020, FieldType.FLOAT);
public static final Field ETBDFACTOR = new Field("ETBDFACTOR", 2024, FieldType.FLOAT); public static final Field ETB_DFACTOR = new Field("ETB_DFACTOR", 2024, FieldType.FLOAT);
public static final Field TARGETVBATT = new Field("TARGETVBATT", 2156, FieldType.FLOAT); public static final Field TARGETVBATT = new Field("TARGETVBATT", 2156, FieldType.FLOAT);
public static final Field ALTERNATOROFFABOVETPS = new Field("ALTERNATOROFFABOVETPS", 2160, FieldType.FLOAT); public static final Field ALTERNATOROFFABOVETPS = new Field("ALTERNATOROFFABOVETPS", 2160, FieldType.FLOAT);
public static final Field ALTERNATORDT = new Field("ALTERNATORDT", 2164, FieldType.INT); public static final Field ALTERNATORDT = new Field("ALTERNATORDT", 2164, FieldType.INT);
public static final Field ALTERNATOROFFSET = new Field("ALTERNATOROFFSET", 2168, FieldType.FLOAT); public static final Field ALTERNATOROFFSET = new Field("ALTERNATOROFFSET", 2168, FieldType.FLOAT);
public static final Field ALTERNATORCONTROLPFACTOR = new Field("ALTERNATORCONTROLPFACTOR", 2172, FieldType.FLOAT); public static final Field ALTERNATORCONTROL_PFACTOR = new Field("ALTERNATORCONTROL_PFACTOR", 2172, FieldType.FLOAT);
public static final Field ALTERNATORCONTROLIFACTOR = new Field("ALTERNATORCONTROLIFACTOR", 2176, FieldType.FLOAT); public static final Field ALTERNATORCONTROL_IFACTOR = new Field("ALTERNATORCONTROL_IFACTOR", 2176, FieldType.FLOAT);
public static final Field ALTERNATORCONTROLDFACTOR = new Field("ALTERNATORCONTROLDFACTOR", 2180, FieldType.FLOAT); public static final Field ALTERNATORCONTROL_DFACTOR = new Field("ALTERNATORCONTROL_DFACTOR", 2180, FieldType.FLOAT);
public static final Field TPSACCELLENGTH = new Field("TPSACCELLENGTH", 2184, FieldType.INT); public static final Field TPSACCELLENGTH = new Field("TPSACCELLENGTH", 2184, FieldType.INT);
public static final Field TPSACCELENRICHMENTTHRESHOLD = new Field("TPSACCELENRICHMENTTHRESHOLD", 2188, FieldType.FLOAT); public static final Field TPSACCELENRICHMENTTHRESHOLD = new Field("TPSACCELENRICHMENTTHRESHOLD", 2188, FieldType.FLOAT);
public static final Field TPSACCELENRICHMENTMULTIPLIER = new Field("TPSACCELENRICHMENTMULTIPLIER", 2192, FieldType.FLOAT); public static final Field TPSACCELENRICHMENTMULTIPLIER = new Field("TPSACCELENRICHMENTMULTIPLIER", 2192, FieldType.FLOAT);