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 2017-01-22 18:04:24 -05:00
parent ef496916f9
commit 84e8c56d40
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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 Sun Jan 22 15:18:35 EST 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 17:18:49 EST 2017
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1803,7 +1803,7 @@ typedef struct {
/** /**
* offset 2738 * offset 2738
*/ */
int16_t unusedShort; int16_t fuelClosedLoopAfrLowThreshold;
/** /**
* offset 2740 * offset 2740
*/ */
@ -1811,7 +1811,15 @@ typedef struct {
/** /**
* offset 2756 * offset 2756
*/ */
int unused[73]; int16_t fuelClosedLoopAfrHighThreshold;
/**
* offset 2758
*/
int16_t unusedShort;
/**
* offset 2760
*/
int unused[72];
/** total size 3048*/ /** total size 3048*/
} engine_configuration_s; } engine_configuration_s;
@ -2026,4 +2034,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 15:18:35 EST 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 17:18:49 EST 2017

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

@ -920,13 +920,15 @@
#define fuelClosedLoopCltThreshold_offset 2732 #define fuelClosedLoopCltThreshold_offset 2732
#define fuelClosedLoopTpsThreshold_offset 2734 #define fuelClosedLoopTpsThreshold_offset 2734
#define fuelClosedLoopRpmThreshold_offset 2736 #define fuelClosedLoopRpmThreshold_offset 2736
#define unusedShort_offset 2738 #define fuelClosedLoopAfrLowThreshold_offset 2738
#define fuelClosedLoopPid_offset 2740 #define fuelClosedLoopPid_offset 2740
#define fuelClosedLoopPid_pFactor_offset 2740 #define fuelClosedLoopPid_pFactor_offset 2740
#define fuelClosedLoopPid_iFactor_offset 2744 #define fuelClosedLoopPid_iFactor_offset 2744
#define fuelClosedLoopPid_dFactor_offset 2748 #define fuelClosedLoopPid_dFactor_offset 2748
#define fuelClosedLoopPid_offset_offset 2752 #define fuelClosedLoopPid_offset_offset 2752
#define unused_offset 2756 #define fuelClosedLoopAfrHighThreshold_offset 2756
#define unusedShort_offset 2758
#define unused_offset 2760
#define le_formulas1_offset 3048 #define le_formulas1_offset 3048
#define le_formulas2_offset 3248 #define le_formulas2_offset 3248
#define le_formulas3_offset 3448 #define le_formulas3_offset 3448

14
firmware/integration/rusefi_config.txt
View File

@ -98,9 +98,9 @@ custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1,
custom angle_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2 custom angle_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2
struct pid_s struct pid_s
float pFactor;;"value", 1, 0, 0, 1000, 5 float pFactor;;"value", 1, 0, -1000, 1000, 5
float iFactor;;"value", 1, 0, 0, 1000, 5 float iFactor;;"value", 1, 0, -1000, 1000, 5
float dFactor;;"value", 1, 0, 0, 1000, 5 float dFactor;;"value", 1, 0, -1000, 1000, 5
float offset;Linear addition to PID logic;"value", 1, 0, 0, 1000, 3 float offset;Linear addition to PID logic;"value", 1, 0, 0, 1000, 3
end_struct end_struct
@ -763,11 +763,13 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
ThermistorConf auxTempSensor1; ThermistorConf auxTempSensor1;
ThermistorConf auxTempSensor2; ThermistorConf auxTempSensor2;
int16_t fuelClosedLoopCltThreshold;;"C", 1, 0, 0, 100, 0 int16_t fuelClosedLoopCltThreshold;;"C", 1, 0, 0, 100, 0
int16_t fuelClosedLoopTpsThreshold;;"%", 1, 0, 0, 10, 0 int16_t fuelClosedLoopTpsThreshold;;"%", 1, 0, 0, 100, 0
int16_t fuelClosedLoopRpmThreshold;;"rpm", 1, 0, 0, 5000, 0 int16_t fuelClosedLoopRpmThreshold;;"rpm", 1, 0, 0, 5000, 0
int16_t unusedShort int16_t fuelClosedLoopAfrLowThreshold;;"ratio", 1, 0, 0, 100, 1
pid_s fuelClosedLoopPid; pid_s fuelClosedLoopPid;
int[73] unused; int16_t fuelClosedLoopAfrHighThreshold;;"ratio", 1, 0, 0, 100, 1
int16_t unusedShort
int[72] unused;
end_struct end_struct

