From ad009182ffbb42a35914c599c00cb000e609bf5c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 9 Feb 2017 15:07:03 -0500 Subject: [PATCH] auto-sync --- firmware/controllers/sensors/map.cpp | 8 +++++++- firmware/controllers/settings.cpp | 8 +++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/sensors/map.cpp b/firmware/controllers/sensors/map.cpp index 54b2a46d4c..81f5d33ccc 100644 --- a/firmware/controllers/sensors/map.cpp +++ b/firmware/controllers/sensors/map.cpp @@ -8,6 +8,7 @@ #include "interpolation.h" #include "error_handling.h" #include "map.h" +#include "engine_controller.h" #if EFI_PROD_CODE || defined(__DOXYGEN__) #include "digital_input_hw.h" @@ -187,6 +188,7 @@ static void printMAPInfo(void) { #if EFI_ANALOG_SENSORS || defined(__DOXYGEN__) scheduleMsg(logger, "instant value=%fkPa", getRawMap()); + if (engineConfiguration->hasFrequencyReportingMapSensor) { scheduleMsg(logger, "instant value=%fHz @ %s", mapFreq, hwPortname(boardConfiguration->frequencyReportingMapInputPin)); } else { @@ -194,7 +196,11 @@ static void printMAPInfo(void) { getAir_pressure_sensor_type_e(engineConfiguration->map.sensor.type), getMap()); - scheduleMsg(logger, "MAP %fv", getVoltage("mapinfo", engineConfiguration->map.sensor.hwChannel)); + adc_channel_e mapAdc = engineConfiguration->map.sensor.hwChannel; + static char pinNameBuffer[16]; + + scheduleMsg(logger, "MAP %fv @%s", getVoltage("mapinfo", mapAdc), + getPinNameByAdcChannel("map", mapAdc, pinNameBuffer)); if (engineConfiguration->map.sensor.type == MT_CUSTOM) { scheduleMsg(logger, "at %fv=%f at %fv=%f", engineConfiguration->mapLowValueVoltage, diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 384a0958db..57c0aef74d 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -405,12 +405,10 @@ static void printTPSInfo(void) { scheduleMsg(&logger, "NO TPS SENSOR"); return; } + static char pinNameBuffer[16]; - ioportid_t port = getAdcChannelPort("tps", engineConfiguration->tpsAdcChannel); - int pin = getAdcChannelPin(engineConfiguration->tpsAdcChannel); - - scheduleMsg(&logger, "tps min (closed) %d/max (full) %d v=%f @%s%d", engineConfiguration->tpsMin, engineConfiguration->tpsMax, - getTPSVoltage(PASS_ENGINE_PARAMETER_F), portname(port), pin); + scheduleMsg(&logger, "tps min (closed) %d/max (full) %d v=%f @%s", engineConfiguration->tpsMin, engineConfiguration->tpsMax, + getTPSVoltage(PASS_ENGINE_PARAMETER_F), getPinNameByAdcChannel("tps", engineConfiguration->tpsAdcChannel, pinNameBuffer)); #endif /* EFI_PROD_CODE */ scheduleMsg(&logger, "current 10bit=%d value=%f rate=%f", getTPS12bitAdc() / TPS_TS_CONVERSION, getTPS(PASS_ENGINE_PARAMETER_F), getTpsRateOfChange());