tools/battor_agent: Prints real BattOr samples instead of raw ones

tools/battor_agent/battor_agent.cc

Index: tools/battor_agent/battor_agent.cc
diff --git a/tools/battor_agent/battor_agent.cc b/tools/battor_agent/battor_agent.cc
index 48ab7bd296e502e863ffc762a3f3fc4067b51dea..28ecee8d0a316cea80f05377c4210de83e702f88 100644
--- a/tools/battor_agent/battor_agent.cc
+++ b/tools/battor_agent/battor_agent.cc
@@ -4,9 +4,12 @@
 
 #include "tools/battor_agent/battor_agent.h"
 
+#include <iomanip>
+
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "tools/battor_agent/battor_connection_impl.h"
+#include "tools/battor_agent/battor_sample_converter.h"
 
 using std::vector;
 
@@ -87,16 +90,6 @@ bool ParseSampleFrame(BattOrMessageType type,
   return true;
 }
 
-std::string SamplesToString(const vector<RawBattOrSample>& samples) {
-  // TODO(charliea): Print the samples in a better trace format.
-  std::stringstream trace_stream;
-  for (auto sample : samples)
-    trace_stream << sample.voltage_raw << "/" << sample.current_raw
-                 << std::endl;
-
-  return trace_stream.str();
-}
-
 }  // namespace
 
 BattOrAgent::BattOrAgent(
@@ -399,7 +392,7 @@ void BattOrAgent::CompleteCommand(BattOrError error) {
       listener_->OnStartTracingComplete(error);
       break;
     case Command::STOP_TRACING: {
-      listener_->OnStopTracingComplete(SamplesToString(samples_), error);
+      listener_->OnStopTracingComplete(SamplesToString(), error);
       break;
     }
     case Command::INVALID:
@@ -413,4 +406,22 @@ void BattOrAgent::CompleteCommand(BattOrError error) {
   samples_.clear();
 }
 
+std::string BattOrAgent::SamplesToString() {

[nednguyen, 2016/01/14 22:41:19]

Do we have test coverage for this?

[charliea (OOO until 10-5), 2016/01/15 01:51:21]

Done.

+  if (calibration_frame_.empty() || samples_.empty() || !battor_eeprom_)
+    return "";
+
+  BattOrSampleConverter converter(*battor_eeprom_, calibration_frame_);
+
+  std::stringstream trace_stream;
+  trace_stream << std::fixed;
+  for (size_t i = 0; i < samples_.size(); i++) {
+    BattOrSample sample = converter.ToSample(samples_[i], i);
+    trace_stream << std::setprecision(2) << sample.time_ms << " "
+                 << std::setprecision(1) << sample.current_mA << " "
+                 << sample.voltage_mV << std::endl;
+  }
+
+  return trace_stream.str();
+}
+
 }  // namespace battor