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

Merge branch 'master' of https://github.com/rusefi/rusefi into second_can

This commit is contained in:
kon 2020-08-02 11:33:08 -07:00
parent 7e9a5a0c55 f6e8ebcb5e
commit 73a239fd86
29 changed files with 137 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:27:13 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -2582,14 +2582,22 @@ struct engine_configuration_s {
*/
can_baudrate_e canBaudRate;
/**
* need 4 byte alignment
* offset 2109
*/
uint8_t alignmentFill_at_2109[3];
uint8_t un1used_former_warmup_target_afr;
/**
* offset 2112
* offset 2110
*/
uint32_t unused_former_warmup_target_afr[5];
can_baudrate_e can2BaudRate;
/**
* offset 2111
*/
uint8_t unused_former_warmup_target_afr[18];
/**
* need 4 byte alignment
* offset 2129
*/
uint8_t alignmentFill_at_2129[3];
/**
* kPa value at which we need to cut fuel and spark, 0 if not enabled
* offset 2132
@ -3533,4 +3541,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:27:13 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020

10
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -41,7 +41,7 @@
#define afterstartHoldTime_offset 6152
#define air_pressure_sensor_config_s_size 16
#define alignEngineSnifferAtTDC_offset 744
#define alignmentFill_at_2109_offset 2109
#define alignmentFill_at_2129_offset 2129
#define alignmentFill_at_4514_offset 4514
#define alternator_antiwindupFreq_offset 1764
#define alternator_derivativeFilterLoss_offset 1760
@ -176,6 +176,7 @@
#define camInputs2_offset 557
#define camInputs3_offset 558
#define camInputs4_offset 559
#define can2BaudRate_offset 2110
#define can_baudrate_e_enum "100kbps", "250kbps" , "500kbps", "1Mbps"
#define CAN_DEFAULT_BASE 0x200
#define canBaudRate_offset 2108
@ -1078,7 +1079,7 @@
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 3360130199
#define SIGNATURE_HASH 3824537910
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1348,12 +1349,13 @@
#define ts_show_spi true
#define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3360130199"
#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define tunerStudioSerialSpeed_offset 728
#define twoWireBatchIgnition_offset 1476
#define twoWireBatchInjection_offset 1476
#define uartConsoleSerialSpeed_offset 2076
#define un1used_former_warmup_target_afr_offset 2109
#define unused1059_offset 3964
#define unused1476b20_offset 1476
#define unused2432_offset 2432
@ -1374,7 +1376,7 @@
#define unused_1484_bit_30_offset 1476
#define unused_1484_bit_31_offset 1476
#define unused_alFIn_offset 4024
#define unused_former_warmup_target_afr_offset 2112
#define unused_former_warmup_target_afr_offset 2111
#define unusedAt712_offset 712
#define unusedAt716_offset 716
#define unusedAt720_offset 720

20
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 gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -2582,14 +2582,22 @@ struct engine_configuration_s {
*/
can_baudrate_e canBaudRate;
/**
* need 4 byte alignment
* offset 2109
*/
uint8_t alignmentFill_at_2109[3];
uint8_t un1used_former_warmup_target_afr;
/**
* offset 2112
* offset 2110
*/
uint32_t unused_former_warmup_target_afr[5];
can_baudrate_e can2BaudRate;
/**
* offset 2111
*/
uint8_t unused_former_warmup_target_afr[18];
/**
* need 4 byte alignment
* offset 2129
*/
uint8_t alignmentFill_at_2129[3];
/**
* kPa value at which we need to cut fuel and spark, 0 if not enabled
* offset 2132
@ -3533,4 +3541,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

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

@ -41,7 +41,7 @@
#define afterstartHoldTime_offset 6152
#define air_pressure_sensor_config_s_size 16
#define alignEngineSnifferAtTDC_offset 744
#define alignmentFill_at_2109_offset 2109
#define alignmentFill_at_2129_offset 2129
#define alignmentFill_at_4514_offset 4514
#define alternator_antiwindupFreq_offset 1764
#define alternator_derivativeFilterLoss_offset 1760
@ -176,6 +176,7 @@
#define camInputs2_offset 557
#define camInputs3_offset 558
#define camInputs4_offset 559
#define can2BaudRate_offset 2110
#define can_baudrate_e_enum "100kbps", "250kbps" , "500kbps", "1Mbps"
#define CAN_DEFAULT_BASE 0x200
#define canBaudRate_offset 2108
@ -1078,7 +1079,7 @@
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 91838477
#define SIGNATURE_HASH 785059244
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1348,12 +1349,13 @@
#define ts_show_spi true
#define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.08.02.all.91838477"
#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define tunerStudioSerialSpeed_offset 728
#define twoWireBatchIgnition_offset 1476
#define twoWireBatchInjection_offset 1476
#define uartConsoleSerialSpeed_offset 2076
#define un1used_former_warmup_target_afr_offset 2109
#define unused1059_offset 3964
#define unused1476b20_offset 1476
#define unused2432_offset 2432
@ -1374,7 +1376,7 @@
#define unused_1484_bit_30_offset 1476
#define unused_1484_bit_31_offset 1476
#define unused_alFIn_offset 4024
#define unused_former_warmup_target_afr_offset 2112
#define unused_former_warmup_target_afr_offset 2111
#define unusedAt712_offset 712
#define unusedAt716_offset 716
#define unusedAt720_offset 720

4
firmware/controllers/generated/signature_all.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 91838477
#define TS_SIGNATURE "rusEFI 2020.08.02.all.91838477"
#define SIGNATURE_HASH 785059244
#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244"

4
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 3690869998
#define TS_SIGNATURE "rusEFI 2020.08.02.frankenso_na6.3690869998"
#define SIGNATURE_HASH 4031537487
#define TS_SIGNATURE "rusEFI 2020.08.02.frankenso_na6.4031537487"

4
firmware/controllers/generated/signature_kin.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 3360130199
#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3360130199"
#define SIGNATURE_HASH 3824537910
#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910"

4
firmware/controllers/generated/signature_mre_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 1283952259
#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f4.1283952259"
#define SIGNATURE_HASH 1731582754
#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f4.1731582754"

4
firmware/controllers/generated/signature_mre_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 1283952259
#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f7.1283952259"
#define SIGNATURE_HASH 1731582754
#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f7.1731582754"

4
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 4033183881
#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_405.4033183881"
#define SIGNATURE_HASH 3688355112
#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_405.3688355112"

4
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 4033183881
#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_469.4033183881"
#define SIGNATURE_HASH 3688355112
#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_469.3688355112"

4
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 2296916418
#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f4.2296916418"
#define SIGNATURE_HASH 2740616291
#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f4.2740616291"

4
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -4,5 +4,5 @@
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 2296916418
#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f7.2296916418"
#define SIGNATURE_HASH 2740616291
#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f7.2740616291"

BIN
firmware/tunerstudio/generated/cache.zip
View File

Binary file not shown.

12
firmware/tunerstudio/generated/rusefi.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.all.91838477"
signature = "rusEFI 2020.08.02.all.785059244"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.all.91838477" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.all.785059244" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.frankenso_na6.3690869998"
signature = "rusEFI 2020.08.02.frankenso_na6.4031537487"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.frankenso_na6.3690869998" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.frankenso_na6.4031537487" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:05 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:42 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_kinetis.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.kin.3360130199"
signature = "rusEFI 2020.08.02.kin.3824537910"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.kin.3360130199" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.kin.3824537910" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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 kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:27:13 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_mre_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.mre_f4.1283952259"
signature = "rusEFI 2020.08.02.mre_f4.1731582754"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.mre_f4.1283952259" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.mre_f4.1731582754" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:04 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:41 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_mre_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.mre_f7.1283952259"
signature = "rusEFI 2020.08.02.mre_f7.1731582754"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.mre_f7.1283952259" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.mre_f7.1731582754" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:02 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:40 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_prometheus_405.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.prometheus_405.4033183881"
signature = "rusEFI 2020.08.02.prometheus_405.3688355112"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.prometheus_405.4033183881" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.prometheus_405.3688355112" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:08 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:45 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_prometheus_469.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.prometheus_469.4033183881"
signature = "rusEFI 2020.08.02.prometheus_469.3688355112"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.prometheus_469.4033183881" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.prometheus_469.3688355112" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:07 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:44 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_proteus_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.proteus_f4.2296916418"
signature = "rusEFI 2020.08.02.proteus_f4.2740616291"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.proteus_f4.2296916418" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.proteus_f4.2740616291" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:11 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:48 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

12
firmware/tunerstudio/generated/rusefi_proteus_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.08.02.proteus_f7.2296916418"
signature = "rusEFI 2020.08.02.proteus_f7.2740616291"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.08.02.proteus_f7.2296916418" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.08.02.proteus_f7.2740616291" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -76,7 +76,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.sh integration/rusefi_config.txt Sun Aug 02 17:27:10 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:46 UTC 2020
pageSize = 20000
page = 1
@ -821,8 +821,10 @@ page = 1
throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2
throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2
canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
alignmentFill_at_2109 = array, U08, 2109, [3], "units", 1, 0, -20, 100, 0
unused_former_warmup_target_afr = array, U32, 2112, [5], "units", 1, 0, -20, 100, 0
un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0
can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0
alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0
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

16
java_console/models/src/main/java/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 gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:27:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -44,7 +44,7 @@ public class Fields {
public static final int afterstartHoldTime_offset = 6152;
public static final int air_pressure_sensor_config_s_size = 16;
public static final int alignEngineSnifferAtTDC_offset = 744;
public static final int alignmentFill_at_2109_offset = 2109;
public static final int alignmentFill_at_2129_offset = 2129;
public static final int alignmentFill_at_4514_offset = 4514;
public static final int alternator_antiwindupFreq_offset = 1764;
public static final int alternator_derivativeFilterLoss_offset = 1760;
@ -176,6 +176,7 @@ public class Fields {
public static final int camInputs2_offset = 557;
public static final int camInputs3_offset = 558;
public static final int camInputs4_offset = 559;
public static final int can2BaudRate_offset = 2110;
public static final int canBaudRate_offset = 2108;
public static final int canNbcType_offset = 480;
public static final int canReadEnabled_offset = 1464;
@ -1059,7 +1060,7 @@ public class Fields {
public static final int servoOutputPins8_offset = 3147;
public static final int showHumanReadableWarning_offset = 976;
public static final int showSdCardWarning_offset = 76;
public static final int SIGNATURE_HASH = 91838477;
public static final int SIGNATURE_HASH = 785059244;
public static final int silentTriggerError_offset = 1464;
public static final int slowAdcAlpha_offset = 2088;
public static final int sparkDwellRpmBins_offset = 332;
@ -1308,12 +1309,13 @@ public class Fields {
public static final char TS_SD_R_COMMAND = 'r';
public static final char TS_SD_W_COMMAND = 'w';
public static final char TS_SET_LOGGER_SWITCH = 'l';
public static final String TS_SIGNATURE = "rusEFI 2020.08.02.all.91838477";
public static final String TS_SIGNATURE = "rusEFI 2020.08.02.all.785059244";
public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int tunerStudioSerialSpeed_offset = 728;
public static final int twoWireBatchIgnition_offset = 1476;
public static final int twoWireBatchInjection_offset = 1476;
public static final int uartConsoleSerialSpeed_offset = 2076;
public static final int un1used_former_warmup_target_afr_offset = 2109;
public static final int unused1059_offset = 3964;
public static final int unused1476b20_offset = 1476;
public static final int unused2432_offset = 2432;
@ -1334,7 +1336,7 @@ public class Fields {
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_alFIn_offset = 4024;
public static final int unused_former_warmup_target_afr_offset = 2112;
public static final int unused_former_warmup_target_afr_offset = 2111;
public static final int unusedAt712_offset = 712;
public static final int unusedAt716_offset = 716;
public static final int unusedAt720_offset = 720;
@ -2167,6 +2169,8 @@ public class Fields {
public static final Field THROTTLEPEDALSECONDARYWOTVOLTAGE = Field.create("THROTTLEPEDALSECONDARYWOTVOLTAGE", 2104, FieldType.FLOAT);
public static final String[] can_baudrate_e = {"100kbps", "250kbps" , "500kbps", "1Mbps"};
public static final Field CANBAUDRATE = Field.create("CANBAUDRATE", 2108, FieldType.INT8, can_baudrate_e);
public static final Field UN1USED_FORMER_WARMUP_TARGET_AFR = Field.create("UN1USED_FORMER_WARMUP_TARGET_AFR", 2109, FieldType.INT8);
public static final Field CAN2BAUDRATE = Field.create("CAN2BAUDRATE", 2110, FieldType.INT8, can_baudrate_e);
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);
@ -3149,6 +3153,8 @@ public class Fields {
THROTTLEPEDALSECONDARYUPVOLTAGE,
THROTTLEPEDALSECONDARYWOTVOLTAGE,
CANBAUDRATE,
UN1USED_FORMER_WARMUP_TARGET_AFR,
CAN2BAUDRATE,
BOOSTCUTPRESSURE,
FSIOADC1,
FSIOADC2,

2
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Aug 02 17:27:01 UTC 2020 -->
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Aug 02 17:45:39 UTC 2020 -->
<rom>
<romid>