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

auto-sync

This commit is contained in:
rusEfi 2015-01-09 12:04:27 -06:00
parent cdb5f18ed7
commit ca32665e13
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,6 +354,11 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
#endif
engineConfiguration->cylinderBore = 87.5;
boardConfiguration->clutchDownPin = GPIOC_12;
boardConfiguration->clutchDownPinMode = PI_PULLUP;
engineConfiguration->clutchUpPin = GPIOD_3;
engineConfiguration->clutchUpPinMode = PI_PULLUP;
/**
* set_fsio_setting 0 0.11
*/

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

@ -394,8 +394,8 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
boardConfiguration->injectionPins[1] = GPIOB_8; // #2
boardConfiguration->injectionPins[2] = GPIOE_3; // #3
boardConfiguration->injectionPins[3] = GPIOE_5; // #4
boardConfiguration->injectionPins[4] = GPIOE_6; // #5
boardConfiguration->injectionPins[5] = GPIOC_12; // #6
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;
@ -425,11 +425,13 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
boardConfiguration->fanPinMode = OM_DEFAULT;
boardConfiguration->clutchDownPin = GPIO_UNASSIGNED;
boardConfiguration->clutchDownPinMode = PI_PULLUP;
engineConfiguration->clutchUpPin = GPIO_UNASSIGNED;
engineConfiguration->clutchUpPinMode = PI_PULLUP;
boardConfiguration->triggerSimulatorPins[0] = GPIOD_1;
boardConfiguration->triggerSimulatorPins[1] = GPIOD_2;
boardConfiguration->triggerSimulatorPins[2] = GPIOD_3;
boardConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED;
boardConfiguration->triggerSimulatorPinModes[0] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;

9
firmware/controllers/settings.cpp
View File

@ -91,6 +91,8 @@ static void printOutputs(engine_configuration_s *engineConfiguration) {
hwPortname(boardConfiguration->fanPin));
}
EXTERN_ENGINE;
/**
* @brief Prints current engine configuration to human-readable console.
*/
@ -165,6 +167,9 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
printOutputs(engineConfiguration);
scheduleMsg(&logger, "clutchUp@%s: %s", hwPortname(engineConfiguration->clutchUpPin), boolToString(engine->clutchUpState));
scheduleMsg(&logger, "clutchDown@%s: %s", hwPortname(boardConfiguration->clutchDownPin), boolToString(engine->clutchDownState));
scheduleMsg(&logger, "boardTestModeJumperPin: %s/nesting=%d", hwPortname(boardConfiguration->boardTestModeJumperPin),
maxNesting);
@ -181,14 +186,10 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
#endif /* EFI_PROD_CODE */
}
extern engine_configuration_s *engineConfiguration;
extern engine_configuration2_s *engineConfiguration2;
static void doPrintConfiguration(Engine *engine) {
printConfiguration(engineConfiguration);
}
EXTERN_ENGINE;
static void setFixedModeTiming(int value) {
engineConfiguration->fixedModeTiming = value;

2
firmware/rusefi.cpp
View File

@ -268,5 +268,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array
return 20150108;
return 20150109;
}