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 16:04:18 -06:00
parent 3741c65de9
commit e351b7dd5a
5 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/config/engines/custom_engine.cpp
View File

@ -58,10 +58,13 @@ void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) {
boardConfiguration->injectionPins[7] = GPIOD_11; boardConfiguration->injectionPins[7] = GPIOD_11;
boardConfiguration->injectionPins[8] = GPIOD_0; boardConfiguration->injectionPins[8] = GPIOD_0;
boardConfiguration->injectionPins[9] = GPIOB_11; boardConfiguration->injectionPins[9] = GPIOB_11;
boardConfiguration->injectionPins[10] = GPIOC_7;
boardConfiguration->injectionPins[11] = GPIOE_4;
/** /**
* We want to initialize all outputs for test * We want to initialize all outputs for test
*/ */
engineConfiguration->cylindersCount = 10; engineConfiguration->cylindersCount = 12;
engineConfiguration->displayMode = DM_NONE; engineConfiguration->displayMode = DM_NONE;
#else #else
@ -71,10 +74,15 @@ void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) {
boardConfiguration->injectionPins[7] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[7] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[8] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[8] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[9] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[9] = GPIO_UNASSIGNED;
#endif
boardConfiguration->injectionPins[10] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[10] = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[0] = GPIOC_7;
boardConfiguration->ignitionPins[1] = GPIOE_4; // todo: update this value
boardConfiguration->ignitionPins[2] = GPIOE_0; // todo: update this value
boardConfiguration->ignitionPins[3] = GPIOE_1; // todo: update this value
#endif
} }
#endif /* CONFIG_ENGINES_CUSTOM_ENGINE_CPP_ */ #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_CPP_ */

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

@ -381,7 +381,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
engineConfiguration->canWriteEnabled = true; engineConfiguration->canWriteEnabled = true;
engineConfiguration->canReadEnabled = false; engineConfiguration->canReadEnabled = false;
engineConfiguration->canNbcType = CAN_BUS_NBC_BMW; engineConfiguration->canNbcType = CAN_BUS_NBC_BMW;
// engineConfiguration->can_nbc_type = CAN_BUS_MAZDA_RX8; // engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
} }
#endif /* EFI_SUPPORT_DODGE_NEON */ #endif /* EFI_SUPPORT_DODGE_NEON */

12
firmware/config/engines/rover_v8.cpp
View File

@ -23,8 +23,7 @@ void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_db7 = GPIOB_13; boardConfiguration->HD44780_db7 = GPIOB_13;
} }
void setRoverv8(engine_configuration_s *engineConfiguration, void setRoverv8(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
board_configuration_s *boardConfiguration) {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL_36_1; engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL_36_1;
@ -41,7 +40,6 @@ void setRoverv8(engine_configuration_s *engineConfiguration,
// set_whole_fuel_map 3 // set_whole_fuel_map 3
setWholeFuelMap(engineConfiguration, 3); setWholeFuelMap(engineConfiguration, 3);
// set_cranking_injection_mode 0 // set_cranking_injection_mode 0
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
// set_injection_mode 1 // set_injection_mode 1
@ -50,7 +48,6 @@ void setRoverv8(engine_configuration_s *engineConfiguration,
// set_ignition_mode 2 // set_ignition_mode 2
engineConfiguration->ignitionMode = IM_WASTED_SPARK; engineConfiguration->ignitionMode = IM_WASTED_SPARK;
// Frankenstein: low side - out #1: PC14 // Frankenstein: low side - out #1: PC14
// Frankenstein: low side - out #2: PC15 // Frankenstein: low side - out #2: PC15
// Frankenstein: low side - out #3: PE6 // Frankenstein: low side - out #3: PE6
@ -75,5 +72,10 @@ void setRoverv8(engine_configuration_s *engineConfiguration,
// set_injection_pin_mode 0 // set_injection_pin_mode 0
boardConfiguration->injectionPinMode = OM_DEFAULT; boardConfiguration->injectionPinMode = OM_DEFAULT;
boardConfiguration->canTxPin = GPIOB_6;
boardConfiguration->canRxPin = GPIOB_12;
engineConfiguration->canWriteEnabled = true;
engineConfiguration->canReadEnabled = false;
engineConfiguration->isCanEnabled = true;
engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
} }

22
firmware/controllers/PwmTester.cpp
View File

@ -48,17 +48,24 @@ static void startPwmTest(int freq) {
static scheduling_s ioTest; static scheduling_s ioTest;
static OutputSignal outSignals[4]; static OutputSignal outSignals[8];
static void testCallback(void *arg) { static void testCallback(void *arg) {
/** /**
* 0.1ms from now please squirt for 1.6ms * 0.1ms from now please squirt for 1.6ms
*/ */
scheduleOutput(&outSignals[0], 0.1, 1.6); float delayMs = 0.1;
scheduleOutput(&outSignals[1], 0.1, 1.6); float durationMs = 1.6;
scheduleOutput(&outSignals[2], 0.1, 1.6); scheduleOutput(&outSignals[0], delayMs, durationMs);
scheduleOutput(&outSignals[3], 0.1, 1.6); scheduleOutput(&outSignals[1], delayMs, durationMs);
scheduleOutput(&outSignals[2], delayMs, durationMs);
scheduleOutput(&outSignals[3], delayMs, durationMs);
scheduleOutput(&outSignals[4], delayMs, durationMs);
scheduleOutput(&outSignals[5], delayMs, durationMs);
scheduleOutput(&outSignals[6], delayMs, durationMs);
scheduleOutput(&outSignals[7], delayMs, durationMs);
/** /**
* this would re-schedule another callback in 2ms from now * this would re-schedule another callback in 2ms from now
@ -74,10 +81,15 @@ void initPwmTester(void) {
/** /**
* injector channels #4-#8 are used for individual squirt test * injector channels #4-#8 are used for individual squirt test
*/ */
// todo: yet, it's some horrible code duplication
outSignals[0].output = &enginePins.injectors[4]; outSignals[0].output = &enginePins.injectors[4];
outSignals[1].output = &enginePins.injectors[5]; outSignals[1].output = &enginePins.injectors[5];
outSignals[2].output = &enginePins.injectors[6]; outSignals[2].output = &enginePins.injectors[6];
outSignals[3].output = &enginePins.injectors[7]; outSignals[3].output = &enginePins.injectors[7];
outSignals[4].output = &enginePins.injectors[8];
outSignals[5].output = &enginePins.injectors[9];
outSignals[6].output = &enginePins.injectors[10];
outSignals[7].output = &enginePins.injectors[11];
/** /**
* this would schedule a callback in 2ms from now * this would schedule a callback in 2ms from now

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

@ -411,10 +411,11 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED;
boardConfiguration->injectionPinMode = OM_DEFAULT; boardConfiguration->injectionPinMode = OM_DEFAULT;
boardConfiguration->ignitionPins[0] = GPIOC_7;
boardConfiguration->ignitionPins[1] = GPIOE_4; // todo: update this value boardConfiguration->ignitionPins[0] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[2] = GPIOE_0; // todo: update this value boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[3] = GPIOE_1; // todo: update this value boardConfiguration->ignitionPins[2] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[4] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[4] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[5] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[5] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[6] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[6] = GPIO_UNASSIGNED;