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

CAN progress

This commit is contained in:
rusefi 2020-03-31 20:08:30 -04:00
parent 90e4fc3922
commit 4c8ebc4edb
9 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/config/engines/bmw_m73_mre.cpp
View File

@ -49,6 +49,8 @@
* *
* BMW_M73_MRE * BMW_M73_MRE
* set engine_type 104 * set engine_type 104
* BMW_M73_MRE_SLAVE
* set engine_type 105
* *
*/ */
@ -95,8 +97,11 @@ void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
#if EFI_CANBUS_SLAVE #if EFI_CANBUS_SLAVE
engineConfiguration->canReadEnabled = true; engineConfiguration->canReadEnabled = true;
engineConfiguration->canWriteEnabled = false;
#else /* EFI_CANBUS_SLAVE */ #else /* EFI_CANBUS_SLAVE */
engineConfiguration->canReadEnabled = false;
engineConfiguration->canWriteEnabled = true; engineConfiguration->canWriteEnabled = true;
CONFIG(enableVerboseCanTx) = true;
#endif /* EFI_CANBUS_SLAVE */ #endif /* EFI_CANBUS_SLAVE */

3
firmware/controllers/algo/rusefi_enums.h
View File

@ -776,10 +776,11 @@ typedef enum {
* Net Body Computer types * Net Body Computer types
*/ */
typedef enum { typedef enum {
CAN_BUS_NBC_BMW = 0, CAN_BUS_NBC_NONE = 0,
CAN_BUS_NBC_FIAT = 1, CAN_BUS_NBC_FIAT = 1,
CAN_BUS_NBC_VAG = 2, CAN_BUS_NBC_VAG = 2,
CAN_BUS_MAZDA_RX8 = 3, CAN_BUS_MAZDA_RX8 = 3,
CAN_BUS_NBC_BMW = 4,
Internal_ForceMyEnumIntSize_can_nbc = ENUM_32_BITS, Internal_ForceMyEnumIntSize_can_nbc = ENUM_32_BITS,
} can_nbc_e; } can_nbc_e;

2
firmware/integration/rusefi_config.txt
View File

@ -432,7 +432,7 @@ float fsio_visible fanOffTemperature;+Cooling fan turn-off temperature threshold
float vehicleSpeedCoef;+This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h;"coef", 1, 0, 0.01, 2000.0, 2 float vehicleSpeedCoef;+This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h;"coef", 1, 0, 0.01, 2000.0, 2
custom can_nbc_e 4 bits, U32, @OFFSET@, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" custom can_nbc_e 4 bits, U32, @OFFSET@, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
can_nbc_e canNbcType;set can_mode X can_nbc_e canNbcType;set can_mode X
int canSleepPeriodMs;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2 int canSleepPeriodMs;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2

4
firmware/tunerstudio/rusefi.ini
View File

@ -86,7 +86,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 16:40:27 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 19:56:03 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -191,7 +191,7 @@ page = 1
fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0
fanOffTemperature = scalar, F32, 472, "*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 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 480, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 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" 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" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID"

4
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -86,7 +86,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 16:40:36 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 19:56:13 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -191,7 +191,7 @@ page = 1
fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0
fanOffTemperature = scalar, F32, 472, "*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 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 480, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 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" 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" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID"

4
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -86,7 +86,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Tue Mar 31 16:40:49 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Tue Mar 31 19:56:29 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -191,7 +191,7 @@ page = 1
fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0
fanOffTemperature = scalar, F32, 472, "*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 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 480, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 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" 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" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID"

4
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -86,7 +86,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 16:40:32 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 19:56:08 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -191,7 +191,7 @@ page = 1
fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0
fanOffTemperature = scalar, F32, 472, "*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 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 480, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 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" 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" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID"

4
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -86,7 +86,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 16:40:40 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 19:56:19 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -191,7 +191,7 @@ page = 1
fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0
fanOffTemperature = scalar, F32, 472, "*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 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 480, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 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" 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" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID"

4
firmware/tunerstudio/rusefi_proteus.ini
View File

@ -86,7 +86,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 16:40:45 EDT 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 31 19:56:24 EDT 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -191,7 +191,7 @@ page = 1
fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0 fanOnTemperature = scalar, F32, 468, "*C", 1, 0, 0, 1000.0, 0
fanOffTemperature = scalar, F32, 472, "*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 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 480, [0:7], "BMW", "FIAT", "VAG" , "MAZDA RX8" canNbcType = bits, U32, 480, [0:7], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW"
canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000.0, 2 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" 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" displayMode = bits, U32, 492, [0:7], "none", "hd44780", "hd44780 over pcf8574", "INVALID"