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 2014-11-01 21:03:09 -05:00
parent b1e8989631
commit b298f29f14
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,8 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
setFuelLoadBin(engineConfiguration, 0, 100); setFuelLoadBin(engineConfiguration, 0, 100);
setTimingLoadBin(engineConfiguration, 0, 100); setTimingLoadBin(engineConfiguration, 0, 100);
boardConfiguration->malfunctionIndicatorPin = GPIO_NONE;
/** /**
* D14/W10 O2 Sensor * D14/W10 O2 Sensor
*/ */
@ -183,7 +185,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
boardConfiguration->ignitionPins[2] = GPIOE_8; boardConfiguration->ignitionPins[2] = GPIOE_8;
boardConfiguration->ignitionPins[3] = GPIO_NONE; boardConfiguration->ignitionPins[3] = GPIO_NONE;
boardConfiguration->idleValvePin = GPIOE_5; boardConfiguration->idleValvePin = GPIO_NONE;
boardConfiguration->fuelPumpPin = GPIOE_3; boardConfiguration->fuelPumpPin = GPIOE_3;
boardConfiguration->fuelPumpPinMode = OM_DEFAULT; boardConfiguration->fuelPumpPinMode = OM_DEFAULT;

3
firmware/controllers/settings.cpp
View File

@ -131,7 +131,8 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
scheduleMsg(&logger, "idlePin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->idleValvePinMode), scheduleMsg(&logger, "idlePin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->idleValvePinMode),
hwPortname(boardConfiguration->idleValvePin)); hwPortname(boardConfiguration->idleValvePin));
scheduleMsg(&logger, "malfunctionIndicatorPinMode: %s", scheduleMsg(&logger, "malfunctionIndicatorn: %s mode=%s",
hwPortname(boardConfiguration->malfunctionIndicatorPin),
pinModeToString(boardConfiguration->malfunctionIndicatorPinMode)); pinModeToString(boardConfiguration->malfunctionIndicatorPinMode));
scheduleMsg(&logger, "fuelPumpPin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->fuelPumpPinMode), scheduleMsg(&logger, "fuelPumpPin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->fuelPumpPinMode),

11
firmware/hw_layer/gpio_helper.c
View File

@ -31,11 +31,14 @@
* @brief Initialize the hardware output pin while also assigning it a logical name * @brief Initialize the hardware output pin while also assigning it a logical name
*/ */
void initOutputPinExt(const char *msg, OutputPin *outputPin, GPIO_TypeDef *port, uint32_t pinNumber, iomode_t mode) { void initOutputPinExt(const char *msg, OutputPin *outputPin, GPIO_TypeDef *port, uint32_t pinNumber, iomode_t mode) {
// if (outputPin->port != NULL) { if (outputPin->port != NULL) {
/**
* here we check if another physical pin is already assigned to this logical output
*/
// todo: need to clear '&outputs' in io_pins.c // todo: need to clear '&outputs' in io_pins.c
// firmwareError("outputPin already assigned to %x%d", outputPin->port, outputPin->pin); firmwareError("outputPin already assigned to %x%d", outputPin->port, outputPin->pin);
// return; return;
// } }
outputPin->currentLogicValue = INITIAL_PIN_STATE; outputPin->currentLogicValue = INITIAL_PIN_STATE;
outputPin->port = port; outputPin->port = port;
outputPin->pin = pinNumber; outputPin->pin = pinNumber;

1
firmware/hw_layer/io_pins.c
View File

@ -54,7 +54,6 @@ void setDefaultPinState(io_pin_e pin, pin_output_mode_e *outputMode) {
setOutputPinValue(pin, FALSE); // initial state setOutputPinValue(pin, FALSE); // initial state
} }
static void outputPinRegisterExt(const char *msg, io_pin_e ioPin, GPIO_TypeDef *port, uint32_t pin, static void outputPinRegisterExt(const char *msg, io_pin_e ioPin, GPIO_TypeDef *port, uint32_t pin,
pin_output_mode_e *outputMode) { pin_output_mode_e *outputMode) {
efiAssertVoid((int)ioPin < IO_PIN_COUNT, "io pin out of range"); efiAssertVoid((int)ioPin < IO_PIN_COUNT, "io pin out of range");

7
firmware/hw_layer/pin_repository.c
View File

@ -158,7 +158,12 @@ void mySetPadMode(const char *msg, ioportid_t port, ioportmask_t pin, iomode_t m
int index = portIndex * 16 + pin; int index = portIndex * 16 + pin;
if (PIN_USED[index] != NULL) { if (PIN_USED[index] != NULL) {
warning(OBD_PCM_Processor_Fault, "%s%d req by %s used by %s", portname(port), pin, msg, PIN_USED[index]); /**
* todo: the problem is that this warning happends before the console is even
* connected, so the warning is never displayed on the console and that's quite a problem!
*/
// warning(OBD_PCM_Processor_Fault, "%s%d req by %s used by %s", portname(port), pin, msg, PIN_USED[index]);
firmwareError("%s%d req by %s used by %s", portname(port), pin, msg, PIN_USED[index]);
return; return;
} }
markUsed(index, msg); markUsed(index, msg);