From 9a6dc8d1012b7b2517aac087278f05082c00bc9a Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 14 Jun 2020 17:01:05 -0400 Subject: [PATCH] manual gen --- .../controllers/algo/auto_generated_enums.cpp | 4 +++- .../engine_configuration_generated_structures.h | 16 +++++++++++++--- .../config/controllers/algo/rusefi_generated.h | 5 ++++- .../controllers/algo/auto_generated_enums.cpp | 17 ++++++++++++++++- .../controllers/algo/auto_generated_enums.h | 3 ++- .../engine_configuration_generated_structures.h | 16 +++++++++++++--- .../controllers/generated/rusefi_generated.h | 5 ++++- firmware/tunerstudio/rusefi.ini | 9 ++++++--- firmware/tunerstudio/rusefi_frankenso.ini | 9 ++++++--- firmware/tunerstudio/rusefi_kinetis.ini | 9 ++++++--- firmware/tunerstudio/rusefi_microrusefi.ini | 9 ++++++--- firmware/tunerstudio/rusefi_prometheus.ini | 9 ++++++--- firmware/tunerstudio/rusefi_proteus.ini | 9 ++++++--- .../src/com/rusefi/config/generated/Fields.java | 9 +++++++-- 14 files changed, 98 insertions(+), 31 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 9ac38db392..b84fabb701 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu May 21 20:39:11 EDT 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 14 17:00:26 EDT 2020 // see also gen_config_and_enums.bat @@ -385,6 +385,8 @@ case TLE6240_PIN_9: } const char *getCan_nbc_e(can_nbc_e value){ switch(value) { +case CAN_BUS_BMW_E90: + return "CAN_BUS_BMW_E90"; case CAN_BUS_MAZDA_RX8: return "CAN_BUS_MAZDA_RX8"; case CAN_BUS_NBC_BMW: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 3058b4dd0b..a4bb40a8fe 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Jun 13 23:14:52 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Jun 14 17:00:22 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2551,9 +2551,19 @@ struct engine_configuration_s { */ float throttlePedalSecondaryWOTVoltage; /** + * set can_baudrate * offset 2108 */ - uint32_t unused_former_warmup_target_afr[6]; + can_baudrate_e canBaudRate; + /** + * need 4 byte alignment + * offset 2109 + */ + uint8_t alignmentFill_at_2109[3]; + /** + * offset 2112 + */ + uint32_t unused_former_warmup_target_afr[5]; /** * kPa value at which we need to cut fuel and spark, 0 if not enabled * offset 2132 @@ -3498,4 +3508,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Jun 13 23:14:52 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Jun 14 17:00:22 EDT 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index bbd0188e70..beaffd8ff9 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -38,6 +38,7 @@ #define afterstartHoldTime_offset 6152 #define alFIn_offset 4024 #define alignEngineSnifferAtTDC_offset 744 +#define alignmentFill_at_2109_offset 2109 #define alignmentFill_at_4514_offset 4514 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 @@ -177,7 +178,9 @@ #define camInputs2_offset 557 #define camInputs3_offset 558 #define camInputs4_offset 559 +#define can_baudrate_e_enum "100kbps", "250kbps" , "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 +#define canBaudRate_offset 2108 #define canNbcType_offset 480 #define canReadEnabled_offset 1464 #define canRxPin_offset 709 @@ -1328,7 +1331,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 2108 +#define unused_former_warmup_target_afr_offset 2112 #define unusedAt712_offset 712 #define unusedAtOldBoardConfigurationEnd_offset 1200 #define unusedBit4_1476_offset 1476 diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index fd5ccb04eb..0e2605dcfb 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu May 21 20:39:10 EDT 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 14 17:00:25 EDT 2020 // see also gen_config_and_enums.bat @@ -521,8 +521,23 @@ case TLE8888_PIN_9: } return NULL; } +const char *getCan_baudrate_e(can_baudrate_e value){ +switch(value) { +case B100KBPS: + return "B100KBPS"; +case B1MBPS: + return "B1MBPS"; +case B250KBPS: + return "B250KBPS"; +case B500KBPS: + return "B500KBPS"; + } + return NULL; +} const char *getCan_nbc_e(can_nbc_e value){ switch(value) { +case CAN_BUS_BMW_E90: + return "CAN_BUS_BMW_E90"; case CAN_BUS_MAZDA_RX8: return "CAN_BUS_MAZDA_RX8"; case CAN_BUS_NBC_BMW: diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h index 093b8ecfae..e3a9d6c0e5 100644 --- a/firmware/controllers/algo/auto_generated_enums.h +++ b/firmware/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Wed May 20 09:04:42 EDT 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 14 17:00:25 EDT 2020 // see also gen_config_and_enums.bat @@ -15,6 +15,7 @@ const char *getAntiLagActivationMode_e(antiLagActivationMode_e value); const char *getBoostType_e(boostType_e value); const char *getBrain_pin_diag_e(brain_pin_diag_e value); const char *getBrain_pin_e(brain_pin_e value); +const char *getCan_baudrate_e(can_baudrate_e value); const char *getCan_nbc_e(can_nbc_e value); const char *getCan_vss_nbc_e(can_vss_nbc_e value); const char *getChamber_style_e(chamber_style_e value); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 800fa4e734..3b07eca7fe 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Jun 13 23:14:18 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:00 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2551,9 +2551,19 @@ struct engine_configuration_s { */ float throttlePedalSecondaryWOTVoltage; /** + * set can_baudrate * offset 2108 */ - uint32_t unused_former_warmup_target_afr[6]; + can_baudrate_e canBaudRate; + /** + * need 4 byte alignment + * offset 2109 + */ + uint8_t alignmentFill_at_2109[3]; + /** + * offset 2112 + */ + uint32_t unused_former_warmup_target_afr[5]; /** * kPa value at which we need to cut fuel and spark, 0 if not enabled * offset 2132 @@ -3498,4 +3508,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 Sat Jun 13 23:14:18 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:00 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index b732f06595..fe8e59bd58 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -38,6 +38,7 @@ #define afterstartHoldTime_offset 6152 #define alFIn_offset 4024 #define alignEngineSnifferAtTDC_offset 744 +#define alignmentFill_at_2109_offset 2109 #define alignmentFill_at_4514_offset 4514 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 @@ -177,7 +178,9 @@ #define camInputs2_offset 557 #define camInputs3_offset 558 #define camInputs4_offset 559 +#define can_baudrate_e_enum "100kbps", "250kbps" , "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 +#define canBaudRate_offset 2108 #define canNbcType_offset 480 #define canReadEnabled_offset 1464 #define canRxPin_offset 709 @@ -1328,7 +1331,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 2108 +#define unused_former_warmup_target_afr_offset 2112 #define unusedAt712_offset 712 #define unusedAtOldBoardConfigurationEnd_offset 1200 #define unusedBit4_1476_offset 1476 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 696ae401bf..56d4524ee9 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -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 Sun Jun 14 16:07:04 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:00 EDT 2020 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOffTemperature = scalar, F32, 472, "*C", 1, 0, 0, 1000.0, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2 - canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202" + canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 ambiguousOperationMode = bits, U32, 488, [0:7], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -829,7 +829,9 @@ page = 1 auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 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 + canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" +;no TS info - skipping alignmentFill_at_2109 offset 2109 +;no TS info - skipping unused_former_warmup_target_afr offset 2112 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 @@ -3856,6 +3858,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled field = "Can Nbc Type", canNbcType + field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index c4d0b4f9ea..678daee732 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -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 Sun Jun 14 16:07:07 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:09 EDT 2020 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOffTemperature = scalar, F32, 472, "*C", 1, 0, 0, 1000.0, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2 - canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202" + canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 ambiguousOperationMode = bits, U32, 488, [0:7], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -829,7 +829,9 @@ page = 1 auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 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 + canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" +;no TS info - skipping alignmentFill_at_2109 offset 2109 +;no TS info - skipping unused_former_warmup_target_afr offset 2112 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 @@ -3856,6 +3858,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled field = "Can Nbc Type", canNbcType + field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 21a849062b..d3210b515f 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -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 kineris_gen_config.bat integration/rusefi_config.txt Sun Jun 14 16:07:10 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Jun 14 17:00:22 EDT 2020 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOffTemperature = scalar, F32, 472, "*C", 1, 0, 0, 1000.0, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2 - canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202" + canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 ambiguousOperationMode = bits, U32, 488, [0:7], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -829,7 +829,9 @@ page = 1 auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 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 + canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" +;no TS info - skipping alignmentFill_at_2109 offset 2109 +;no TS info - skipping unused_former_warmup_target_afr offset 2112 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 @@ -3857,6 +3859,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled field = "Can Nbc Type", canNbcType + field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 0ff78af2b9..2eaa17ccf1 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -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 Sun Jun 14 16:07:06 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:05 EDT 2020 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOffTemperature = scalar, F32, 472, "*C", 1, 0, 0, 1000.0, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2 - canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202" + canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 ambiguousOperationMode = bits, U32, 488, [0:7], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -829,7 +829,9 @@ page = 1 auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 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 + canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" +;no TS info - skipping alignmentFill_at_2109 offset 2109 +;no TS info - skipping unused_former_warmup_target_afr offset 2112 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 @@ -3834,6 +3836,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled field = "Can Nbc Type", canNbcType + field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 120bf6d1f5..ae53628c80 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -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 Sun Jun 14 16:07:08 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:14 EDT 2020 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOffTemperature = scalar, F32, 472, "*C", 1, 0, 0, 1000.0, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2 - canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202" + canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 ambiguousOperationMode = bits, U32, 488, [0:7], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -829,7 +829,9 @@ page = 1 auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 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 + canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" +;no TS info - skipping alignmentFill_at_2109 offset 2109 +;no TS info - skipping unused_former_warmup_target_afr offset 2112 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 @@ -3852,6 +3854,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled field = "Can Nbc Type", canNbcType + field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index ef95f78ac6..2e8608ca7a 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -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 Sun Jun 14 16:07:09 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:18 EDT 2020 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOffTemperature = scalar, F32, 472, "*C", 1, 0, 0, 1000.0, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2 - canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202" + canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 ambiguousOperationMode = bits, U32, 488, [0:7], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -829,7 +829,9 @@ page = 1 auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 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 + canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" +;no TS info - skipping alignmentFill_at_2109 offset 2109 +;no TS info - skipping unused_former_warmup_target_afr offset 2112 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 @@ -3830,6 +3832,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled field = "Can Nbc Type", canNbcType + field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index b399bea6dd..7601955f84 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -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 Sun Jun 14 15:09:07 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:00 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -41,6 +41,7 @@ public class Fields { public static final int afterstartHoldTime_offset = 6152; public static final int alFIn_offset = 4024; public static final int alignEngineSnifferAtTDC_offset = 744; + public static final int alignmentFill_at_2109_offset = 2109; 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; @@ -177,6 +178,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 canBaudRate_offset = 2108; public static final int canNbcType_offset = 480; public static final int canReadEnabled_offset = 1464; public static final int canRxPin_offset = 709; @@ -1291,7 +1293,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 = 2108; + public static final int unused_former_warmup_target_afr_offset = 2112; public static final int unusedAt712_offset = 712; public static final int unusedAtOldBoardConfigurationEnd_offset = 1200; public static final int unusedBit4_1476_offset = 1476; @@ -2113,6 +2115,8 @@ public class Fields { 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 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 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); @@ -3090,6 +3094,7 @@ public class Fields { AUXSERIALSPEED, THROTTLEPEDALSECONDARYUPVOLTAGE, THROTTLEPEDALSECONDARYWOTVOLTAGE, + CANBAUDRATE, BOOSTCUTPRESSURE, FSIOADC1, FSIOADC2,