| commit | 87dc7bb50ccbe5e5874e19b33e1b28e385103de9 | [log] [tgz] |
|---|---|---|
| author | Austin Schuh <austin@peloton-tech.com> | Mon Oct 29 21:53:23 2018 -0700 |
| committer | Austin Schuh <austin@peloton-tech.com> | Mon Oct 29 21:56:04 2018 -0700 |
| tree | 5012c5c7b6c8de6ed8926e062e8567408199e941 | |
| parent | 59b3b5be16fa8dffb5dcef5c52bd4c236426ae10 [diff] | |
| parent | 8fec4f4e95c43ec46e7d1fd923ba5315dccc4039 [diff] |
Upgrade gflags to master Merge commit 'cb7bb2b58469b0ba5132fbcf4893b2ca76dead1c' into master Change-Id: Id6b07c15b3bef794984d6f326d6596f043d1dde5
diff --git a/y2018/control_loops/superstructure/arm/dynamics.h b/y2018/control_loops/superstructure/arm/dynamics.h index 3624f58..cdbd6fe 100644 --- a/y2018/control_loops/superstructure/arm/dynamics.h +++ b/y2018/control_loops/superstructure/arm/dynamics.h
@@ -4,7 +4,7 @@ #include "Eigen/Dense" #include "frc971/control_loops/runge_kutta.h" -#include "third_party/gflags/include/gflags/gflags.h" +#include "gflags/gflags.h" DECLARE_bool(gravity);
diff --git a/y2018/control_loops/superstructure/arm/trajectory.cc b/y2018/control_loops/superstructure/arm/trajectory.cc index d251330..2157ca7 100644 --- a/y2018/control_loops/superstructure/arm/trajectory.cc +++ b/y2018/control_loops/superstructure/arm/trajectory.cc
@@ -4,7 +4,7 @@ #include "aos/logging/logging.h" #include "frc971/control_loops/dlqr.h" #include "frc971/control_loops/jacobian.h" -#include "third_party/gflags/include/gflags/gflags.h" +#include "gflags/gflags.h" #include "y2018/control_loops/superstructure/arm/dynamics.h" DEFINE_double(lqr_proximal_pos, 0.15, "Position LQR gain");
diff --git a/y2018/control_loops/superstructure/arm/trajectory_plot.cc b/y2018/control_loops/superstructure/arm/trajectory_plot.cc index b1e089c..eb3f7c1 100644 --- a/y2018/control_loops/superstructure/arm/trajectory_plot.cc +++ b/y2018/control_loops/superstructure/arm/trajectory_plot.cc
@@ -1,6 +1,6 @@ #include "y2018/control_loops/superstructure/arm/trajectory.h" -#include "third_party/gflags/include/gflags/gflags.h" +#include "gflags/gflags.h" #include "third_party/matplotlib-cpp/matplotlibcpp.h" #include "y2018/control_loops/superstructure/arm/dynamics.h" #include "y2018/control_loops/superstructure/arm/ekf.h"