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

v12

This commit is contained in:
rusEfi 2020-03-11 20:48:09 -04:00
parent 7e7e6ed740
commit 620088cdc1
9 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -609,6 +609,8 @@ case BMW_M73_M:
return "BMW_M73_M"; return "BMW_M73_M";
case BMW_M73_PROTEUS: case BMW_M73_PROTEUS:
return "BMW_M73_P"; return "BMW_M73_P";
case BMW_M73_MRE:
return "BMW_M73_MRE";
case MIATA_1996: case MIATA_1996:
return "MIATA_1996"; return "MIATA_1996";
case MIATA_NA6_MAP: case MIATA_NA6_MAP:

15
firmware/config/engines/bmw_m73.cpp
View File

@ -65,12 +65,12 @@
* @author Andrey Belomutskiy, (c) 2012-2020 * @author Andrey Belomutskiy, (c) 2012-2020
*/ */
#include "engine_template.h" #include "bmw_m73.h"
#include "custom_engine.h" #include "custom_engine.h"
EXTERN_CONFIG; EXTERN_CONFIG;
static void m73engine(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void m73engine(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// 13641435991 injector // 13641435991 injector
engineConfiguration->injector.flow = 180; // cc/min, who knows if this number is real - no good source of info engineConfiguration->injector.flow = 180; // cc/min, who knows if this number is real - no good source of info
@ -186,15 +186,18 @@ GPIOA_6
// PWM pin // PWM pin
engineConfiguration->etbIo[0].controlPin1 = GPIO_UNASSIGNED; engineConfiguration->etbIo[0].controlPin1 = GPIO_UNASSIGNED;
// DIR pin // DIR pin
engineConfiguration->etbIo[0].directionPin1 = GPIOC_9; engineConfiguration->etbIo[0].directionPin1 = GPIOC_8;
engineConfiguration->etbIo[0].directionPin2 = GPIOC_8; engineConfiguration->etbIo[0].directionPin2 = GPIOC_9;
CONFIG(etb_use_two_wires) = true; CONFIG(etb_use_two_wires) = true;
// PWM pin // PWM pin
engineConfiguration->etbIo[1].controlPin1 = GPIO_UNASSIGNED; engineConfiguration->etbIo[1].controlPin1 = GPIO_UNASSIGNED;
// DIR pin // DIR pin
engineConfiguration->etbIo[1].directionPin1 = GPIOB_8; engineConfiguration->etbIo[1].directionPin1 = GPIOB_9;
engineConfiguration->etbIo[1].directionPin2 = GPIOB_9; engineConfiguration->etbIo[1].directionPin2 = GPIOB_8;
CONFIG(tps2Min) = CONFIG(tpsMin);
CONFIG(tps2Max) = CONFIG(tpsMax);
engineConfiguration->injectionPins[0] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[0] = GPIO_UNASSIGNED;

6
firmware/config/engines/bmw_m73.h
View File

@ -1,5 +1,5 @@
/* /*
* @file engine_template.h * @file bmw_m73.h
* *
* @date Nov 1, 2019 * @date Nov 1, 2019
* @author Andrey Belomutskiy, (c) 2012-2020 * @author Andrey Belomutskiy, (c) 2012-2020
@ -9,6 +9,10 @@
#include "engine_configuration.h" #include "engine_configuration.h"
void m73engine(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setEngineBMW_M73_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setEngineBMW_M73_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setEngineBMW_M73_Manhattan(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setEngineBMW_M73_Manhattan(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setEngineBMW_M73_Proteus(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setEngineBMW_M73_Proteus(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE);

14
firmware/config/engines/bmw_m73_mre.cpp Normal file
View File

@ -0,0 +1,14 @@
/*
* @file bmw_m73_mre.cpp
*
*
* BMW_M73_MRE
* set engine_type 104
*
*/
#include "bmw_m73.h"
void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
}

1
firmware/config/engines/engines.mk
View File

@ -5,6 +5,7 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/custom_engine.cpp \ $(PROJECT_DIR)/config/engines/custom_engine.cpp \
$(PROJECT_DIR)/config/engines/bmw_e34.cpp \ $(PROJECT_DIR)/config/engines/bmw_e34.cpp \
$(PROJECT_DIR)/config/engines/bmw_m73.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73.cpp \
$(PROJECT_DIR)/config/engines/bmw_m73_mre.cpp \
$(PROJECT_DIR)/config/engines/mazda_miata.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata.cpp \
$(PROJECT_DIR)/config/engines/mazda_miata_base_maps.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata_base_maps.cpp \
$(PROJECT_DIR)/config/engines/mazda_miata_1_6.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata_1_6.cpp \

2
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -717,6 +717,8 @@ case BMW_M73_F:
return "BMW_M73_F"; return "BMW_M73_F";
case BMW_M73_M: case BMW_M73_M:
return "BMW_M73_M"; return "BMW_M73_M";
case BMW_M73_MRE:
return "BMW_M73_MRE";
case BMW_M73_PROTEUS: case BMW_M73_PROTEUS:
return "BMW_M73_P"; return "BMW_M73_P";
case MRE_BOARD_TEST: case MRE_BOARD_TEST:

1
firmware/controllers/algo/engine_configuration.cpp
View File

@ -1145,6 +1145,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case BMW_M73_M: case BMW_M73_M:
setEngineBMW_M73_Manhattan(PASS_CONFIG_PARAMETER_SIGNATURE); setEngineBMW_M73_Manhattan(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case BMW_M73_MRE:
case BMW_M73_PROTEUS: case BMW_M73_PROTEUS:
setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE); setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;

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

@ -195,6 +195,8 @@ typedef enum {
TEST_33816 = 103, TEST_33816 = 103,
BMW_M73_MRE = 104,
Force_4_bytes_size_engine_type = ENUM_32_BITS, Force_4_bytes_size_engine_type = ENUM_32_BITS,
} engine_type_e; } engine_type_e;

2
firmware/controllers/engine_controller.cpp
View File

@ -849,6 +849,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 201200310; return 201200311;
} }
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */