diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 8bf759af1f..6dde2e1441 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -38,7 +38,7 @@ void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) { */ // Frankenso low out #1: PE6 // Frankenso low out #2: PE5 - // Frankenso low out #3: PD7 + // Frankenso low out #3: PD7 Main Relay // Frankenso low out #4: PC13 Idle valve solenoid // Frankenso low out #5: PE3 // Frankenso low out #6: PE4 @@ -49,6 +49,7 @@ void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) { // Frankenso low out #11: PB8 injector #3 // Frankenso low out #12: PB7 injector #4 + boardConfiguration->mainRelayPin = GPIOD_7; boardConfiguration->idleValvePin = GPIOC_13; boardConfiguration->fanPin = GPIOE_5; diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index 2aed8583bd..d9591575da 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -21,4 +21,53 @@ void setMazda626EngineConfiguration(engine_configuration_s *engineConfiguration) setSingleCoilDwell(engineConfiguration); engineConfiguration->ignitionMode = IM_ONE_COIL; + + /** + * I-O mapping is a copy of Custom engine type + */ + + /** + * 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 Main Relay + // 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->mainRelayPin = GPIOD_7; + boardConfiguration->idleValvePin = GPIOC_13; + + boardConfiguration->fanPin = GPIOE_5; + + 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->ignitionPins[0] = GPIOC_7; + } diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 44d3cc6071..bceb4d2f36 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -89,6 +89,9 @@ static void printOutputs(engine_configuration_s *engineConfiguration) { scheduleMsg(&logger, "fanPin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->fanPinMode), hwPortname(boardConfiguration->fanPin)); + + scheduleMsg(&logger, "mainRelay: mode %s @ %s", getPin_output_mode_e(boardConfiguration->mainRelayPinMode), + hwPortname(boardConfiguration->mainRelayPin)); } EXTERN_ENGINE; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index ec944df85c..55a2d834d3 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -259,5 +259,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 20150207; + return 20150208; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 66a0b491c6..e4b62df415 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -1022,6 +1022,9 @@ fileVersion = { 20150202 } field = "Ignition Pin 6", ignitionPins4, {ignitionMode != 0 && cylindersCount > 5} dialog = otherOutputs, "Board outputs" + field = "Main Relay Mode", mainRelayPinMode + field = "Main Relay Pin", mainRelayPin + field = "" field = "Fuel Pump Pin Mode", fuelPumpPinMode field = "Fuel Pump Pin", fuelPumpPin field = ""