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

ETB: TPS should be f(RPM, pedal) #835

This commit is contained in:
rusefi 2019-06-10 12:52:26 -04:00
parent 30847db935
commit 1e75fc98b5
8 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 07 17:34:20 EDT 2019
// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:03 EDT 2019
// begin
#ifndef CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
#define CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -2537,8 +2537,8 @@ struct engine_configuration_s {
/**
* offset 4036
*/
int mainUnusedEnd[611];
/** total size 6480*/
int mainUnusedEnd[591];
/** total size 6400*/
};
typedef struct engine_configuration_s engine_configuration_s;
@ -2549,6 +2549,18 @@ struct persistent_config_s {
* offset 0
*/
engine_configuration_s engineConfiguration;
/**
* offset 6400
*/
pedal_to_tps_t pedalToTps;
/**
* offset 6464
*/
uint8_t pedalToTpsBins[PEDAL_TO_TPS_SIZE];
/**
* offset 6472
*/
uint8_t pedalToTps[PEDAL_TO_TPS_SIZE];
/**
* CLT-based cranking position multiplier for simple manual idle controller
* offset 6480
@ -2788,4 +2800,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 07 17:34:20 EDT 2019
// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:03 EDT 2019

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

@ -1475,6 +1475,11 @@
#define overrideCrankingIgnition_offset_hex 204
#define pauseEtbControl_offset 744
#define pauseEtbControl_offset_hex 2e8
#define PEDAL_TO_TPS_SIZE 8
#define pedalToTps_offset 6400
#define pedalToTps_offset_hex 1900
#define pedalToTpsBins_offset 6464
#define pedalToTpsBins_offset_hex 1940
#define pidExtraForLowRpm_offset 3180
#define pidExtraForLowRpm_offset_hex c6c
#define pin_mode_e_enum "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"

11
firmware/integration/rusefi_config.txt
View File

@ -110,6 +110,8 @@ struct_no_prefix engine_configuration_s
#define FUEL_RPM_COUNT 16
#define FUEL_LOAD_COUNT 16
#define PEDAL_TO_TPS_SIZE 8
#define FSIO_TABLE_8 8
#define FSIO_CURVE_8 8
@ -141,6 +143,7 @@ custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1,
custom ignition_tps_table_t 512 array, S16, @OFFSET@, [16x16],"deg", 0.01, 0, -20, 90, 2
custom angle_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2
custom pedal_to_tps_t 64 array, U08, @OFFSET@, [@@PEDAL_TO_TPS_SIZE@@x@@PEDAL_TO_TPS_SIZE@@],"deg", 1, 0, -720, 720, 2
struct pid_s
! explicitly document which use-cases need 10e-7 parameters
@ -1050,13 +1053,19 @@ tChargeMode_e tChargeMode;
spi_device_e mc33972spiDevice;
uint8_t[3] unusedSpiPadding8;
int[611] mainUnusedEnd;
int[591] mainUnusedEnd;
end_struct
engine_configuration_s engineConfiguration;
pedal_to_tps_t pedalToTps;
uint8_t[PEDAL_TO_TPS_SIZE] pedalToTpsBins;;"%", 1, 0, 0.0, 120.0, 0
uint8_t[PEDAL_TO_TPS_SIZE] pedalToTps;;"%", 1, 0, 0.0, 120.0, 0
float[CLT_CRANKING_CURVE_SIZE] cltCrankingCorrBins;CLT-based cranking position multiplier for simple manual idle controller;"C", 1, 0, -100.0, 250.0, 2
float[CLT_CRANKING_CURVE_SIZE] cltCrankingCorr ;CLT-based cranking position multiplier for simple manual idle controller;"%", 1, 0, 0.0, 500.0, 2

5
firmware/tunerstudio/rusefi.ini
View File

@ -72,7 +72,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 07 17:37:31 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:03 EDT 2019
pageSize = 20000
page = 1
@ -877,6 +877,9 @@ page = 1
mc33972spiDevice = bits,U32, 4032, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
;no TS info - skipping unusedSpiPadding8 offset 4033
;no TS info - skipping mainUnusedEnd offset 4036
pedalToTps = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTps = array, U08, 6472, [8], "%", 1, 0, 0.0, 120.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2

5
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -72,7 +72,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 07 17:37:33 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:13 EDT 2019
pageSize = 20000
page = 1
@ -877,6 +877,9 @@ page = 1
mc33972spiDevice = bits,U32, 4032, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
;no TS info - skipping unusedSpiPadding8 offset 4033
;no TS info - skipping mainUnusedEnd offset 4036
pedalToTps = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTps = array, U08, 6472, [8], "%", 1, 0, 0.0, 120.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2

5
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -72,7 +72,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 07 17:37:32 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:08 EDT 2019
pageSize = 20000
page = 1
@ -877,6 +877,9 @@ page = 1
mc33972spiDevice = bits,U32, 4032, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
;no TS info - skipping unusedSpiPadding8 offset 4033
;no TS info - skipping mainUnusedEnd offset 4036
pedalToTps = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTps = array, U08, 6472, [8], "%", 1, 0, 0.0, 120.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2

5
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -72,7 +72,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 07 17:37:33 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:16 EDT 2019
pageSize = 20000
page = 1
@ -877,6 +877,9 @@ page = 1
mc33972spiDevice = bits,U32, 4032, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
;no TS info - skipping unusedSpiPadding8 offset 4033
;no TS info - skipping mainUnusedEnd offset 4036
pedalToTps = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTps = array, U08, 6472, [8], "%", 1, 0, 0.0, 120.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2

8
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 integration\rusefi_config.txt Fri Jun 07 17:34:20 EDT 2019
// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 10 12:49:03 EDT 2019
public class Fields {
public static final int accelerometerSpiDevice_offset = 2736;
public static final int acCutoffHighRpm_offset = 1498;
@ -959,6 +959,11 @@ public class Fields {
public static final int overrideCrankingIgnition_offset = 516;
public static final int overrideCrankingIgnition_offset_hex = 204;
public static final int pauseEtbControl_offset = 744;
public static final int PEDAL_TO_TPS_SIZE = 8;
public static final int pedalToTps_offset = 6400;
public static final int pedalToTps_offset_hex = 1900;
public static final int pedalToTpsBins_offset = 6464;
public static final int pedalToTpsBins_offset_hex = 1940;
public static final int pidExtraForLowRpm_offset = 3180;
public static final int postCrankingDurationSec_offset = 2464;
public static final int postCrankingFactor_offset = 2460;
@ -1991,6 +1996,7 @@ public class Fields {
public static final Field MC33816SPIDEVICE = Field.create("MC33816SPIDEVICE", 4025, FieldType.INT8);
public static final Field TLE6240SPIDEVICE = Field.create("TLE6240SPIDEVICE", 4028, FieldType.INT8);
public static final Field MC33972SPIDEVICE = Field.create("MC33972SPIDEVICE", 4032, FieldType.INT8);
public static final Field PEDALTOTPS = Field.create("PEDALTOTPS", 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);
public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);