From d6e361031723d0eefb8f7db203f8e37abfa66ced Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 9 May 2015 12:05:55 -0400
Subject: [PATCH] auto-sync

---
 firmware/config/engines/dodge_ram.cpp | 2 ++
 firmware/console/status_loop.cpp      | 2 +-
 firmware/hw_layer/adc_inputs.cpp      | 7 +++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/firmware/config/engines/dodge_ram.cpp b/firmware/config/engines/dodge_ram.cpp
index 332b04292d..d7e3ebe291 100644
--- a/firmware/config/engines/dodge_ram.cpp
+++ b/firmware/config/engines/dodge_ram.cpp
@@ -9,11 +9,13 @@
 
 #include "main.h"
 #include "dodge_ram.h"
+#include "custom_engine.h"
 
 EXTERN_ENGINE
 ;
 
 void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) {
+	setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
 	board_configuration_s * boardConfiguration = &engineConfiguration->bc;
 
 	setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR);
diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index c58e28b661..6d8c2ac0cf 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -332,7 +332,7 @@ void updateDevConsoleState(Engine *engine) {
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 	// todo: unify with simulator!
 	if (hasFirmwareError()) {
-		scheduleMsg(&logger, "firmware error: %s", errorMessageBuffer);
+		scheduleMsg(&logger, "FATAL error: %s", errorMessageBuffer);
 		warningEnabled = false;
 		scheduleLogging(&logger);
 		return;
diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp
index b2d8e28021..4258340354 100644
--- a/firmware/hw_layer/adc_inputs.cpp
+++ b/firmware/hw_layer/adc_inputs.cpp
@@ -21,6 +21,7 @@
 #include "engine_controller.h"
 
 static adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX];
+static const char * adcHwChannelUsage[HW_MAX_ADC_INDEX];
 
 AdcDevice::AdcDevice(ADCConversionGroup* hwConfig) {
 	this->hwConfig = hwConfig;
@@ -297,7 +298,7 @@ GPIO_TypeDef* getAdcChannelPort(adc_channel_e hwChannel) {
 	case ADC_CHANNEL_IN15:
 		return GPIOC;
 	default:
-		firmwareError("Unknown hw channel");
+		firmwareError("Unknown hw channel %d", hwChannel);
 		return NULL;
 	}
 }
@@ -348,7 +349,7 @@ int getAdcChannelPin(adc_channel_e hwChannel) {
 	case ADC_CHANNEL_IN15:
 		return 5;
 	default:
-		firmwareError("Unknown hw channel");
+		firmwareError("Unknown hw channel %d", hwChannel);
 		return -1;
 	}
 }
@@ -477,11 +478,13 @@ static void addChannel(const char *name, adc_channel_e setting, adc_channel_mode
 		firmwareError("ADC mapping error: input %s for %s already used?", errorMsgBuff, name);
 	}
 
+	adcHwChannelUsage[setting] = name;
 	adcHwChannelEnabled[setting] = mode;
 }
 
 static void configureInputs(void) {
 	memset(adcHwChannelEnabled, 0, sizeof(adcHwChannelEnabled));
+	memset(adcHwChannelUsage, 0, sizeof(adcHwChannelUsage));
 
 	addChannel("TPS", engineConfiguration->tpsAdcChannel, ADC_FAST);
 	addChannel("MAP", engineConfiguration->map.sensor.hwChannel, ADC_FAST);