diff --git a/firmware/config/engines/dodge_ram.cpp b/firmware/config/engines/dodge_ram.cpp index 047df89ddf..0e0ec555a3 100644 --- a/firmware/config/engines/dodge_ram.cpp +++ b/firmware/config/engines/dodge_ram.cpp @@ -58,6 +58,11 @@ void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) { // set_global_trigger_offset_angle -50 engineConfiguration->globalTriggerAngleOffset = -50; + boardConfiguration->alternatorControlPin = GPIOD_7; + engineConfiguration->alternatorControlPFactor = 22; + + boardConfiguration->idle.solenoidPin = GPIOC_13; + boardConfiguration->idle.solenoidFrequency = 300; engineConfiguration->vbattAdcChannel = EFI_ADC_NONE; // todo: conflict with what? diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 120424c772..8cec0a3183 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -801,7 +801,7 @@ void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) { boardConfiguration->joystickCenterPin = GPIOC_8; boardConfiguration->joystickAPin = GPIOD_10; boardConfiguration->joystickBPin = GPIO_UNASSIGNED; - boardConfiguration->joystickCPin = GPIOD_9; + boardConfiguration->joystickCPin = GPIO_UNASSIGNED; boardConfiguration->joystickDPin = GPIOD_11; } diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index b90f1e9210..bbad233ca3 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -69,7 +69,8 @@ static void applyAlternatorPinState(PwmConfig *state, int stateIndex) { } static void showAltInfo(void) { - scheduleMsg(logger, "atl=%s", boolToString(engineConfiguration->isAlternatorControlEnabled)); + scheduleMsg(logger, "alt=%s @ %s", boolToString(engineConfiguration->isAlternatorControlEnabled), + hwPortname(boardConfiguration->alternatorControlPin)); scheduleMsg(logger, "p=%f/i=%f/d=%f", engineConfiguration->alternatorControlPFactor, 0, 0); // todo: i & d scheduleMsg(logger, "vbatt=%f/duty=%f", getVBatt(engineConfiguration), currentAltDuty); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index a82e1b7ff0..df845512dd 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -623,6 +623,10 @@ static void setMainRelayPin(const char *pinName) { setIndividualPin(pinName, &boardConfiguration->mainRelayPin, "main relay"); } +static void setAlternatorPin(const char *pinName) { + setIndividualPin(pinName, &boardConfiguration->alternatorControlPin, "alternator"); +} + static void setACPin(const char *pinName) { setIndividualPin(pinName, &boardConfiguration->acRelayPin, "A/C"); } @@ -1007,6 +1011,7 @@ void initSettings(engine_configuration_s *engineConfiguration) { addConsoleActionSS("set_trigger_simulator_mode", setTriggerSimulatorMode); addConsoleActionS("set_fuel_pump_pin", setFuelPumpPin); addConsoleActionS("set_ac_pin", setACPin); + addConsoleActionS("set_alternator_pin", setAlternatorPin); addConsoleActionS("set_idle_pin", setIdlePin); addConsoleActionS("set_main_relay_pin", setMainRelayPin); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index f4aeab1953..c62284d002 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -290,5 +290,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20150507; + return 20150509; }