commit 02ff9ecbb95c884bea0b02ee4b375dad2d7484eb
author Austin Schuh <austin.linux@gmail.com> Sat Dec 19 13:58:00 2020 -0800
committer Gerrit Code Review <gerrit@software.frc971.org> Sat Dec 19 13:58:00 2020 -0800
tree bf928da91d4eca8b0d083cee0db1798d84d5a503
parent 1a47f93f3c76e00f4919b7e8fb8933dee369be67
parent 1ca49e9bfcd0f376542e438fd2c80e7e4ecfab07

Merge changes I8894689f,I943de460,If81b3186

* changes:
  Quiet down message_bridge_test to reduce flakes
  Put remote boot UUID in ServerStatistics and RemoteMessage
  Switch magic timestamp channel to RemoteMessage

aos/events/logging/logger.cc

diff --git a/aos/events/logging/logger.cc b/aos/events/logging/logger.cc
index a8bf77c..a73d678 100644
--- a/aos/events/logging/logger.cc
+++ b/aos/events/logging/logger.cc
@@ -1571,7 +1571,7 @@
                        << "): Time skipped the next event.";
         }
         for (size_t i = 0; i < states_.size(); ++i) {
-          if (states_[i]->monotonic_now() >= before_times[i] - kTolerance) {
+          if (states_[i]->monotonic_now() < before_times[i] - kTolerance) {
             LOG(WARNING) << "Check failed: "
                             "states_[i]->monotonic_now() "
                             ">= before_times[i] - kTolerance ("
@@ -1580,12 +1580,12 @@
                          << ") : Time changed too much on node "
                          << MaybeNodeName(states_[i]->event_loop()->node());
           }
-          if (states_[i]->monotonic_now() <= before_times[i] + kTolerance) {
+          if (states_[i]->monotonic_now() > before_times[i] + kTolerance) {
             LOG(WARNING) << "Check failed: "
                             "states_[i]->monotonic_now() "
                             "<= before_times[i] + kTolerance ("
                          << states_[i]->monotonic_now() << " vs. "
-                         << before_times[i] - kTolerance
+                         << before_times[i] + kTolerance
                          << ") : Time changed too much on node "
                          << MaybeNodeName(states_[i]->event_loop()->node());
           }

aos/network/www/plotter.ts

diff --git a/aos/network/www/plotter.ts b/aos/network/www/plotter.ts
index 4a51c34..c10ff80 100644
--- a/aos/network/www/plotter.ts
+++ b/aos/network/www/plotter.ts
@@ -199,9 +199,9 @@
     case 0:
       return MouseButton.Left;
     case 1:
-      return MouseButton.Right;
-    case 2:
       return MouseButton.Middle;
+    case 2:
+      return MouseButton.Right;
   }
 }
 
@@ -212,9 +212,9 @@
     // we would expect them to be given the .button field.
     case MouseButton.Left:
       return 0 !== (event.buttons & 0x1);
-    case MouseButton.Middle:
-      return 0 !== (event.buttons & 0x2);
     case MouseButton.Right:
+      return 0 !== (event.buttons & 0x2);
+    case MouseButton.Middle:
       return 0 !== (event.buttons & 0x4);
   }
 }