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

smarter IAC PID

This commit is contained in:
rusefi 2019-10-30 09:27:12 -04:00
parent 74e0c20235
commit 7a3369795f
9 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/rusefi_types.h
View File

@ -85,6 +85,7 @@ typedef float fuel_table_t[FUEL_LOAD_COUNT][FUEL_RPM_COUNT];
typedef float ignition_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];
typedef int16_t ignition_tps_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];
typedef uint8_t pedal_to_tps_t[PEDAL_TO_TPS_SIZE][PEDAL_TO_TPS_SIZE];
typedef uint8_t iac_pid_mult_t[IAC_PID_MULT_SIZE][IAC_PID_MULT_SIZE];
typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE];

18
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 23 21:40:23 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:38 EDT 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -2612,7 +2612,19 @@ struct engine_configuration_s {
/**
* offset 4060
*/
int mainUnusedEnd[585];
iac_pid_mult_t iacPidMultTable;
/**
* offset 4124
*/
uint8_t iacPidMultLoadBins[IAC_PID_MULT_SIZE];
/**
* offset 4132
*/
uint8_t iacPidMultRpmBins[IAC_PID_MULT_SIZE];
/**
* offset 4140
*/
int mainUnusedEnd[565];
/** total size 6400*/
};
@ -2875,4 +2887,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 23 21:40:23 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:38 EDT 2019

11
firmware/controllers/generated/rusefi_generated.h
View File

@ -1015,12 +1015,19 @@
#define hipOutputChannel_offset 1468
#define hipOutputChannel_offset_hex 5bc
#define HW_MAX_ADC_INDEX 17
#define IAC_PID_MULT_SIZE 8
#define iacByTpsTaper_offset 2038
#define iacByTpsTaper_offset_hex 7f6
#define iacCoasting_offset 3224
#define iacCoasting_offset_hex c98
#define iacCoastingBins_offset 3160
#define iacCoastingBins_offset_hex c58
#define iacPidMultLoadBins_offset 4124
#define iacPidMultLoadBins_offset_hex 101c
#define iacPidMultRpmBins_offset 4132
#define iacPidMultRpmBins_offset_hex 1024
#define iacPidMultTable_offset 4060
#define iacPidMultTable_offset_hex fdc
#define iat_adcChannel_offset 312
#define iat_adcChannel_offset_hex 138
#define iat_alignmentFill_offset 313
@ -1402,8 +1409,8 @@
#define mainRelayPin_offset_hex 2c2
#define mainRelayPinMode_offset 752
#define mainRelayPinMode_offset_hex 2f0
#define mainUnusedEnd_offset 4060
#define mainUnusedEnd_offset_hex fdc
#define mainUnusedEnd_offset 4140
#define mainUnusedEnd_offset_hex 102c
#define malfunctionIndicatorPin_offset 660
#define malfunctionIndicatorPin_offset_hex 294
#define malfunctionIndicatorPinMode_offset 661

12
firmware/integration/rusefi_config.txt
View File

@ -73,6 +73,8 @@ struct_no_prefix engine_configuration_s
#define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8
#define IAC_PID_MULT_SIZE 8
#define NARROW_BAND_WIDE_BAND_CONVERSION_SIZE 8
#define CLT_CURVE_SIZE 16
@ -146,6 +148,8 @@ custom ignition_tps_table_t 2*@@IGN_RPM_COUNT@@x@@IGN_TPS_COUNT@@ array, S16,
custom angle_table_t 4*@@IGN_RPM_COUNT@@x@@IGN_LOAD_COUNT@@ array, F32, @OFFSET@, [@@IGN_RPM_COUNT@@x@@IGN_LOAD_COUNT@@],"deg", 1, 0, -720, 720, 2
custom pedal_to_tps_t @@PEDAL_TO_TPS_SIZE@@x@@PEDAL_TO_TPS_SIZE@@ array, U08, @OFFSET@, [@@PEDAL_TO_TPS_SIZE@@x@@PEDAL_TO_TPS_SIZE@@],"deg", 1, 0, -720, 720, 2
custom iac_pid_mult_t @@IAC_PID_MULT_SIZE@@x@@IAC_PID_MULT_SIZE@@ array, U08, @OFFSET@, [@@IAC_PID_MULT_SIZE@@x@@IAC_PID_MULT_SIZE@@],"%", 1, 0, 0, 999, 2
struct pid_s
float pFactor;;"", 1, 0, -10000, 10000, 4
float iFactor;;"", 1, 0, -10000, 10000, 4
@ -1071,8 +1075,12 @@ uint8_t[4] unusuedsw;
int[3] alFIn;
uint8_t[4] unusedSpiPadding3;
pid_s idleRpmPid2
int[585] mainUnusedEnd;
iac_pid_mult_t iacPidMultTable;
uint8_t[IAC_PID_MULT_SIZE] iacPidMultLoadBins;;"Load", 1, 0.0, 0, 500.0, 2
uint8_t[IAC_PID_MULT_SIZE] iacPidMultRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0
int[565] mainUnusedEnd;
end_struct

