From b9c2e7a1076d2764ceecf86c117d04dada9a9871 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 29 Nov 2014 22:03:22 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 4 ++-- firmware/console/status_loop.cpp | 2 +- firmware/controllers/injector_central.cpp | 1 + firmware/controllers/sensors/tps.cpp | 4 ++-- firmware/controllers/sensors/tps.h | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 0a8e5d5a55..94a445cfcd 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -256,9 +256,9 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat /** - * TPS D11/W11 + * TPS */ - engineConfiguration->tpsAdcChannel = EFI_ADC_1; + engineConfiguration->tpsAdcChannel = EFI_ADC_15; engineConfiguration->tpsMin = 125; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMax = 625; // convert 12to10 bit (ADC/4) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index c7725b5f1a..2d63263d7d 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -431,7 +431,7 @@ void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputC tsOutputChannels->air_fuel_ratio = getAfr(); tsOutputChannels->v_batt = getVBatt(engineConfiguration); tsOutputChannels->tsConfigVersion = TS_FILE_VERSION; - tsOutputChannels->tpsADC = getTPS10bitAdc(); + tsOutputChannels->tpsADC = getTPS10bitAdc(PASS_ENGINE_PARAMETER_F); tsOutputChannels->atmospherePressure = getBaroPressure(); tsOutputChannels->manifold_air_pressure = getMap(); tsOutputChannels->checkEngine = hasErrorCodes(); diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp index 7dddc12d51..2a784b6204 100644 --- a/firmware/controllers/injector_central.cpp +++ b/firmware/controllers/injector_central.cpp @@ -171,6 +171,7 @@ static void sparkbench2(const char *delayStr, const char *indexStr, const char * pinbench(delayStr, onTimeStr, offTimeStr, countStr, p, b); } +// sparkbench 5 400 4 static void sparkbench(const char * onTimeStr, const char *offTimeStr, const char *countStr) { sparkbench2("0", "1", onTimeStr, offTimeStr, countStr); } diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp index 2cd794b4e5..82a24a1e0f 100644 --- a/firmware/controllers/sensors/tps.cpp +++ b/firmware/controllers/sensors/tps.cpp @@ -79,7 +79,7 @@ float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F) { * We need ADC value because TunerStudio has a nice TPS configuration wizard, and this wizard * wants a TPS value. */ -int getTPS10bitAdc(void) { +int getTPS10bitAdc(DECLARE_ENGINE_PARAMETER_F) { #if !EFI_PROD_CODE if (mockTps != MOCK_UNDEFINED) return mockTps; @@ -92,7 +92,7 @@ int getTPS10bitAdc(void) { * @brief Position on physical primary TPS */ static float getPrimatyRawTPS(DECLARE_ENGINE_PARAMETER_F) { - float tpsValue = getTpsValue(getTPS10bitAdc() PASS_ENGINE_PARAMETER); + float tpsValue = getTpsValue(getTPS10bitAdc(PASS_ENGINE_PARAMETER_F) PASS_ENGINE_PARAMETER); return tpsValue; } diff --git a/firmware/controllers/sensors/tps.h b/firmware/controllers/sensors/tps.h index b9b9ca41bd..f098bf704e 100644 --- a/firmware/controllers/sensors/tps.h +++ b/firmware/controllers/sensors/tps.h @@ -15,7 +15,7 @@ float getTPS(DECLARE_ENGINE_PARAMETER_F); int convertVoltageTo10bitADC(float voltage); -int getTPS10bitAdc(void); +int getTPS10bitAdc(DECLARE_ENGINE_PARAMETER_F); float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F); typedef struct {