summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Trampedach <tim@timtt.com>2012-10-14 12:32:45 -0700
committerKevron Rees <kevron_m_rees@linux.intel.com>2012-10-26 16:36:12 -0700
commit4070848f17863f1fd9e3a2ec6e523b93801506dc (patch)
tree87e17e1a75e66b81bb09d87a479d730af5e0e437
parentb6c0d8a1de1afb27a84b7827636ecd647f6ddbd4 (diff)
downloadautomotive-message-broker-4070848f17863f1fd9e3a2ec6e523b93801506dc.tar.gz
pressures all in kPa
-rw-r--r--plugins/tpms/tpmsplugin.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/tpms/tpmsplugin.cpp b/plugins/tpms/tpmsplugin.cpp
index 3f8773fd..3c6daf93 100644
--- a/plugins/tpms/tpmsplugin.cpp
+++ b/plugins/tpms/tpmsplugin.cpp
@@ -239,27 +239,27 @@ int TpmsPlugin::readValues()
switch (snum) {
case 1:
- lfPressure = ((float)buf[0]-40) * PRESSURE_SCALE;
+ lfPressure = ((float)buf[0]-40) * PRESSURE_SCALE * KPA_MULTIPLIER;
lfTemperature = (float)buf[1]-40;
- sprintf(print_string, "TPMS: Left front pressure = %5.2f bar, temperature = %5.1f degrees Celsius", lfPressure, lfTemperature);
+ sprintf(print_string, "TPMS: Left front pressure = %5.1f kPa, temperature = %5.1f degrees Celsius", lfPressure, lfTemperature);
DebugOut() << print_string << endl;
break;
case 2:
- rfPressure = (buf[0]-40) * PRESSURE_SCALE;
+ rfPressure = (buf[0]-40) * PRESSURE_SCALE * KPA_MULTIPLIER;
rfTemperature = buf[1]-40;
- sprintf(print_string, "TPMS: Right front pressure = %5.2f bar, temperature = %5.1f degrees Celsius", rfPressure, rfTemperature);
+ sprintf(print_string, "TPMS: Right front pressure = %5.1f kPa, temperature = %5.1f degrees Celsius", rfPressure, rfTemperature);
DebugOut() << print_string << endl;
break;
case 3:
- lrPressure = (buf[0]-40) * PRESSURE_SCALE;
+ lrPressure = (buf[0]-40) * PRESSURE_SCALE * KPA_MULTIPLIER;
lrTemperature = buf[1]-40;
- sprintf(print_string, "TPMS: Left rear pressure = %5.2f bar, temperature = %5.1f degrees Celsius", lrPressure, lrTemperature);
+ sprintf(print_string, "TPMS: Left rear pressure = %5.1f kPa, temperature = %5.1f degrees Celsius", lrPressure, lrTemperature);
DebugOut() << print_string << endl;
break;
case 4:
- rrPressure = (buf[0]-40) * PRESSURE_SCALE;
+ rrPressure = (buf[0]-40) * PRESSURE_SCALE * KPA_MULTIPLIER;
rrTemperature = buf[1]-40;
- sprintf(print_string, "TPMS: Right rear pressure = %5.2f bar, temperature = %5.1f degrees Celsius", rrPressure, rrTemperature);
+ sprintf(print_string, "TPMS: Right rear pressure = %5.1f kPa, temperature = %5.1f degrees Celsius", rrPressure, rrTemperature);
DebugOut() << print_string << endl;
break;
}