7
firmware/tunerstudio/rusefi.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Oct 29 16:20:21 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:38 EDT 2019
pageSize = 20000
page = 1
@ -903,7 +903,10 @@ page = 1
idleRpmPid2_periodMs = scalar, S16, 4054, "ms", 1, 0, 0, 3000, 0
idleRpmPid2_minValue = scalar, S16, 4056, "", 1, 0, -30000, 30000.0, 0
idleRpmPid2_maxValue = scalar, S16, 4058, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping mainUnusedEnd offset 4060
iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

7
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Oct 29 16:20:26 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:44 EDT 2019
pageSize = 20000
page = 1
@ -903,7 +903,10 @@ page = 1
idleRpmPid2_periodMs = scalar, S16, 4054, "ms", 1, 0, 0, 3000, 0
idleRpmPid2_minValue = scalar, S16, 4056, "", 1, 0, -30000, 30000.0, 0
idleRpmPid2_maxValue = scalar, S16, 4058, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping mainUnusedEnd offset 4060
iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

7
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Oct 29 16:20:24 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:41 EDT 2019
pageSize = 20000
page = 1
@ -903,7 +903,10 @@ page = 1
idleRpmPid2_periodMs = scalar, S16, 4054, "ms", 1, 0, 0, 3000, 0
idleRpmPid2_minValue = scalar, S16, 4056, "", 1, 0, -30000, 30000.0, 0
idleRpmPid2_maxValue = scalar, S16, 4058, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping mainUnusedEnd offset 4060
iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

7
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Oct 29 16:20:29 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:47 EDT 2019
pageSize = 20000
page = 1
@ -903,7 +903,10 @@ page = 1
idleRpmPid2_periodMs = scalar, S16, 4054, "ms", 1, 0, 0, 3000, 0
idleRpmPid2_minValue = scalar, S16, 4056, "", 1, 0, -30000, 30000.0, 0
idleRpmPid2_maxValue = scalar, S16, 4058, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping mainUnusedEnd offset 4060
iacPidMultTable = array, U08, 4060, [8x8],"%", 1, 0, 0, 999, 2
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

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

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 23 21:40:23 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Oct 30 09:25:38 EDT 2019
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -678,9 +678,14 @@ public class Fields {
public static final int hip9011SpiDevice_offset = 540;
public static final int hipOutputChannel_offset = 1468;
public static final int HW_MAX_ADC_INDEX = 17;
public static final int IAC_PID_MULT_SIZE = 8;
public static final int iacByTpsTaper_offset = 2038;
public static final int iacCoasting_offset = 3224;
public static final int iacCoastingBins_offset = 3160;
public static final int iacPidMultLoadBins_offset = 4124;
public static final int iacPidMultRpmBins_offset = 4132;
public static final int iacPidMultRpmBins_offset_hex = 1024;
public static final int iacPidMultTable_offset = 4060;
public static final int iat_adcChannel_offset = 312;
public static final int iat_adcChannel_offset_hex = 138;
public static final int iat_alignmentFill_offset = 313;
@ -921,7 +926,7 @@ public class Fields {
public static final int mafSensorType_offset = 948;
public static final int mainRelayPin_offset = 706;
public static final int mainRelayPinMode_offset = 752;
public static final int mainUnusedEnd_offset = 4060;
public static final int mainUnusedEnd_offset = 4140;
public static final int malfunctionIndicatorPin_offset = 660;
public static final int malfunctionIndicatorPin_offset_hex = 294;
public static final int malfunctionIndicatorPinMode_offset = 661;
@ -2095,6 +2100,7 @@ public class Fields {
public static final Field IDLERPMPID2_PERIODMS = Field.create("IDLERPMPID2_PERIODMS", 4054, FieldType.INT16);
public static final Field IDLERPMPID2_MINVALUE = Field.create("IDLERPMPID2_MINVALUE", 4056, FieldType.INT16);
public static final Field IDLERPMPID2_MAXVALUE = Field.create("IDLERPMPID2_MAXVALUE", 4058, FieldType.INT16);
public static final Field IACPIDMULTTABLE = Field.create("IACPIDMULTTABLE", 4060, FieldType.INT);
public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6400, FieldType.INT);
public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
@ -2884,6 +2890,7 @@ public class Fields {
IDLERPMPID2_PERIODMS,
IDLERPMPID2_MINVALUE,
IDLERPMPID2_MAXVALUE,
IACPIDMULTTABLE,
PEDALTOTPSTABLE,
FSIOFORMULAS1,
FSIOFORMULAS2,