12
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 Sun Jan 22 15:18:35 EST 2017 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 17:18:49 EST 2017
public class Fields { public class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4; public static final int FSIO_ADC_COUNT = 4;
@ -924,13 +924,15 @@ public class Fields {
public static final int fuelClosedLoopCltThreshold_offset = 2732; public static final int fuelClosedLoopCltThreshold_offset = 2732;
public static final int fuelClosedLoopTpsThreshold_offset = 2734; public static final int fuelClosedLoopTpsThreshold_offset = 2734;
public static final int fuelClosedLoopRpmThreshold_offset = 2736; public static final int fuelClosedLoopRpmThreshold_offset = 2736;
public static final int unusedShort_offset = 2738; public static final int fuelClosedLoopAfrLowThreshold_offset = 2738;
public static final int fuelClosedLoopPid_offset = 2740; public static final int fuelClosedLoopPid_offset = 2740;
public static final int fuelClosedLoopPid_pFactor_offset = 2740; public static final int fuelClosedLoopPid_pFactor_offset = 2740;
public static final int fuelClosedLoopPid_iFactor_offset = 2744; public static final int fuelClosedLoopPid_iFactor_offset = 2744;
public static final int fuelClosedLoopPid_dFactor_offset = 2748; public static final int fuelClosedLoopPid_dFactor_offset = 2748;
public static final int fuelClosedLoopPid_offset_offset = 2752; public static final int fuelClosedLoopPid_offset_offset = 2752;
public static final int unused_offset = 2756; public static final int fuelClosedLoopAfrHighThreshold_offset = 2756;
public static final int unusedShort_offset = 2758;
public static final int unused_offset = 2760;
public static final int le_formulas1_offset = 3048; public static final int le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248; public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448; public static final int le_formulas3_offset = 3448;
@ -1593,11 +1595,13 @@ public class Fields {
public static final Field FUELCLOSEDLOOPCLTTHRESHOLD = Field.create("FUELCLOSEDLOOPCLTTHRESHOLD", 2732, FieldType.INT); public static final Field FUELCLOSEDLOOPCLTTHRESHOLD = Field.create("FUELCLOSEDLOOPCLTTHRESHOLD", 2732, FieldType.INT);
public static final Field FUELCLOSEDLOOPTPSTHRESHOLD = Field.create("FUELCLOSEDLOOPTPSTHRESHOLD", 2734, FieldType.INT); public static final Field FUELCLOSEDLOOPTPSTHRESHOLD = Field.create("FUELCLOSEDLOOPTPSTHRESHOLD", 2734, FieldType.INT);
public static final Field FUELCLOSEDLOOPRPMTHRESHOLD = Field.create("FUELCLOSEDLOOPRPMTHRESHOLD", 2736, FieldType.INT); public static final Field FUELCLOSEDLOOPRPMTHRESHOLD = Field.create("FUELCLOSEDLOOPRPMTHRESHOLD", 2736, FieldType.INT);
public static final Field UNUSEDSHORT = Field.create("UNUSEDSHORT", 2738, FieldType.INT); public static final Field FUELCLOSEDLOOPAFRLOWTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRLOWTHRESHOLD", 2738, FieldType.INT);
public static final Field FUELCLOSEDLOOPPID_PFACTOR = Field.create("FUELCLOSEDLOOPPID_PFACTOR", 2740, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_PFACTOR = Field.create("FUELCLOSEDLOOPPID_PFACTOR", 2740, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPPID_IFACTOR = Field.create("FUELCLOSEDLOOPPID_IFACTOR", 2744, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_IFACTOR = Field.create("FUELCLOSEDLOOPPID_IFACTOR", 2744, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPPID_DFACTOR = Field.create("FUELCLOSEDLOOPPID_DFACTOR", 2748, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_DFACTOR = Field.create("FUELCLOSEDLOOPPID_DFACTOR", 2748, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPPID_OFFSET = Field.create("FUELCLOSEDLOOPPID_OFFSET", 2752, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_OFFSET = Field.create("FUELCLOSEDLOOPPID_OFFSET", 2752, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPAFRHIGHTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRHIGHTHRESHOLD", 2756, FieldType.INT);
public static final Field UNUSEDSHORT = Field.create("UNUSEDSHORT", 2758, FieldType.INT);
public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT); 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_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT);
public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT); public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);