[BattOr] Make BattOr able to return firmware version.

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/threading/thread_task_runner_handle.h"
 #include "tools/battor_agent/battor_connection_impl.h"
 #include "tools/battor_agent/battor_sample_converter.h"
 
 using std::vector;
@@ skipping 137 matching lines @@
 }
 
 void BattOrAgent::RecordClockSyncMarker(const std::string& marker) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   command_ = Command::RECORD_CLOCK_SYNC_MARKER;
   pending_clock_sync_marker_ = marker;
   PerformAction(Action::REQUEST_CONNECTION);
 }
 
+void BattOrAgent::GetVersion() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  command_ = Command::GET_VERSION;
+  PerformAction(Action::REQUEST_CONNECTION);
+}
+
 void BattOrAgent::BeginConnect() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   connection_->Open();
 }
 
 void BattOrAgent::OnConnectionOpened(bool success) {
   // Return immediately if opening the connection already timed out.
   if (timeout_callback_.IsCancelled())
     return;
   timeout_callback_.Cancel();
 
   if (!success) {
     CompleteCommand(BATTOR_ERROR_CONNECTION_FAILED);
     return;
   }
 
   switch (command_) {
     case Command::START_TRACING:
       num_init_attempts_ = 1;
       PerformAction(Action::SEND_INIT);
       return;
     case Command::STOP_TRACING:
       PerformAction(Action::SEND_EEPROM_REQUEST);
       return;
     case Command::RECORD_CLOCK_SYNC_MARKER:
       PerformAction(Action::SEND_CURRENT_SAMPLE_REQUEST);
       return;
+    case Command::GET_VERSION:
+      PerformAction(Action::SEND_EEPROM_REQUEST);
+      return;
     case Command::INVALID:
       NOTREACHED();
   }
 }
 
 void BattOrAgent::OnBytesSent(bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Return immediately if whatever action we were trying to perform already
   // timed out.
@@ skipping 38 matching lines @@
                                 std::unique_ptr<vector<char>> bytes) {
   // Return immediately if whatever action we were trying to perform already
   // timed out.
   if (timeout_callback_.IsCancelled())
     return;
   timeout_callback_.Cancel();
 
   if (!success) {
     switch (last_action_) {
       case Action::READ_EEPROM:
+        if (command_ == Command::GET_VERSION) {
+          CompleteCommand(BATTOR_ERROR_NONE);

[charliea (OOO until 10-5), 2016/10/05 15:19:28]

This should be the error case, not the happy case. 

Also, after any time you call CompleteCommand(), you also need to call return to
exit the function.

+        }
       case Action::READ_CALIBRATION_FRAME:
       case Action::READ_DATA_FRAME:
       case Action::READ_CURRENT_SAMPLE:
         if (num_read_attempts_++ > kMaxReadAttempts) {
           CompleteCommand(BATTOR_ERROR_RECEIVE_ERROR);
           return;
         }
 
         PerformDelayedAction(last_action_, base::TimeDelta::FromMilliseconds(
                                                kReadRetryDelayMilliseconds));
@@ skipping 50 matching lines @@
         CompleteCommand(BATTOR_ERROR_UNEXPECTED_MESSAGE);
         return;
       }
 
       CompleteCommand(BATTOR_ERROR_NONE);
       return;
 
     case Action::READ_EEPROM: {
       battor_eeprom_ = ParseEEPROM(type, *bytes);
       if (!battor_eeprom_) {
+        // Here is where the error is being thrown......................................
         CompleteCommand(BATTOR_ERROR_UNEXPECTED_MESSAGE);
         return;
       }
 
       // Make sure that we don't request samples until a safe amount of time has
       // elapsed since recording the last clock sync marker: we need to ensure
       // that the sample we synced to doesn't get thrown out.
       base::TimeTicks min_request_samples_time =
           last_clock_sync_time_ + base::TimeDelta::FromMilliseconds(
                                       kStopTracingClockSyncDelayMilliseconds);
@@ skipping 195 matching lines @@
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(&Listener::OnStopTracingComplete,
                      base::Unretained(listener_), SamplesToString(), error));
       break;
     case Command::RECORD_CLOCK_SYNC_MARKER:
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(&Listener::OnRecordClockSyncMarkerComplete,
                                 base::Unretained(listener_), error));
       break;
+// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+// Need to get proper version number.
+    case Command::GET_VERSION:
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
+          FROM_HERE, base::Bind(&Listener::OnGetVersionComplete,
+                                base::Unretained(listener_), 1, error));
+      break;
     case Command::INVALID:
       NOTREACHED();
   }
 
   last_action_ = Action::INVALID;
   command_ = Command::INVALID;
   pending_clock_sync_marker_.clear();
   battor_eeprom_.reset();
   calibration_frame_.clear();
   samples_.clear();
@@ skipping 34 matching lines @@
     if (clock_sync_marker != clock_sync_markers_.end())
       trace_stream << " <" << clock_sync_marker->second << ">";
 
     trace_stream << std::endl;
   }
 
   return trace_stream.str();
 }
 
 }  // namespace battor