From 47f0dfbac9c56405f22192e5772a5184bbee6dda Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 11 May 2015 19:10:09 -0400
Subject: [PATCH] auto-sync

---
 firmware/controllers/sensors/tps.cpp | 21 ++++++++-------------
 firmware/controllers/sensors/tps.h   |  3 ++-
 firmware/controllers/settings.cpp    |  4 ++--
 unit_tests/test_sensors.cpp          | 19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp
index 5e5d4e8a31..3d129a0ffd 100644
--- a/firmware/controllers/sensors/tps.cpp
+++ b/firmware/controllers/sensors/tps.cpp
@@ -53,19 +53,14 @@ float getTpsRateOfChange(void) {
  * Return current TPS position based on configured ADC levels, and adc
  *
  * */
-static float getTpsValue(int adc DECLARE_ENGINE_PARAMETER_S) {
-	if (adc < engineConfiguration->tpsMin) {
-		return 0.0f;
-	}
-	if (adc > engineConfiguration->tpsMax) {
-		return 100.0f;
-	}
-	// todo: double comparison using EPS
+percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_S) {
 	if (engineConfiguration->tpsMin == engineConfiguration->tpsMax) {
-		firmwareError("Invalid TPS configuration: same value");
-		return 0.0f;
+		warning(OBD_PCM_Processor_Fault, "Invalid TPS configuration: same value %d", engineConfiguration->tpsMin);
+		return NAN;
 	}
-	return interpolate(engineConfiguration->tpsMin, 0, engineConfiguration->tpsMax, 100, adc);
+	float result = interpolate(engineConfiguration->tpsMin, 0, engineConfiguration->tpsMax, 100, adc);
+	// this would put the value into the 0-100 range
+	return maxF(0, minF(100, result));
 }
 
 /*
@@ -111,8 +106,8 @@ static float getPrimatyRawTPS(DECLARE_ENGINE_PARAMETER_F) {
  *
  * @return Current TPS position, percent of WOT. 0 means idle and 100 means Wide Open Throttle
  */
-float getTPS(DECLARE_ENGINE_PARAMETER_F) {
-	if(!engineConfiguration->hasTpsSensor)
+percent_t getTPS(DECLARE_ENGINE_PARAMETER_F) {
+	if (!engineConfiguration->hasTpsSensor)
 		return NO_TPS_MAGIC_VALUE;
 	// todo: if (config->isDualTps)
 	// todo: blah blah
diff --git a/firmware/controllers/sensors/tps.h b/firmware/controllers/sensors/tps.h
index 76c1fd8884..103ed58447 100644
--- a/firmware/controllers/sensors/tps.h
+++ b/firmware/controllers/sensors/tps.h
@@ -13,10 +13,11 @@
 #include "global.h"
 #include "engine_configuration.h"
 
-float getTPS(DECLARE_ENGINE_PARAMETER_F);
+percent_t getTPS(DECLARE_ENGINE_PARAMETER_F);
 int convertVoltageTo10bitADC(float voltage);
 int getTPS10bitAdc(DECLARE_ENGINE_PARAMETER_F);
 float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F);
+percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_S);
 
 typedef struct {
 	// time in systicks
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index df845512dd..2fab9e8853 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -373,9 +373,9 @@ static void printThermistor(const char *msg, Thermistor *thermistor) {
 
 	float t = getTemperatureC(thermistor);
 
-	scheduleMsg(&logger, "%s v=%f C=%f R=%f on channel %d", msg, voltage, t, r, adcChannel);
+	scheduleMsg(&logger, "%s volts=%f Celsius=%f sensorR=%f on channel %d", msg, voltage, t, r, adcChannel);
 	scheduleMsg(&logger, "@%s", getPinNameByAdcChannel(adcChannel, pinNameBuffer));
-	scheduleMsg(&logger, "bias=%f A=%..100000f B=%..100000f C=%..100000f", thermistor->config->bias_resistor,
+	scheduleMsg(&logger, "bias resistor=%fK A=%..100000f B=%..100000f C=%..100000f", thermistor->config->bias_resistor / 1000,
 			thermistor->config->s_h_a, thermistor->config->s_h_b, thermistor->config->s_h_c);
 	scheduleMsg(&logger, "==============================");
 }
diff --git a/unit_tests/test_sensors.cpp b/unit_tests/test_sensors.cpp
index 01e1385858..136b1b4c57 100644
--- a/unit_tests/test_sensors.cpp
+++ b/unit_tests/test_sensors.cpp
@@ -9,6 +9,7 @@
 #include "thermistors.h"
 #include "allsensors.h"
 #include "hip9011_lookup.h"
+#include "engine_test_helper.h"
 
 static ThermistorConf tc;
 
@@ -25,6 +26,23 @@ static void testMapDecoding(void) {
 	assertEquals(58.4, decodePressure(1, &s));
 }
 
+void testTps(void) {
+	print("************************************************** testTps\r\n");
+
+	EngineTestHelper eth(DODGE_RAM);
+	EXPAND_EngineTestHelper;
+
+	engineConfiguration->tpsMin = 43;
+	engineConfiguration->tpsMax = 193;
+
+	assertEquals(49.3333, getTpsValue(117 PASS_ENGINE_PARAMETER));
+
+
+	engineConfiguration->tpsMin = 193;
+	engineConfiguration->tpsMax = 43;
+	assertEquals(50.6667, getTpsValue(117 PASS_ENGINE_PARAMETER));
+}
+
 void testTpsRateOfChange(void) {
 	print("************************************************** testTpsRateOfChange\r\n");
 	saveTpsState(0, 0);
@@ -64,6 +82,7 @@ static void testHip9011lookup(void) {
 void testSensors(void) {
 	print("************************************************** testSensors\r\n");
 	testMapDecoding();
+	testTps();
 	testTpsRateOfChange();
 	testHip9011lookup();