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 2015-05-09 14:05:30 -04:00
parent ef0ca54630
commit 4060c88500
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,13 @@ void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->injectionPins[7] = GPIOD_3; boardConfiguration->injectionPins[7] = GPIOD_3;
boardConfiguration->ignitionPins[0] = GPIOC_9; boardConfiguration->ignitionPins[0] = GPIOC_9;
boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[2] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
boardConfiguration->mainRelayPin = GPIOE_5; boardConfiguration->mainRelayPin = GPIOE_5;
boardConfiguration->fuelPumpPin = GPIOE_6; boardConfiguration->fuelPumpPin = GPIOE_6;
boardConfiguration->fanPin = GPIO_UNASSIGNED;
engineConfiguration->engineChartSize = 450; engineConfiguration->engineChartSize = 450;

7
firmware/controllers/engine_controller.cpp
View File

@ -298,6 +298,11 @@ extern AdcDevice fastAdc;
static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel, float adcVoltage) { static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel, float adcVoltage) {
#if HAL_USE_ADC || defined(__DOXYGEN__) #if HAL_USE_ADC || defined(__DOXYGEN__)
if (hwChannel == EFI_ADC_NONE) {
scheduleMsg(&logger, "ADC is not assigned for %s", name);
return;
}
if (fastAdc.isHwUsed(hwChannel)) { if (fastAdc.isHwUsed(hwChannel)) {
scheduleMsg(&logger, "fast enabled=%s", boolToString(boardConfiguration->isFastAdcEnabled)); scheduleMsg(&logger, "fast enabled=%s", boolToString(boardConfiguration->isFastAdcEnabled));
} }
@ -310,9 +315,7 @@ static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel,
static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) { static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) {
#if HAL_USE_ADC || defined(__DOXYGEN__) #if HAL_USE_ADC || defined(__DOXYGEN__)
if (hwChannel != EFI_ADC_NONE) {
printAnalogChannelInfoExt(name, hwChannel, getVoltage("print", hwChannel)); printAnalogChannelInfoExt(name, hwChannel, getVoltage("print", hwChannel));
}
#endif #endif
} }