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

auto-sync

This commit is contained in:
rusEfi 2015-01-09 13:06:43 -06:00
parent ca32665e13
commit aa02ac4996
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,20 +540,19 @@ static void setCustomEngineConfiguration(engine_configuration_s *engineConfigura
// Frankenso low out #1: PE6 // Frankenso low out #1: PE6
// Frankenso low out #2: PE5 // Frankenso low out #2: PE5
// Frankenso low out #3: PD7 // Frankenso low out #3: PD7
// Frankenso low out #4: PC13 // Frankenso low out #4: PC13 Idle valve solenoid
// Frankenso low out #5: PE3 // Frankenso low out #5: PE3
// Frankenso low out #6: PE4 // Frankenso low out #6: PE4
// Frankenso low out #7: PE1 (do not use with discovery!) // Frankenso low out #7: PE1 (do not use with discovery!)
// Frankenso low out #8: PE2 injector #2 // Frankenso low out #8: PE2 injector #2
// Frankenso low out #9: PB9 Idle valve solenoid // Frankenso low out #9: PB9 injector #1
// Frankenso low out #10: PE0 (do not use with discovery!) // Frankenso low out #10: PE0 (do not use with discovery!)
// Frankenso low out #11: PB8 injector #3 // Frankenso low out #11: PB8 injector #3
// Frankenso low out #12: PB7 injector #4 // Frankenso low out #12: PB7 injector #4
boardConfiguration->idleValvePin = GPIOB_9; boardConfiguration->idleValvePin = GPIOC_13;
boardConfiguration->injectionPins[0] = GPIOB_9; // #1
boardConfiguration->injectionPins[0] = GPIO_UNASSIGNED; // #1
boardConfiguration->injectionPins[1] = GPIOE_2; // #2 boardConfiguration->injectionPins[1] = GPIOE_2; // #2
boardConfiguration->injectionPins[2] = GPIOB_8; // #3 boardConfiguration->injectionPins[2] = GPIOB_8; // #3
boardConfiguration->injectionPins[3] = GPIOB_7; // #4 boardConfiguration->injectionPins[3] = GPIOB_7; // #4

10
firmware/controllers/injector_central.cpp
View File

@ -20,7 +20,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
// todo: this file? // todo: rename this file
#include "main.h" #include "main.h"
@ -151,7 +151,7 @@ static void fuelbench2(const char *delayStr, const char *indexStr, const char *
pinbench(delayStr, onTimeStr, offTimeStr, countStr, p, b); pinbench(delayStr, onTimeStr, offTimeStr, countStr, p, b);
} }
static void fanbench(Engine *engine) { void fanBench(void) {
brainPin = boardConfiguration->fanPin; brainPin = boardConfiguration->fanPin;
pinX = FAN_RELAY; pinX = FAN_RELAY;
@ -163,7 +163,7 @@ static void fanbench(Engine *engine) {
needToRunBench = true; needToRunBench = true;
} }
static void fuelpumpbench(void) { void fuelPumpBench(void) {
brainPin = boardConfiguration->fuelPumpPin; brainPin = boardConfiguration->fuelPumpPin;
pinX = FUEL_PUMP_RELAY; pinX = FUEL_PUMP_RELAY;
@ -240,8 +240,8 @@ void initInjectorCentral(Engine *engine) {
printStatus(); printStatus();
addConsoleActionII("injector", setInjectorEnabled); addConsoleActionII("injector", setInjectorEnabled);
addConsoleAction("fuelpumpbench", fuelpumpbench); addConsoleAction("fuelpumpbench", fuelPumpBench);
addConsoleActionP("fanbench", (VoidPtr) fanbench, engine); addConsoleAction("fanbench", fanBench);
addConsoleActionSSS("fuelbench", fuelbench); addConsoleActionSSS("fuelbench", fuelbench);
addConsoleActionSSS("sparkbench", sparkbench); addConsoleActionSSS("sparkbench", sparkbench);

3
firmware/controllers/injector_central.h
View File

@ -2,6 +2,7 @@
* @file injector_central.h * @file injector_central.h
* @brief Utility methods related to fuel injection. * @brief Utility methods related to fuel injection.
* *
* todo: rename this file
* *
* @date Sep 8, 2013 * @date Sep 8, 2013
* @author Andrey Belomutskiy, (c) 2012-2014 * @author Andrey Belomutskiy, (c) 2012-2014
@ -13,6 +14,8 @@
#include "signal_executor.h" #include "signal_executor.h"
#include "engine.h" #include "engine.h"
void fanBench(void);
void fuelPumpBench(void);
void initInjectorCentral(Engine *engine); void initInjectorCentral(Engine *engine);
void initIgnitionCentral(void); void initIgnitionCentral(void);
bool_t isRunningBenchTest(void); bool_t isRunningBenchTest(void);

5
firmware/controllers/lcd_controller.cpp
View File

@ -21,6 +21,7 @@
#include "lcd_menu_tree.h" #include "lcd_menu_tree.h"
#include "memstreams.h" #include "memstreams.h"
#include "settings.h" #include "settings.h"
#include "injector_central.h"
EXTERN_ENGINE EXTERN_ENGINE
; ;
@ -45,8 +46,8 @@ static MenuItem miMap(&miSensors, LL_MAP);
static MenuItem miBaro(&miSensors, LL_BARO); static MenuItem miBaro(&miSensors, LL_BARO);
static MenuItem miStopEngine(&miBench, "stop engine", stopEngine); static MenuItem miStopEngine(&miBench, "stop engine", stopEngine);
static MenuItem miTestFan(&miBench, "test fan"); static MenuItem miTestFan(&miBench, "test fan", fanBench);
static MenuItem miTestFuelPump(&miBench, "test pump"); static MenuItem miTestFuelPump(&miBench, "test pump", fuelPumpBench);
static MenuItem miTestSpark1(&miBench, "test spark1"); static MenuItem miTestSpark1(&miBench, "test spark1");
static MenuItem miTestSpark2(&miBench, "test spark2"); static MenuItem miTestSpark2(&miBench, "test spark2");
static MenuItem miTestSpark3(&miBench, "test spark3"); static MenuItem miTestSpark3(&miBench, "test spark3");