A/C relay cleanup

This commit is contained in:
rusEfi 2019-09-15 11:32:38 -04:00
parent 6504f6ccaf
commit 67c25a6f12
5 changed files with 3 additions and 7 deletions

View File

@ -71,7 +71,6 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE; boardConfiguration->max31855spiDevice = SPI_NONE;

View File

@ -217,7 +217,6 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE; boardConfiguration->max31855spiDevice = SPI_NONE;

View File

@ -179,7 +179,6 @@ void setBoardConfigurationOverrides(void) {
boardConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED; boardConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; boardConfiguration->digitalPotentiometerSpiDevice = SPI_NONE;
boardConfiguration->max31855spiDevice = SPI_NONE; boardConfiguration->max31855spiDevice = SPI_NONE;

View File

@ -314,8 +314,6 @@ static void setTimingMode(int value) {
} }
void setEngineType(int value) { void setEngineType(int value) {
// enginePins.stopPins(); // this is mostly needed by functional tests
engineConfiguration->engineType = (engine_type_e) value; engineConfiguration->engineType = (engine_type_e) value;
resetConfigurationExt(&logger, (engine_type_e) value PASS_ENGINE_PARAMETER_SUFFIX); resetConfigurationExt(&logger, (engine_type_e) value PASS_ENGINE_PARAMETER_SUFFIX);
#if EFI_ENGINE_SNIFFER #if EFI_ENGINE_SNIFFER
@ -701,7 +699,7 @@ static void setAlternatorPin(const char *pinName) {
setIndividualPin(pinName, &boardConfiguration->alternatorControlPin, "alternator"); setIndividualPin(pinName, &boardConfiguration->alternatorControlPin, "alternator");
} }
static void setACPin(const char *pinName) { static void setACRelayPin(const char *pinName) {
setIndividualPin(pinName, &boardConfiguration->acRelayPin, "A/C"); setIndividualPin(pinName, &boardConfiguration->acRelayPin, "A/C");
} }
@ -1429,7 +1427,7 @@ void initSettings(void) {
addConsoleActionSS("set_trigger_simulator_mode", setTriggerSimulatorMode); addConsoleActionSS("set_trigger_simulator_mode", setTriggerSimulatorMode);
addConsoleActionS("set_fuel_pump_pin", setFuelPumpPin); addConsoleActionS("set_fuel_pump_pin", setFuelPumpPin);
addConsoleActionS("set_ac_pin", setACPin); addConsoleActionS("set_acrelay_pin", setACRelayPin);
addConsoleActionS("set_alternator_pin", setAlternatorPin); addConsoleActionS("set_alternator_pin", setAlternatorPin);
addConsoleActionS("set_idle_pin", setIdlePin); addConsoleActionS("set_idle_pin", setIdlePin);
addConsoleActionS("set_main_relay_pin", setMainRelayPin); addConsoleActionS("set_main_relay_pin", setMainRelayPin);

View File

@ -113,6 +113,7 @@ void EnginePins::unregisterPins() {
#if EFI_PROD_CODE #if EFI_PROD_CODE
fuelPumpRelay.unregisterOutput(activeConfiguration.bc.fuelPumpPin, engineConfiguration->bc.fuelPumpPin); fuelPumpRelay.unregisterOutput(activeConfiguration.bc.fuelPumpPin, engineConfiguration->bc.fuelPumpPin);
fanRelay.unregisterOutput(activeConfiguration.bc.fanPin, engineConfiguration->bc.fanPin); fanRelay.unregisterOutput(activeConfiguration.bc.fanPin, engineConfiguration->bc.fanPin);
acRelay.unregisterOutput(activeConfiguration.bc.acRelayPin, engineConfiguration->bc.acRelayPin);
hipCs.unregisterOutput(activeConfiguration.bc.hip9011CsPin, engineConfiguration->bc.hip9011CsPin); hipCs.unregisterOutput(activeConfiguration.bc.hip9011CsPin, engineConfiguration->bc.hip9011CsPin);
triggerDecoderErrorPin.unregisterOutput(activeConfiguration.bc.triggerErrorPin, triggerDecoderErrorPin.unregisterOutput(activeConfiguration.bc.triggerErrorPin,
engineConfiguration->bc.triggerErrorPin); engineConfiguration->bc.triggerErrorPin);