Fresh generated - auto

This commit is contained in:
rusefi 2020-05-23 10:55:42 -04:00
parent 426d4e7c0c
commit 0774a98512
8 changed files with 58 additions and 16 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 20 01:18:09 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:54:57 EDT 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -2557,7 +2557,16 @@ struct engine_configuration_s {
/**
* offset 2100
*/
uint32_t unused_former_warmup_target_afr[8];
float throttlePedalSecondaryUpVoltage;
/**
* Pedal in the floor
* offset 2104
*/
float throttlePedalSecondaryWOTVoltage;
/**
* offset 2108
*/
uint32_t unused_former_warmup_target_afr[6];
/**
* kPa value at which we need to cut fuel and spark, 0 if not enabled
* offset 2132
@ -3514,4 +3523,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 20 01:18:09 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:54:57 EDT 2020

View File

@ -1151,6 +1151,8 @@
#define test557pin_offset 3101
#define throttlePedalPositionAdcChannel_offset 580
#define throttlePedalPositionSecondAdcChannel_offset 683
#define throttlePedalSecondaryUpVoltage_offset 2100
#define throttlePedalSecondaryWOTVoltage_offset 2104
#define throttlePedalUpPin_offset 583
#define throttlePedalUpPinMode_offset 710
#define throttlePedalUpVoltage_offset 1884
@ -1305,7 +1307,7 @@
#define unused_1484_bit_29_offset 1476
#define unused_1484_bit_30_offset 1476
#define unused_1484_bit_31_offset 1476
#define unused_former_warmup_target_afr_offset 2100
#define unused_former_warmup_target_afr_offset 2108
#define unusedAtOldBoardConfigurationEnd_offset 1200
#define unusedBit4_1476_offset 1476
#define unusedBit_251_11_offset 976

View File

@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Sat May 23 00:54:36 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:54:57 EDT 2020
pageSize = 20000
page = 1
@ -830,7 +830,9 @@ page = 1
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"
auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0
;no TS info - skipping unused_former_warmup_target_afr offset 2100
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
;no TS info - skipping unused_former_warmup_target_afr offset 2108
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1319,6 +1321,7 @@ page = 1
vvtOffset = "Angle between cam sensor and VVT zero position\nset vvt_offset X"
slowAdcAlpha = "ExpAverage alpha coefficient"
debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X"
throttlePedalSecondaryWOTVoltage = "Pedal in the floor"
dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin"
crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling."
postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start"
@ -3116,6 +3119,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Up voltage", throttlePedalUpVoltage
field = "Down (WOT) voltage", throttlePedalWOTVoltage
field = "Accelerator position 2nd sensor", throttlePedalPositionSecondAdcChannel
field = "Up voltage" throttlePedalSecondaryUpVoltage
field = "Down (WOT) voltage", throttlePedalSecondaryWOTVoltage
dialog = pedalGauges
gauge = pedalPositionGauge

View File

@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Sat May 23 00:54:52 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:55:18 EDT 2020
pageSize = 20000
page = 1
@ -830,7 +830,9 @@ page = 1
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"
auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0
;no TS info - skipping unused_former_warmup_target_afr offset 2100
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
;no TS info - skipping unused_former_warmup_target_afr offset 2108
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1319,6 +1321,7 @@ page = 1
vvtOffset = "Angle between cam sensor and VVT zero position\nset vvt_offset X"
slowAdcAlpha = "ExpAverage alpha coefficient"
debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X"
throttlePedalSecondaryWOTVoltage = "Pedal in the floor"
dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin"
crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling."
postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start"
@ -3116,6 +3119,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Up voltage", throttlePedalUpVoltage
field = "Down (WOT) voltage", throttlePedalWOTVoltage
field = "Accelerator position 2nd sensor", throttlePedalPositionSecondAdcChannel
field = "Up voltage" throttlePedalSecondaryUpVoltage
field = "Down (WOT) voltage", throttlePedalSecondaryWOTVoltage
dialog = pedalGauges
gauge = pedalPositionGauge

View File

@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Sat May 23 00:54:49 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:55:15 EDT 2020
pageSize = 20000
page = 1
@ -830,7 +830,9 @@ page = 1
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"
auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0
;no TS info - skipping unused_former_warmup_target_afr offset 2100
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
;no TS info - skipping unused_former_warmup_target_afr offset 2108
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1319,6 +1321,7 @@ page = 1
vvtOffset = "Angle between cam sensor and VVT zero position\nset vvt_offset X"
slowAdcAlpha = "ExpAverage alpha coefficient"
debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X"
throttlePedalSecondaryWOTVoltage = "Pedal in the floor"
dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin"
crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling."
postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start"
@ -3108,6 +3111,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Up voltage", throttlePedalUpVoltage
field = "Down (WOT) voltage", throttlePedalWOTVoltage
field = "Accelerator position 2nd sensor", throttlePedalPositionSecondAdcChannel
field = "Up voltage" throttlePedalSecondaryUpVoltage
field = "Down (WOT) voltage", throttlePedalSecondaryWOTVoltage
dialog = pedalGauges
gauge = pedalPositionGauge

View File

@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Sat May 23 00:54:55 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:55:21 EDT 2020
pageSize = 20000
page = 1
@ -830,7 +830,9 @@ page = 1
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"
auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0
;no TS info - skipping unused_former_warmup_target_afr offset 2100
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
;no TS info - skipping unused_former_warmup_target_afr offset 2108
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1319,6 +1321,7 @@ page = 1
vvtOffset = "Angle between cam sensor and VVT zero position\nset vvt_offset X"
slowAdcAlpha = "ExpAverage alpha coefficient"
debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X"
throttlePedalSecondaryWOTVoltage = "Pedal in the floor"
dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin"
crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling."
postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start"
@ -3112,6 +3115,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Up voltage", throttlePedalUpVoltage
field = "Down (WOT) voltage", throttlePedalWOTVoltage
field = "Accelerator position 2nd sensor", throttlePedalPositionSecondAdcChannel
field = "Up voltage" throttlePedalSecondaryUpVoltage
field = "Down (WOT) voltage", throttlePedalSecondaryWOTVoltage
dialog = pedalGauges
gauge = pedalPositionGauge

View File

@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Sat May 23 00:54:57 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:55:23 EDT 2020
pageSize = 20000
page = 1
@ -830,7 +830,9 @@ page = 1
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"
auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0
;no TS info - skipping unused_former_warmup_target_afr offset 2100
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
;no TS info - skipping unused_former_warmup_target_afr offset 2108
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1319,6 +1321,7 @@ page = 1
vvtOffset = "Angle between cam sensor and VVT zero position\nset vvt_offset X"
slowAdcAlpha = "ExpAverage alpha coefficient"
debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X"
throttlePedalSecondaryWOTVoltage = "Pedal in the floor"
dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin"
crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling."
postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start"
@ -3107,6 +3110,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Up voltage", throttlePedalUpVoltage
field = "Down (WOT) voltage", throttlePedalWOTVoltage
field = "Accelerator position 2nd sensor", throttlePedalPositionSecondAdcChannel
field = "Up voltage" throttlePedalSecondaryUpVoltage
field = "Down (WOT) voltage", throttlePedalSecondaryWOTVoltage
dialog = pedalGauges
gauge = pedalPositionGauge

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 22 01:36:16 EDT 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:54:57 EDT 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1134,6 +1134,8 @@ public class Fields {
public static final int test557pin_offset = 3101;
public static final int throttlePedalPositionAdcChannel_offset = 580;
public static final int throttlePedalPositionSecondAdcChannel_offset = 683;
public static final int throttlePedalSecondaryUpVoltage_offset = 2100;
public static final int throttlePedalSecondaryWOTVoltage_offset = 2104;
public static final int throttlePedalUpPin_offset = 583;
public static final int throttlePedalUpPinMode_offset = 710;
public static final int throttlePedalUpVoltage_offset = 1884;
@ -1269,7 +1271,7 @@ public class Fields {
public static final int unused_1484_bit_29_offset = 1476;
public static final int unused_1484_bit_30_offset = 1476;
public static final int unused_1484_bit_31_offset = 1476;
public static final int unused_former_warmup_target_afr_offset = 2100;
public static final int unused_former_warmup_target_afr_offset = 2108;
public static final int unusedAtOldBoardConfigurationEnd_offset = 1200;
public static final int unusedBit4_1476_offset = 1476;
public static final int unusedBit_251_11_offset = 976;
@ -2093,6 +2095,8 @@ public class Fields {
public static final String[] debug_mode_e = {"Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"};
public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2092, FieldType.INT, debug_mode_e);
public static final Field AUXSERIALSPEED = Field.create("AUXSERIALSPEED", 2096, FieldType.INT);
public static final Field THROTTLEPEDALSECONDARYUPVOLTAGE = Field.create("THROTTLEPEDALSECONDARYUPVOLTAGE", 2100, FieldType.FLOAT);
public static final Field THROTTLEPEDALSECONDARYWOTVOLTAGE = Field.create("THROTTLEPEDALSECONDARYWOTVOLTAGE", 2104, FieldType.FLOAT);
public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2132, FieldType.FLOAT);
public static final Field FSIOADC1 = Field.create("FSIOADC1", 2200, FieldType.INT8, adc_channel_e);
public static final Field FSIOADC2 = Field.create("FSIOADC2", 2201, FieldType.INT8, adc_channel_e);
@ -3083,6 +3087,8 @@ public class Fields {
SLOWADCALPHA,
DEBUGMODE,
AUXSERIALSPEED,
THROTTLEPEDALSECONDARYUPVOLTAGE,
THROTTLEPEDALSECONDARYWOTVOLTAGE,
BOOSTCUTPRESSURE,
FSIOADC1,
FSIOADC2,