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

auto-sync

This commit is contained in:
rusEfi 2015-05-09 23:09:58 -04:00
parent 4060c88500
commit ea8449eeaf
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/config/engines/dodge_ram.cpp
View File

@ -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?

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

@ -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;
}

3
firmware/controllers/alternatorController.cpp
View File

@ -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);

5
firmware/controllers/settings.cpp
View File

@ -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);

2
firmware/rusefi.cpp
View File

@ -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;
}