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

auto-sync

This commit is contained in:
rusEfi 2016-02-10 13:01:49 -05:00
parent 7c4bc809d9
commit a66bcd23f1
5 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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 Sat Feb 06 08:58:48 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 10 12:21:21 EST 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1475,9 +1475,22 @@ typedef struct {
*/
pid_s warmupAfrPid;
/**
* CLT-based target AFR for PID-based control
* offset 2264
*/
int unused[188];
float warmupTargetAfrBins[WARMUP_TARGET_AFR_SIZE];
/**
* offset 2280
*/
float warmupTargetAfr[WARMUP_TARGET_AFR_SIZE];
/**
* offset 2296
*/
float warmupAfrThreshold;
/**
* offset 2300
*/
int unused[179];
/** total size 3016*/
} engine_configuration_s;
@ -1627,4 +1640,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 06 08:58:48 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 10 12:21:21 EST 2016

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

@ -1,5 +1,6 @@
#define LE_COMMAND_LENGTH 200
#define TS_FILE_VERSION 20160122
#define WARMUP_TARGET_AFR_SIZE 4
#define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8
#define CLT_CURVE_SIZE 16
@ -738,7 +739,10 @@
#define warmupAfrPid_iFactor_offset 2252
#define warmupAfrPid_dFactor_offset 2256
#define warmupAfrPid_offset_offset 2260
#define unused_offset 2264
#define warmupTargetAfrBins_offset 2264
#define warmupTargetAfr_offset 2280
#define warmupAfrThreshold_offset 2296
#define unused_offset 2300
#define le_formulas1_offset 3016
#define le_formulas2_offset 3216
#define le_formulas3_offset 3416

8
firmware/integration/rusefi_config.txt
View File

@ -22,6 +22,7 @@ struct_no_prefix engine_configuration_s
!
#define TS_FILE_VERSION 20160122
#define WARMUP_TARGET_AFR_SIZE 4
#define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8
@ -637,7 +638,12 @@ baro_corr_table_t baroCorrTable;
float slowAdcAlpha;;"coeff", 1, 0, 0, 200, 3
debug_mode_e debugMode;
pid_s warmupAfrPid;
int[188] unused;
float[WARMUP_TARGET_AFR_SIZE] warmupTargetAfrBins;CLT-based target AFR for PID-based control;"C", 1, 0, -100.0, 250.0, 2
float[WARMUP_TARGET_AFR_SIZE] warmupTargetAfr;;"AFR", 1, 0, 0.0, 20.0, 2
float warmupAfrThreshold;;"tempterature", 1, 0, 0, 200, 3
int[179] unused;
end_struct

7
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,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 Feb 08 20:43:48 EST 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 10 12:21:21 EST 2016
pageSize = 16088
page = 1
@ -527,7 +527,10 @@ page = 1
warmupAfrPid_iFactor = scalar, F32, 2252, "value", 1, 0, 0, 1000, 5
warmupAfrPid_dFactor = scalar, F32, 2256, "value", 1, 0, 0, 1000, 5
warmupAfrPid_offset = scalar, F32, 2260, "value", 1, 0, 0, 1000, 3
;skipping unused offset 2264
warmupTargetAfrBins = array, F32, 2264, [4], "C", 1, 0, -100.0, 250.0, 2
warmupTargetAfr = array, F32, 2280, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2296, "tempterature", 1, 0, 0, 200, 3
;skipping unused offset 2300
le_formulas1 = array, U08, 3016, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas2 = array, U08, 3216, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas3 = array, U08, 3416, [200],"char", 1, 0, 0.0, 3.0, 2

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

@ -1,9 +1,10 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 07 21:17:35 EST 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 10 12:21:21 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int TS_FILE_VERSION = 20160122;
public static final int WARMUP_TARGET_AFR_SIZE = 4;
public static final int MAP_ANGLE_SIZE = 8;
public static final int MAP_WINDOW_SIZE = 8;
public static final int CLT_CURVE_SIZE = 16;
@ -742,7 +743,10 @@ public class Fields {
public static final int warmupAfrPid_iFactor_offset = 2252;
public static final int warmupAfrPid_dFactor_offset = 2256;
public static final int warmupAfrPid_offset_offset = 2260;
public static final int unused_offset = 2264;
public static final int warmupTargetAfrBins_offset = 2264;
public static final int warmupTargetAfr_offset = 2280;
public static final int warmupAfrThreshold_offset = 2296;
public static final int unused_offset = 2300;
public static final int le_formulas1_offset = 3016;
public static final int le_formulas2_offset = 3216;
public static final int le_formulas3_offset = 3416;
@ -1277,6 +1281,7 @@ public class Fields {
public static final Field WARMUPAFRPID_IFACTOR = Field.create("WARMUPAFRPID_IFACTOR", 2252, FieldType.FLOAT);
public static final Field WARMUPAFRPID_DFACTOR = Field.create("WARMUPAFRPID_DFACTOR", 2256, FieldType.FLOAT);
public static final Field WARMUPAFRPID_OFFSET = Field.create("WARMUPAFRPID_OFFSET", 2260, FieldType.FLOAT);
public static final Field WARMUPAFRTHRESHOLD = Field.create("WARMUPAFRTHRESHOLD", 2296, FieldType.FLOAT);
public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3016, FieldType.INT);
public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3216, FieldType.INT);
public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3416, FieldType.INT);