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

auto-sync

This commit is contained in:
rusEfi 2015-01-18 10:05:23 -06:00
parent 407c2d57b0
commit dfd3d77708
4 changed files with 94 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
firmware/config/engines/custom_engine.cpp Normal file
View File

@ -0,0 +1,78 @@
/**
* @file custom_engine.cpp
*
* @date Jan 18, 2015
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#ifndef CONFIG_ENGINES_CUSTOM_ENGINE_CPP_
#define CONFIG_ENGINES_CUSTOM_ENGINE_CPP_
#include "custom_engine.h"
void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
/**
* Frankenso analog #1 PC2 ADC12
* Frankenso analog #2 PC1 ADC11
* Frankenso analog #3
* Frankenso analog #4 PC3 ADC13
* Frankenso analog #5
* Frankenso analog #6
* Frankenso analog #7 PA4 ADC4
* Frankenso analog #8
* Frankenso analog #9
* Frankenso analog #10 PA6 ADC6
* Frankenso analog #11 PC5 ADC15
* Frankenso analog #12 VBatt
*/
/**
* http://rusefi.com/wiki/index.php?title=Manual:Hardware_Frankenso_board
*/
// Frankenso low out #1: PE6
// Frankenso low out #2: PE5
// Frankenso low out #3: PD7
// Frankenso low out #4: PC13 Idle valve solenoid
// Frankenso low out #5: PE3
// Frankenso low out #6: PE4
// Frankenso low out #7: PE1 (do not use with discovery!)
// Frankenso low out #8: PE2 injector #2
// Frankenso low out #9: PB9 injector #1
// Frankenso low out #10: PE0 (do not use with discovery!)
// Frankenso low out #11: PB8 injector #3
// Frankenso low out #12: PB7 injector #4
boardConfiguration->idleValvePin = GPIOC_13;
boardConfiguration->injectionPins[0] = GPIOB_9; // #1
boardConfiguration->injectionPins[1] = GPIOE_2; // #2
boardConfiguration->injectionPins[2] = GPIOB_8; // #3
boardConfiguration->injectionPins[3] = GPIOB_7; // #4
#if EFI_PWM_TESTER
boardConfiguration->injectionPins[4] = GPIOC_8; // #5
boardConfiguration->injectionPins[5] = GPIOD_10; // #6
boardConfiguration->injectionPins[6] = GPIOD_9;
boardConfiguration->injectionPins[7] = GPIOD_11;
boardConfiguration->injectionPins[8] = GPIOD_0;
boardConfiguration->injectionPins[9] = GPIOB_11;
/**
* We want to initialize all outputs for test
*/
engineConfiguration->cylindersCount = 10;
#else
boardConfiguration->injectionPins[4] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[5] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[6] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[7] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[8] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[9] = GPIO_UNASSIGNED;
#endif
boardConfiguration->injectionPins[10] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED;
}
#endif /* CONFIG_ENGINES_CUSTOM_ENGINE_CPP_ */

14
firmware/config/engines/custom_engine.h Normal file
View File

@ -0,0 +1,14 @@
/**
* @file custom_engine.h
*
* @date Jan 18, 2015
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#ifndef CONFIG_ENGINES_CUSTOM_ENGINE_H_
#define CONFIG_ENGINES_CUSTOM_ENGINE_H_
#include "engine_configuration.h"
void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration);
#endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */

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

@ -2,6 +2,7 @@
ENGINES_SRC = ENGINES_SRC =
ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/custom_engine.cpp \
$(PROJECT_DIR)/config/engines/MiniCooperR50.cpp \ $(PROJECT_DIR)/config/engines/MiniCooperR50.cpp \
$(PROJECT_DIR)/config/engines/acura_rsx.cpp \ $(PROJECT_DIR)/config/engines/acura_rsx.cpp \
$(PROJECT_DIR)/config/engines/audi_aan.cpp \ $(PROJECT_DIR)/config/engines/audi_aan.cpp \

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

@ -29,6 +29,7 @@
#include "engine_math.h" #include "engine_math.h"
#include "speed_density.h" #include "speed_density.h"
#include "custom_engine.h"
#include "acura_rsx.h" #include "acura_rsx.h"
#include "audi_aan.h" #include "audi_aan.h"
#include "bmw_e34.h" #include "bmw_e34.h"
@ -524,58 +525,6 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
boardConfiguration->tunerStudioSerialSpeed = TS_DEFAULT_SPEED; boardConfiguration->tunerStudioSerialSpeed = TS_DEFAULT_SPEED;
} }
static void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
/**
* Frankenso analog #1 PC2 ADC12
* Frankenso analog #2 PC1 ADC11
* Frankenso analog #3
* Frankenso analog #4 PC3 ADC13
* Frankenso analog #5
* Frankenso analog #6
* Frankenso analog #7 PA4 ADC4
* Frankenso analog #8
* Frankenso analog #9
* Frankenso analog #10 PA6 ADC6
* Frankenso analog #11 PC5 ADC15
* Frankenso analog #12 VBatt
*/
/**
* http://rusefi.com/wiki/index.php?title=Manual:Hardware_Frankenso_board
*/
// Frankenso low out #1: PE6
// Frankenso low out #2: PE5
// Frankenso low out #3: PD7
// Frankenso low out #4: PC13 Idle valve solenoid
// Frankenso low out #5: PE3
// Frankenso low out #6: PE4
// Frankenso low out #7: PE1 (do not use with discovery!)
// Frankenso low out #8: PE2 injector #2
// Frankenso low out #9: PB9 injector #1
// Frankenso low out #10: PE0 (do not use with discovery!)
// Frankenso low out #11: PB8 injector #3
// Frankenso low out #12: PB7 injector #4
boardConfiguration->idleValvePin = GPIOC_13;
boardConfiguration->injectionPins[0] = GPIOB_9; // #1
boardConfiguration->injectionPins[1] = GPIOE_2; // #2
boardConfiguration->injectionPins[2] = GPIOB_8; // #3
boardConfiguration->injectionPins[3] = GPIOB_7; // #4
boardConfiguration->injectionPins[4] = GPIO_UNASSIGNED; // #5
boardConfiguration->injectionPins[5] = GPIO_UNASSIGNED; // #6
boardConfiguration->injectionPins[6] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[7] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[8] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[9] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[10] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED;
}
void resetConfigurationExt(Logging * logger, engine_type_e engineType, Engine *engine) { void resetConfigurationExt(Logging * logger, engine_type_e engineType, Engine *engine) {
engine_configuration_s *engineConfiguration = engine->engineConfiguration; engine_configuration_s *engineConfiguration = engine->engineConfiguration;
board_configuration_s *boardConfiguration = &engineConfiguration->bc; board_configuration_s *boardConfiguration = &engineConfiguration->bc;