FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.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 f559976a19
commit f2dafeefe0
3 changed files with 8 additions and 2 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