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

tools/battor_agent/battor_agent.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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;
 
 namespace battor {
 
 namespace {
 
 // The number of seconds that it takes a BattOr to reset.
 const uint8_t kBattOrResetTimeSeconds = 2;
 
@@ skipping 60 matching lines @@
   size_t remaining_bytes = msg.size() - sizeof(BattOrFrameHeader);
   if (remaining_bytes != frame_header->length)
     return false;
 
   samples->resize(remaining_bytes / sizeof(RawBattOrSample));
   memcpy(samples->data(), frame_ptr, remaining_bytes);
 
   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(
     const std::string& path,
     Listener* listener,
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread_task_runner)
     : connection_(new BattOrConnectionImpl(path,
                                            this,
                                            file_thread_task_runner,
@@ skipping 282 matching lines @@
   BattOrControlMessage msg{type, param1, param2};
   connection_->SendBytes(BATTOR_MESSAGE_TYPE_CONTROL, &msg, sizeof(msg));
 }
 
 void BattOrAgent::CompleteCommand(BattOrError error) {
   switch (command_) {
     case Command::START_TRACING:
       listener_->OnStartTracingComplete(error);
       break;
     case Command::STOP_TRACING: {
-      listener_->OnStopTracingComplete(SamplesToString(samples_), error);
+      listener_->OnStopTracingComplete(SamplesToString(), error);
       break;
     }
     case Command::INVALID:
       NOTREACHED();
   }
 
   last_action_ = Action::INVALID;
   command_ = Command::INVALID;
   battor_eeprom_.reset();
   calibration_frame_.clear();
   samples_.clear();
 }
 
+std::string BattOrAgent::SamplesToString() {
+  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