Merge "Removed mallocs from polydrive code"
diff --git a/NO_BUILD_AMD64 b/NO_BUILD_AMD64
index faa75a9..1f39e78 100644
--- a/NO_BUILD_AMD64
+++ b/NO_BUILD_AMD64
@@ -6,7 +6,7 @@
-//y2014/wpilib/...
-//y2014:download
-//y2014_bot3/wpilib/...
--//y2014_bot3:download
+-//y2014_bot3:download_stripped
-//y2015/wpilib/...
-//y2015:download
-//y2015_bot3/wpilib/...
@@ -14,3 +14,6 @@
-//y2016/wpilib/...
-//y2016:download
-//y2016:download_stripped
+-//y2016_bot3/wpilib/...
+-//y2016_bot3:download
+-//y2016_bot3:download_stripped
diff --git a/NO_BUILD_ROBORIO b/NO_BUILD_ROBORIO
index 36ae012..839238a 100644
--- a/NO_BUILD_ROBORIO
+++ b/NO_BUILD_ROBORIO
@@ -7,4 +7,5 @@
-//y2015/control_loops/python/...
-//y2015_bot3/control_loops/python/...
-//y2016/control_loops/python/...
+-//y2016_bot3/control_loops/python/...
-//third_party/protobuf/...
diff --git a/README.md b/README.md
index 530baa8..99d6678 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,8 @@
```console
apt-get install python libpython-dev bazel ruby clang-format-3.5 clang-3.6 gfortran libblas-dev liblapack-dev python-scipy python-matplotlib
```
- 2. Allow Bazel's sandboxing to work
+ 2. Allow Bazel's sandboxing to work:
+ Follow the direction in `doc/frc971.conf`.
Some useful Bazel commands:
* Build and test everything (on the host system):
diff --git a/aos/common/time.cc b/aos/common/time.cc
index 125b016..b2d3675 100644
--- a/aos/common/time.cc
+++ b/aos/common/time.cc
@@ -41,16 +41,6 @@
namespace aos {
-monotonic_clock::time_point monotonic_clock::now() noexcept {
- struct timespec current_time;
- if (clock_gettime(CLOCK_MONOTONIC, ¤t_time) != 0) {
- PLOG(FATAL, "clock_gettime(%jd, %p) failed",
- static_cast<uintmax_t>(CLOCK_MONOTONIC), ¤t_time);
- }
- return time_point(::std::chrono::seconds(current_time.tv_sec) +
- ::std::chrono::nanoseconds(current_time.tv_nsec));
-}
-
namespace time {
// State required to enable and use mock time.
@@ -281,4 +271,26 @@
}
} // namespace time
+
+constexpr monotonic_clock::time_point monotonic_clock::min_time;
+
+monotonic_clock::time_point monotonic_clock::now() noexcept {
+ {
+ if (time::mock_time_enabled.load(::std::memory_order_relaxed)) {
+ MutexLocker time_mutex_locker(&time::time_mutex);
+ return monotonic_clock::time_point(
+ ::std::chrono::nanoseconds(time::current_mock_time.ToNSec()));
+ }
+ }
+
+ struct timespec current_time;
+ if (clock_gettime(CLOCK_MONOTONIC, ¤t_time) != 0) {
+ PLOG(FATAL, "clock_gettime(%jd, %p) failed",
+ static_cast<uintmax_t>(CLOCK_MONOTONIC), ¤t_time);
+ }
+ return time_point(::std::chrono::seconds(current_time.tv_sec) +
+ ::std::chrono::nanoseconds(current_time.tv_nsec));
+}
+
+
} // namespace aos
diff --git a/aos/common/time.h b/aos/common/time.h
index 40b72b0..8f57916 100644
--- a/aos/common/time.h
+++ b/aos/common/time.h
@@ -28,8 +28,13 @@
// Returns the epoch (0).
static constexpr monotonic_clock::time_point epoch() {
- return time_point(duration(0));
+ return time_point(zero());
}
+
+ static constexpr monotonic_clock::duration zero() { return duration(0); }
+
+ static constexpr time_point min_time{
+ time_point(duration(::std::numeric_limits<duration::rep>::min()))};
};
namespace time {
@@ -146,8 +151,10 @@
}
// Construct a time representing the period of hertz.
- static constexpr Time FromRate(int hertz) {
- return Time(0, kNSecInSec / hertz);
+ static constexpr ::std::chrono::nanoseconds FromRate(int hertz) {
+ return ::std::chrono::duration_cast<::std::chrono::nanoseconds>(
+ ::std::chrono::seconds(1)) /
+ hertz;
}
// Checks whether or not this time is within amount nanoseconds of other.
diff --git a/aos/common/time_test.cc b/aos/common/time_test.cc
index 3ae82ab..e1811db 100644
--- a/aos/common/time_test.cc
+++ b/aos/common/time_test.cc
@@ -255,7 +255,7 @@
}
TEST(TimeTest, FromRate) {
- EXPECT_EQ(MACRO_DARG(Time(0, Time::kNSecInSec / 100)), Time::FromRate(100));
+ EXPECT_EQ(::std::chrono::milliseconds(10), Time::FromRate(100));
}
// Test the monotonic_clock and sleep_until functions.
diff --git a/aos/common/util/phased_loop.cc b/aos/common/util/phased_loop.cc
index b5804c8..9c81ffb 100644
--- a/aos/common/util/phased_loop.cc
+++ b/aos/common/util/phased_loop.cc
@@ -10,15 +10,21 @@
frequency + Time::InUS(offset));
}
-int PhasedLoop::Iterate(const Time &now) {
- const Time next_time = Time::InNS(((now - offset_).ToNSec() + 1) /
- interval_.ToNSec() * interval_.ToNSec()) +
- ((now < offset_) ? Time::kZero : interval_) + offset_;
+int PhasedLoop::Iterate(const monotonic_clock::time_point now) {
+ const monotonic_clock::time_point next_time =
+ monotonic_clock::time_point(
+ (((now - offset_).time_since_epoch() + monotonic_clock::duration(1)) /
+ interval_) *
+ interval_) +
+ ((now.time_since_epoch() < offset_) ? monotonic_clock::zero()
+ : interval_) +
+ offset_;
- const Time difference = next_time - last_time_;
- const int result = difference.ToNSec() / interval_.ToNSec();
+ const monotonic_clock::duration difference = next_time - last_time_;
+ const int result = difference / interval_;
CHECK_EQ(difference, interval_ * result);
- CHECK_EQ(0, (next_time - offset_).ToNSec() % interval_.ToNSec());
+ CHECK_EQ(
+ 0, (next_time - offset_).time_since_epoch().count() % interval_.count());
CHECK_GE(next_time, now);
CHECK_LE(next_time - now, interval_);
last_time_ = next_time;
diff --git a/aos/common/util/phased_loop.h b/aos/common/util/phased_loop.h
index fc0f247..7614ed2 100644
--- a/aos/common/util/phased_loop.h
+++ b/aos/common/util/phased_loop.h
@@ -22,40 +22,47 @@
// ...
// 10000.1s
// offset must be >= Time::kZero and < interval.
- PhasedLoop(const Time &interval, const Time &offset = Time::kZero)
+ PhasedLoop(
+ const monotonic_clock::duration interval,
+ const monotonic_clock::duration offset = monotonic_clock::duration(0))
: interval_(interval), offset_(offset), last_time_(offset) {
- CHECK_GE(offset, Time::kZero);
- CHECK_GT(interval, Time::kZero);
+ CHECK_GE(offset, monotonic_clock::duration(0));
+ CHECK_GT(interval, monotonic_clock::duration(0));
CHECK_LT(offset, interval);
Reset();
}
// Resets the count of skipped iterations.
- // Iterate(now) will return 1 and set sleep_time() to something within
- // interval of now.
- void Reset(const Time &now = Time::Now()) { Iterate(now - interval_); }
+ // Iterate(monotonic_now) will return 1 and set sleep_time() to something
+ // within interval of monotonic_now.
+ void Reset(const monotonic_clock::time_point monotonic_now =
+ monotonic_clock::now()) {
+ Iterate(monotonic_now - interval_);
+ }
- // Calculates the next time to run after now.
+ // Calculates the next time to run after monotonic_now.
// The result can be retrieved with sleep_time().
// Returns the number of iterations which have passed (1 if this is called
- // often enough). This can be < 1 iff now goes backwards between calls.
- int Iterate(const Time &now = Time::Now());
+ // often enough). This can be < 1 iff monotonic_now goes backwards between
+ // calls.
+ int Iterate(const monotonic_clock::time_point monotonic_now =
+ monotonic_clock::now());
// Sleeps until the next time and returns the number of iterations which have
// passed.
int SleepUntilNext() {
- const int r = Iterate(Time::Now());
- SleepUntil(sleep_time());
+ const int r = Iterate(monotonic_clock::now());
+ ::std::this_thread::sleep_until(sleep_time());
return r;
}
- const Time &sleep_time() const { return last_time_; }
+ monotonic_clock::time_point sleep_time() const { return last_time_; }
private:
- const Time interval_, offset_;
+ const monotonic_clock::duration interval_, offset_;
// The time we most recently slept until.
- Time last_time_ = Time::kZero;
+ monotonic_clock::time_point last_time_ = monotonic_clock::epoch();
};
} // namespace time
diff --git a/aos/common/util/phased_loop_test.cc b/aos/common/util/phased_loop_test.cc
index 1641a92..b013c2e 100644
--- a/aos/common/util/phased_loop_test.cc
+++ b/aos/common/util/phased_loop_test.cc
@@ -8,111 +8,115 @@
namespace time {
namespace testing {
+using ::std::chrono::milliseconds;
+
class PhasedLoopTest : public ::testing::Test {
protected:
- PhasedLoopTest() {
- ::aos::testing::EnableTestLogging();
- }
+ PhasedLoopTest() { ::aos::testing::EnableTestLogging(); }
};
typedef PhasedLoopTest PhasedLoopDeathTest;
+monotonic_clock::time_point InMs(int ms) {
+ return monotonic_clock::time_point(::std::chrono::milliseconds(ms));
+}
+
TEST_F(PhasedLoopTest, Reset) {
{
- PhasedLoop loop(Time::InMS(100), Time::kZero);
+ PhasedLoop loop(milliseconds(100), milliseconds(0));
- loop.Reset(Time::kZero);
- EXPECT_EQ(Time::InMS(0), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::kZero));
- EXPECT_EQ(Time::InMS(100), loop.sleep_time());
+ loop.Reset(monotonic_clock::epoch());
+ EXPECT_EQ(InMs(0), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(monotonic_clock::epoch()));
+ EXPECT_EQ(InMs(100), loop.sleep_time());
- loop.Reset(Time::InMS(99));
- EXPECT_EQ(Time::InMS(0), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(99)));
- EXPECT_EQ(Time::InMS(100), loop.sleep_time());
+ loop.Reset(InMs(99));
+ EXPECT_EQ(InMs(0), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(99)));
+ EXPECT_EQ(InMs(100), loop.sleep_time());
- loop.Reset(Time::InMS(100));
- EXPECT_EQ(Time::InMS(100), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(199)));
- EXPECT_EQ(Time::InMS(200), loop.sleep_time());
+ loop.Reset(InMs(100));
+ EXPECT_EQ(InMs(100), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(199)));
+ EXPECT_EQ(InMs(200), loop.sleep_time());
- loop.Reset(Time::InMS(101));
- EXPECT_EQ(Time::InMS(100), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(101)));
- EXPECT_EQ(Time::InMS(200), loop.sleep_time());
+ loop.Reset(InMs(101));
+ EXPECT_EQ(InMs(100), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(101)));
+ EXPECT_EQ(InMs(200), loop.sleep_time());
}
{
- PhasedLoop loop(Time::InMS(100), Time::InMS(1));
- loop.Reset(Time::kZero);
- EXPECT_EQ(Time::InMS(-99), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::kZero));
- EXPECT_EQ(Time::InMS(1), loop.sleep_time());
+ PhasedLoop loop(milliseconds(100), milliseconds(1));
+ loop.Reset(monotonic_clock::epoch());
+ EXPECT_EQ(InMs(-99), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(monotonic_clock::epoch()));
+ EXPECT_EQ(InMs(1), loop.sleep_time());
}
{
- PhasedLoop loop(Time::InMS(100), Time::InMS(99));
+ PhasedLoop loop(milliseconds(100), milliseconds(99));
- loop.Reset(Time::kZero);
- EXPECT_EQ(Time::InMS(-1), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::kZero));
- EXPECT_EQ(Time::InMS(99), loop.sleep_time());
+ loop.Reset(monotonic_clock::epoch());
+ EXPECT_EQ(InMs(-1), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(monotonic_clock::epoch()));
+ EXPECT_EQ(InMs(99), loop.sleep_time());
- loop.Reset(Time::InMS(98));
- EXPECT_EQ(Time::InMS(-1), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(98)));
- EXPECT_EQ(Time::InMS(99), loop.sleep_time());
+ loop.Reset(InMs(98));
+ EXPECT_EQ(InMs(-1), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(98)));
+ EXPECT_EQ(InMs(99), loop.sleep_time());
- loop.Reset(Time::InMS(99));
- EXPECT_EQ(Time::InMS(99), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(99)));
- EXPECT_EQ(Time::InMS(199), loop.sleep_time());
+ loop.Reset(InMs(99));
+ EXPECT_EQ(InMs(99), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(99)));
+ EXPECT_EQ(InMs(199), loop.sleep_time());
- loop.Reset(Time::InMS(100));
- EXPECT_EQ(Time::InMS(99), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(100)));
- EXPECT_EQ(Time::InMS(199), loop.sleep_time());
+ loop.Reset(InMs(100));
+ EXPECT_EQ(InMs(99), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(100)));
+ EXPECT_EQ(InMs(199), loop.sleep_time());
}
}
TEST_F(PhasedLoopTest, Iterate) {
{
- PhasedLoop loop(Time::InMS(100), Time::InMS(99));
- loop.Reset(Time::kZero);
- EXPECT_EQ(1, loop.Iterate(Time::kZero));
- EXPECT_EQ(Time::InMS(99), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(100)));
- EXPECT_EQ(Time::InMS(199), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(100)));
- EXPECT_EQ(Time::InMS(199), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(101)));
- EXPECT_EQ(Time::InMS(199), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(198)));
- EXPECT_EQ(Time::InMS(199), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(199)));
- EXPECT_EQ(Time::InMS(299), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(300)));
- EXPECT_EQ(Time::InMS(399), loop.sleep_time());
- EXPECT_EQ(3, loop.Iterate(Time::InMS(600)));
- EXPECT_EQ(Time::InMS(699), loop.sleep_time());
+ PhasedLoop loop(milliseconds(100), milliseconds(99));
+ loop.Reset(monotonic_clock::epoch());
+ EXPECT_EQ(1, loop.Iterate(monotonic_clock::epoch()));
+ EXPECT_EQ(InMs(99), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(100)));
+ EXPECT_EQ(InMs(199), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(100)));
+ EXPECT_EQ(InMs(199), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(101)));
+ EXPECT_EQ(InMs(199), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(198)));
+ EXPECT_EQ(InMs(199), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(199)));
+ EXPECT_EQ(InMs(299), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(300)));
+ EXPECT_EQ(InMs(399), loop.sleep_time());
+ EXPECT_EQ(3, loop.Iterate(InMs(600)));
+ EXPECT_EQ(InMs(699), loop.sleep_time());
}
{
- PhasedLoop loop(Time::InMS(100), Time::InMS(1));
- loop.Reset(Time::kZero);
- EXPECT_EQ(1, loop.Iterate(Time::kZero));
- EXPECT_EQ(Time::InMS(1), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(100)));
- EXPECT_EQ(Time::InMS(101), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(100)));
- EXPECT_EQ(Time::InMS(101), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(103)));
- EXPECT_EQ(Time::InMS(201), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(198)));
- EXPECT_EQ(Time::InMS(201), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(200)));
- EXPECT_EQ(Time::InMS(201), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(201)));
- EXPECT_EQ(Time::InMS(301), loop.sleep_time());
- EXPECT_EQ(3, loop.Iterate(Time::InMS(600)));
- EXPECT_EQ(Time::InMS(601), loop.sleep_time());
+ PhasedLoop loop(milliseconds(100), milliseconds(1));
+ loop.Reset(monotonic_clock::epoch());
+ EXPECT_EQ(1, loop.Iterate(monotonic_clock::epoch()));
+ EXPECT_EQ(InMs(1), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(100)));
+ EXPECT_EQ(InMs(101), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(100)));
+ EXPECT_EQ(InMs(101), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(103)));
+ EXPECT_EQ(InMs(201), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(198)));
+ EXPECT_EQ(InMs(201), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(200)));
+ EXPECT_EQ(InMs(201), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(201)));
+ EXPECT_EQ(InMs(301), loop.sleep_time());
+ EXPECT_EQ(3, loop.Iterate(InMs(600)));
+ EXPECT_EQ(InMs(601), loop.sleep_time());
}
}
@@ -120,40 +124,42 @@
// This seems like a rare case at first, but starting from zero needs to
// work, which means negatives should too.
TEST_F(PhasedLoopTest, CrossingZero) {
- PhasedLoop loop(Time::InMS(100), Time::InMS(1));
- loop.Reset(Time::InMS(-1000));
- EXPECT_EQ(Time::InMS(-1099), loop.sleep_time());
- EXPECT_EQ(9, loop.Iterate(Time::InMS(-250)));
- EXPECT_EQ(Time::InMS(-199), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(-199)));
- EXPECT_EQ(Time::InMS(-99), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(-90)));
- EXPECT_EQ(Time::InMS(1), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(0)));
- EXPECT_EQ(Time::InMS(1), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(1)));
- EXPECT_EQ(Time::InMS(101), loop.sleep_time());
+ PhasedLoop loop(milliseconds(100), milliseconds(1));
+ loop.Reset(InMs(-1000));
+ EXPECT_EQ(InMs(-1099), loop.sleep_time());
+ EXPECT_EQ(9, loop.Iterate(InMs(-250)));
+ EXPECT_EQ(InMs(-199), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(-199)));
+ EXPECT_EQ(InMs(-99), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(-90)));
+ EXPECT_EQ(InMs(1), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(0)));
+ EXPECT_EQ(InMs(1), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(1)));
+ EXPECT_EQ(InMs(101), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(2)));
- EXPECT_EQ(Time::InMS(101), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(2)));
+ EXPECT_EQ(InMs(101), loop.sleep_time());
- EXPECT_EQ(-2, loop.Iterate(Time::InMS(-101)));
- EXPECT_EQ(Time::InMS(-99), loop.sleep_time());
- EXPECT_EQ(1, loop.Iterate(Time::InMS(-99)));
- EXPECT_EQ(Time::InMS(1), loop.sleep_time());
+ EXPECT_EQ(-2, loop.Iterate(InMs(-101)));
+ EXPECT_EQ(InMs(-99), loop.sleep_time());
+ EXPECT_EQ(1, loop.Iterate(InMs(-99)));
+ EXPECT_EQ(InMs(1), loop.sleep_time());
- EXPECT_EQ(0, loop.Iterate(Time::InMS(-99)));
- EXPECT_EQ(Time::InMS(1), loop.sleep_time());
+ EXPECT_EQ(0, loop.Iterate(InMs(-99)));
+ EXPECT_EQ(InMs(1), loop.sleep_time());
}
// Tests that passing invalid values to the constructor dies correctly.
TEST_F(PhasedLoopDeathTest, InvalidValues) {
- EXPECT_DEATH(PhasedLoop(Time::InMS(1), Time::InMS(2)), ".*offset<interval.*");
- EXPECT_DEATH(PhasedLoop(Time::InMS(1), Time::InMS(1)), ".*offset<interval.*");
- EXPECT_DEATH(PhasedLoop(Time::InMS(1), Time::InMS(-1)),
- ".*offset>=Time::kZero.*");
- EXPECT_DEATH(PhasedLoop(Time::InMS(0), Time::InMS(0)),
- ".*interval>Time::kZero.*");
+ EXPECT_DEATH(PhasedLoop(milliseconds(1), milliseconds(2)),
+ ".*offset<interval.*");
+ EXPECT_DEATH(PhasedLoop(milliseconds(1), milliseconds(1)),
+ ".*offset<interval.*");
+ EXPECT_DEATH(PhasedLoop(milliseconds(1), milliseconds(-1)),
+ ".*offset>=monotonic_clock::duration\\(0\\).*");
+ EXPECT_DEATH(PhasedLoop(milliseconds(0), milliseconds(0)),
+ ".*interval>monotonic_clock::duration\\(0\\).*");
}
} // namespace testing
diff --git a/aos/linux_code/ipc_lib/ipc_comparison.cc b/aos/linux_code/ipc_lib/ipc_comparison.cc
index f375a17..73c0f9b 100644
--- a/aos/linux_code/ipc_lib/ipc_comparison.cc
+++ b/aos/linux_code/ipc_lib/ipc_comparison.cc
@@ -5,6 +5,7 @@
#include <sys/un.h>
#include <pthread.h>
#include <netinet/in.h>
+#include <netinet/tcp.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -224,8 +225,12 @@
class TCPPingPonger : public FDPingPonger {
public:
- TCPPingPonger() {
+ TCPPingPonger(bool nodelay) {
server_ = PCHECK(socket(AF_INET, SOCK_STREAM, 0));
+ if (nodelay) {
+ const int yes = 1;
+ PCHECK(setsockopt(server_, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)));
+ }
{
sockaddr_in server_address;
memset(&server_address, 0, sizeof(server_address));
@@ -237,6 +242,10 @@
PCHECK(listen(server_, 1));
client_ = PCHECK(socket(AF_INET, SOCK_STREAM, 0));
+ if (nodelay) {
+ const int yes = 1;
+ PCHECK(setsockopt(client_, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)));
+ }
{
sockaddr_in client_address;
unsigned int length = sizeof(client_address);
@@ -465,19 +474,42 @@
class PthreadMutexPingPonger : public ConditionVariablePingPonger {
public:
- PthreadMutexPingPonger()
+ PthreadMutexPingPonger(int pshared, bool pi)
: ConditionVariablePingPonger(
::std::unique_ptr<ConditionVariableInterface>(
- new PthreadConditionVariable()),
+ new PthreadConditionVariable(pshared, pi)),
::std::unique_ptr<ConditionVariableInterface>(
- new PthreadConditionVariable())) {}
+ new PthreadConditionVariable(pshared, pi))) {}
private:
class PthreadConditionVariable : public ConditionVariableInterface {
public:
- PthreadConditionVariable() {
- PRCHECK(pthread_cond_init(&condition_, nullptr));
- PRCHECK(pthread_mutex_init(&mutex_, nullptr));
+ PthreadConditionVariable(bool pshared, bool pi) {
+ {
+ pthread_condattr_t cond_attr;
+ PRCHECK(pthread_condattr_init(&cond_attr));
+ if (pshared) {
+ PRCHECK(
+ pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED));
+ }
+ PRCHECK(pthread_cond_init(&condition_, &cond_attr));
+ PRCHECK(pthread_condattr_destroy(&cond_attr));
+ }
+
+ {
+ pthread_mutexattr_t mutex_attr;
+ PRCHECK(pthread_mutexattr_init(&mutex_attr));
+ if (pshared) {
+ PRCHECK(pthread_mutexattr_setpshared(&mutex_attr,
+ PTHREAD_PROCESS_SHARED));
+ }
+ if (pi) {
+ PRCHECK(
+ pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_INHERIT));
+ }
+ PRCHECK(pthread_mutex_init(&mutex_, nullptr));
+ PRCHECK(pthread_mutexattr_destroy(&mutex_attr));
+ }
}
~PthreadConditionVariable() {
PRCHECK(pthread_mutex_destroy(&mutex_));
@@ -779,7 +811,13 @@
} else if (FLAGS_method == "aos_event") {
ping_ponger.reset(new AOSEventPingPonger());
} else if (FLAGS_method == "pthread_mutex") {
- ping_ponger.reset(new PthreadMutexPingPonger());
+ ping_ponger.reset(new PthreadMutexPingPonger(false, false));
+ } else if (FLAGS_method == "pthread_mutex_pshared") {
+ ping_ponger.reset(new PthreadMutexPingPonger(true, false));
+ } else if (FLAGS_method == "pthread_mutex_pshared_pi") {
+ ping_ponger.reset(new PthreadMutexPingPonger(true, true));
+ } else if (FLAGS_method == "pthread_mutex_pi") {
+ ping_ponger.reset(new PthreadMutexPingPonger(false, true));
} else if (FLAGS_method == "aos_queue") {
ping_ponger.reset(new AOSQueuePingPonger());
} else if (FLAGS_method == "eventfd") {
@@ -803,7 +841,9 @@
} else if (FLAGS_method == "unix_seqpacket") {
ping_ponger.reset(new UnixPingPonger(SOCK_SEQPACKET));
} else if (FLAGS_method == "tcp") {
- ping_ponger.reset(new TCPPingPonger());
+ ping_ponger.reset(new TCPPingPonger(false));
+ } else if (FLAGS_method == "tcp_nodelay") {
+ ping_ponger.reset(new TCPPingPonger(true));
} else if (FLAGS_method == "udp") {
ping_ponger.reset(new UDPPingPonger());
} else {
@@ -890,6 +930,9 @@
"\taos_mutex\n"
"\taos_event\n"
"\tpthread_mutex\n"
+ "\tpthread_mutex_pshared\n"
+ "\tpthread_mutex_pshared_pi\n"
+ "\tpthread_mutex_pi\n"
"\taos_queue\n"
"\teventfd\n"
"\tsysv_semaphore\n"
@@ -902,6 +945,7 @@
"\tunix_datagram\n"
"\tunix_seqpacket\n"
"\ttcp\n"
+ "\ttcp_nodelay\n"
"\tudp\n");
::gflags::ParseCommandLineFlags(&argc, &argv, true);
diff --git a/aos/linux_code/ipc_lib/queue.cc b/aos/linux_code/ipc_lib/queue.cc
index 2738e85..b874b08 100644
--- a/aos/linux_code/ipc_lib/queue.cc
+++ b/aos/linux_code/ipc_lib/queue.cc
@@ -195,7 +195,7 @@
if (queue_length < 1) {
LOG(FATAL, "queue length %d of %s needs to be at least 1\n", queue_length,
- name_);
+ name);
}
const size_t name_size = strlen(name) + 1;
diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index f2b14a9..651976e 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -107,6 +107,8 @@
right_gear_ = ComputeGear(position->right_shifter_position,
dt_config_.right_drive, right_high_requested_);
break;
+ case ShifterType::NO_SHIFTER:
+ break;
}
kf_.set_controller_index(ControllerIndexFromGears());
@@ -138,7 +140,7 @@
// z accel is down
// x accel is the front of the robot pointed down.
Eigen::Matrix<double, 1, 1> Y;
- Y << angle;
+ Y(0, 0) = angle;
down_estimator_.Correct(Y);
}
@@ -146,7 +148,7 @@
"New IMU value from ADIS16448, rate is %f, angle %f, fused %f, bias "
"%f\n",
rate, angle, down_estimator_.X_hat(0, 0), down_estimator_.X_hat(1, 0));
- down_U_ << rate;
+ down_U_(0, 0) = rate;
}
down_estimator_.UpdateObserver(down_U_);
@@ -254,7 +256,8 @@
// Voltage error.
Eigen::Matrix<double, 2, 1> U;
- U << last_left_voltage_, last_right_voltage_;
+ U(0, 0) = last_left_voltage_;
+ U(1, 0) = last_right_voltage_;
last_left_voltage_ = left_voltage;
last_right_voltage_ = right_voltage;
diff --git a/frc971/control_loops/drivetrain/drivetrain_config.h b/frc971/control_loops/drivetrain/drivetrain_config.h
index ea76ca9..efb5f59 100644
--- a/frc971/control_loops/drivetrain/drivetrain_config.h
+++ b/frc971/control_loops/drivetrain/drivetrain_config.h
@@ -12,11 +12,12 @@
enum class ShifterType : int32_t {
HALL_EFFECT_SHIFTER = 0, // Detect when inbetween gears.
- SIMPLE_SHIFTER = 1, // Switch gears without speedmatch logic.
+ SIMPLE_SHIFTER = 1, // Switch gears without speedmatch logic.
+ NO_SHIFTER = 2, // Only one gear ratio.
};
enum class LoopType : int32_t {
- OPEN_LOOP = 0, // Only use open loop logic.
+ OPEN_LOOP = 0, // Only use open loop logic.
CLOSED_LOOP = 1, // Add in closed loop calculation.
};
@@ -32,10 +33,10 @@
::std::function<StateFeedbackLoop<2, 2, 2>()> make_v_drivetrain_loop;
::std::function<StateFeedbackLoop<7, 2, 3>()> make_kf_drivetrain_loop;
- double dt; // Control loop time step.
+ double dt; // Control loop time step.
double robot_radius; // Robot radius, in meters.
double wheel_radius; // Wheel radius, in meters.
- double v; // Motor velocity constant.
+ double v; // Motor velocity constant.
// Gear ratios, from wheel to motor shaft.
double high_gear_ratio;
@@ -50,6 +51,10 @@
bool default_high_gear;
double down_offset;
+
+ double wheel_non_linearity;
+
+ double quickturn_wheel_multiplier;
};
} // namespace drivetrain
diff --git a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
index 8d071dd..e13c606 100644
--- a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -49,7 +49,13 @@
::y2016::control_loops::drivetrain::kHighGearRatio,
::y2016::control_loops::drivetrain::kLowGearRatio,
- kThreeStateDriveShifter, kThreeStateDriveShifter, false, 0};
+ kThreeStateDriveShifter,
+ kThreeStateDriveShifter,
+ false,
+ 0,
+
+ 0.25,
+ 1.00};
return kDrivetrainConfig;
};
@@ -88,8 +94,7 @@
// Constructs a motor simulation.
// TODO(aschuh) Do we want to test the clutch one too?
DrivetrainSimulation()
- : drivetrain_plant_(
- new DrivetrainPlant(MakeDrivetrainPlant())),
+ : drivetrain_plant_(new DrivetrainPlant(MakeDrivetrainPlant())),
my_drivetrain_queue_(".frc971.control_loops.drivetrain", 0x8a8dde77,
".frc971.control_loops.drivetrain.goal",
".frc971.control_loops.drivetrain.position",
diff --git a/frc971/control_loops/drivetrain/polydrivetrain.cc b/frc971/control_loops/drivetrain/polydrivetrain.cc
index 6d3de59..654ca2c 100644
--- a/frc971/control_loops/drivetrain/polydrivetrain.cc
+++ b/frc971/control_loops/drivetrain/polydrivetrain.cc
@@ -110,15 +110,18 @@
const bool quickturn = goal.quickturn;
const bool highgear = goal.highgear;
- const double kWheelNonLinearity = 0.25;
// Apply a sin function that's scaled to make it feel better.
- const double angular_range = M_PI_2 * kWheelNonLinearity;
+ const double angular_range = M_PI_2 * dt_config_.wheel_non_linearity;
wheel_ = sin(angular_range * wheel) / sin(angular_range);
wheel_ = sin(angular_range * wheel_) / sin(angular_range);
wheel_ = 2.0 * wheel - wheel_;
quickturn_ = quickturn;
+ if (!quickturn_) {
+ wheel_ *= dt_config_.quickturn_wheel_multiplier;
+ }
+
static const double kThrottleDeadband = 0.05;
if (::std::abs(throttle) < kThrottleDeadband) {
throttle_ = 0;
diff --git a/frc971/control_loops/python/control_loop.py b/frc971/control_loops/python/control_loop.py
index 951a114..d6bd85f 100644
--- a/frc971/control_loops/python/control_loop.py
+++ b/frc971/control_loops/python/control_loop.py
@@ -244,18 +244,10 @@
"""
ans = [' Eigen::Matrix<double, %d, %d> %s;\n' % (
matrix.shape[0], matrix.shape[1], matrix_name)]
- first = True
for x in xrange(matrix.shape[0]):
for y in xrange(matrix.shape[1]):
- element = matrix[x, y]
- if first:
- ans.append(' %s << ' % matrix_name)
- first = False
- else:
- ans.append(', ')
- ans.append(str(element))
+ ans.append(' %s(%d, %d) = %s;\n' % (matrix_name, x, y, repr(matrix[x, y])))
- ans.append(';\n')
return ''.join(ans)
def DumpPlantHeader(self):
diff --git a/frc971/wpilib/pdp_fetcher.cc b/frc971/wpilib/pdp_fetcher.cc
index 4e6be32..846de60 100644
--- a/frc971/wpilib/pdp_fetcher.cc
+++ b/frc971/wpilib/pdp_fetcher.cc
@@ -1,5 +1,7 @@
#include "frc971/wpilib/pdp_fetcher.h"
+#include <chrono>
+
#include "aos/common/logging/queue_logging.h"
#include "aos/linux_code/init.h"
#include "aos/common/util/phased_loop.h"
@@ -12,8 +14,8 @@
::aos::SetCurrentThreadName("PDPFetcher");
::std::unique_ptr<PowerDistributionPanel> pdp(new PowerDistributionPanel());
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(4));
while (true) {
{
diff --git a/y2012/wpilib/wpilib_interface.cc b/y2012/wpilib/wpilib_interface.cc
index 6702dc4..290f067 100644
--- a/y2012/wpilib/wpilib_interface.cc
+++ b/y2012/wpilib/wpilib_interface.cc
@@ -3,6 +3,7 @@
#include <unistd.h>
#include <inttypes.h>
+#include <chrono>
#include <thread>
#include <mutex>
#include <functional>
@@ -104,8 +105,8 @@
&DriverStation::GetInstance();
#endif
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
::aos::SetCurrentThreadRealtimePriority(40);
while (run_) {
@@ -183,8 +184,8 @@
::aos::SetCurrentThreadName("Solenoids");
::aos::SetCurrentThreadRealtimePriority(27);
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(1));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
while (run_) {
{
diff --git a/y2014/control_loops/drivetrain/drivetrain_base.cc b/y2014/control_loops/drivetrain/drivetrain_base.cc
index 96b27a6..4df1a0f 100644
--- a/y2014/control_loops/drivetrain/drivetrain_base.cc
+++ b/y2014/control_loops/drivetrain/drivetrain_base.cc
@@ -32,7 +32,9 @@
constants::GetValues().left_drive,
constants::GetValues().right_drive,
true,
- 0};
+ 0,
+ 0.25,
+ 1.0};
return kDrivetrainConfig;
};
diff --git a/y2014/joystick_reader.cc b/y2014/joystick_reader.cc
index d2d1375..fcfe33c 100644
--- a/y2014/joystick_reader.cc
+++ b/y2014/joystick_reader.cc
@@ -191,10 +191,6 @@
const double kThrottleGain = 1.0 / 2.5;
if (false && (data.IsPressed(kDriveControlLoopEnable1) ||
data.IsPressed(kDriveControlLoopEnable2))) {
- // TODO(austin): Static sucks!
- static double distance = 0.0;
- static double angle = 0.0;
- static double filtered_goal_distance = 0.0;
if (data.PosEdge(kDriveControlLoopEnable1) ||
data.PosEdge(kDriveControlLoopEnable2)) {
if (drivetrain_queue.position.FetchLatest() &&
@@ -504,6 +500,10 @@
double goal_angle_;
double separation_angle_, shot_separation_angle_;
double velocity_compensation_;
+ // Distance, angle, and filtered goal for closed loop driving.
+ double distance;
+ double angle;
+ double filtered_goal_distance;
double intake_power_;
bool was_running_;
bool moving_for_shot_ = false;
diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index 5195ab6..a53d54b 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/wpilib/wpilib_interface.cc
@@ -4,6 +4,7 @@
#include <inttypes.h>
#include <thread>
+#include <chrono>
#include <mutex>
#include <functional>
@@ -260,8 +261,8 @@
bottom_reader_.Start();
dma_synchronizer_->Start();
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
::aos::SetCurrentThreadRealtimePriority(40);
while (run_) {
@@ -504,8 +505,8 @@
::aos::SetCurrentThreadName("Solenoids");
::aos::SetCurrentThreadRealtimePriority(27);
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(1));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
while (run_) {
{
diff --git a/y2014_bot3/control_loops/drivetrain/drivetrain_base.cc b/y2014_bot3/control_loops/drivetrain/drivetrain_base.cc
index bca3f24..1ebc4e9 100644
--- a/y2014_bot3/control_loops/drivetrain/drivetrain_base.cc
+++ b/y2014_bot3/control_loops/drivetrain/drivetrain_base.cc
@@ -37,7 +37,10 @@
// No shifter sensors, so we could put anything for the things below.
kThreeStateDriveShifter,
kThreeStateDriveShifter,
- false};
+ false,
+ 0.0,
+ 0.60,
+ 0.60};
return kDrivetrainConfig;
};
diff --git a/y2014_bot3/control_loops/python/drivetrain.py b/y2014_bot3/control_loops/python/drivetrain.py
index b0555a0..4c3577b 100755
--- a/y2014_bot3/control_loops/python/drivetrain.py
+++ b/y2014_bot3/control_loops/python/drivetrain.py
@@ -75,9 +75,9 @@
# Mass of the robot, in kg.
self.m = 37
# Radius of the robot, in meters (requires tuning by hand)
- self.rb = 0.601 / 2.0
+ self.rb = 0.45 / 2.0
# Radius of the wheels, in meters.
- self.r = 0.0508
+ self.r = 0.04445
# Resistance of the motor, divided by the number of motors.
self.resistance = 12.0 / self.stall_current
# Motor velocity constant
diff --git a/y2014_bot3/joystick_reader.cc b/y2014_bot3/joystick_reader.cc
index 86f78dc..22610ae 100644
--- a/y2014_bot3/joystick_reader.cc
+++ b/y2014_bot3/joystick_reader.cc
@@ -66,8 +66,6 @@
void HandleDrivetrain(const ::aos::input::driver_station::Data &data) {
bool is_control_loop_driving = false;
- static double left_goal = 0.0;
- static double right_goal = 0.0;
const double wheel = -data.GetAxis(kSteeringWheel);
const double throttle = -data.GetAxis(kDriveThrottle);
@@ -139,6 +137,9 @@
bool auto_running_ = false;
bool is_high_gear_;
+ // Turning goals.
+ double left_goal;
+ double right_goal;
::aos::util::SimpleLogInterval no_drivetrain_status_ =
::aos::util::SimpleLogInterval(::aos::time::Time::InSeconds(0.2), WARNING,
diff --git a/y2014_bot3/wpilib/wpilib_interface.cc b/y2014_bot3/wpilib/wpilib_interface.cc
index 5692465..4abbfce 100644
--- a/y2014_bot3/wpilib/wpilib_interface.cc
+++ b/y2014_bot3/wpilib/wpilib_interface.cc
@@ -3,6 +3,7 @@
#include <unistd.h>
#include <inttypes.h>
+#include <chrono>
#include <thread>
#include <mutex>
#include <functional>
@@ -97,8 +98,8 @@
&DriverStation::GetInstance();
#endif
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
::aos::SetCurrentThreadRealtimePriority(40);
while (run_) {
@@ -185,8 +186,8 @@
::aos::SetCurrentThreadName("Solenoids");
::aos::SetCurrentThreadRealtimePriority(27);
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(1));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
while (run_) {
{
diff --git a/y2015/wpilib/wpilib_interface.cc b/y2015/wpilib/wpilib_interface.cc
index 3130424..14ca146 100644
--- a/y2015/wpilib/wpilib_interface.cc
+++ b/y2015/wpilib/wpilib_interface.cc
@@ -3,9 +3,10 @@
#include <unistd.h>
#include <inttypes.h>
-#include <thread>
-#include <mutex>
+#include <chrono>
#include <functional>
+#include <mutex>
+#include <thread>
#include "Encoder.h"
#include "Talon.h"
@@ -241,8 +242,8 @@
wrist_encoder_.Start();
dma_synchronizer_->Start();
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
::aos::SetCurrentThreadRealtimePriority(40);
while (run_) {
@@ -418,8 +419,8 @@
::aos::SetCurrentThreadName("Solenoids");
::aos::SetCurrentThreadRealtimePriority(27);
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(1));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
while (run_) {
{
diff --git a/y2015_bot3/wpilib/wpilib_interface.cc b/y2015_bot3/wpilib/wpilib_interface.cc
index cb2acf1..bbfa91e 100644
--- a/y2015_bot3/wpilib/wpilib_interface.cc
+++ b/y2015_bot3/wpilib/wpilib_interface.cc
@@ -3,6 +3,7 @@
#include <unistd.h>
#include <inttypes.h>
+#include <chrono>
#include <thread>
#include <mutex>
#include <functional>
@@ -137,8 +138,8 @@
&DriverStation::GetInstance();
#endif
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
::aos::SetCurrentThreadRealtimePriority(40);
while (run_) {
@@ -242,8 +243,8 @@
::aos::SetCurrentThreadName("Solenoids");
::aos::SetCurrentThreadRealtimePriority(27);
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(1));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
while (run_) {
{
diff --git a/y2016/actors/BUILD b/y2016/actors/BUILD
index 453d49e..cfbeb2b 100644
--- a/y2016/actors/BUILD
+++ b/y2016/actors/BUILD
@@ -5,60 +5,12 @@
filegroup(
name = 'binaries',
srcs = [
- ':drivetrain_action',
':superstructure_action',
':autonomous_action',
],
)
queue_library(
- name = 'drivetrain_action_queue',
- srcs = [
- 'drivetrain_action.q',
- ],
- deps = [
- '//aos/common/actions:action_queue',
- ],
-)
-
-cc_library(
- name = 'drivetrain_action_lib',
- srcs = [
- 'drivetrain_actor.cc',
- ],
- hdrs = [
- 'drivetrain_actor.h',
- ],
- deps = [
- ':drivetrain_action_queue',
- '//aos/common:time',
- '//aos/common:math',
- '//aos/common/util:phased_loop',
- '//aos/common/logging',
- '//aos/common/actions:action_lib',
- '//aos/common/logging:queue_logging',
- '//aos/common/util:trapezoid_profile',
- '//frc971/control_loops/drivetrain:drivetrain_queue',
- '//frc971/control_loops:state_feedback_loop',
- '//third_party/eigen',
- '//y2016:constants',
- '//y2016/control_loops/drivetrain:polydrivetrain_plants',
- ],
-)
-
-cc_binary(
- name = 'drivetrain_action',
- srcs = [
- 'drivetrain_actor_main.cc',
- ],
- deps = [
- ':drivetrain_action_lib',
- ':drivetrain_action_queue',
- '//aos/linux_code:init',
- ],
-)
-
-queue_library(
name = 'superstructure_action_queue',
srcs = [
'superstructure_action.q',
diff --git a/y2016/actors/autonomous_actor.cc b/y2016/actors/autonomous_actor.cc
index 1f5b3df..f298420 100644
--- a/y2016/actors/autonomous_actor.cc
+++ b/y2016/actors/autonomous_actor.cc
@@ -2,6 +2,7 @@
#include <inttypes.h>
+#include <chrono>
#include <cmath>
#include "aos/common/util/phased_loop.h"
@@ -102,8 +103,8 @@
return;
}
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
// Poll the running bit and see if we should cancel.
phased_loop.SleepUntilNext();
@@ -116,8 +117,8 @@
constexpr double kDoNotTurnCare = 2.0;
bool AutonomousActor::WaitForDriveNear(double distance, double angle) {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
constexpr double kPositionTolerance = 0.02;
constexpr double kProfileTolerance = 0.001;
@@ -164,8 +165,8 @@
}
bool AutonomousActor::WaitForDriveProfileDone() {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
constexpr double kProfileTolerance = 0.001;
while (true) {
@@ -187,8 +188,8 @@
}
bool AutonomousActor::WaitForMaxBy(double angle) {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
double max_angle = -M_PI;
while (true) {
if (ShouldCancel()) {
@@ -211,8 +212,8 @@
}
bool AutonomousActor::WaitForAboveAngle(double angle) {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
if (ShouldCancel()) {
return false;
@@ -231,8 +232,8 @@
}
bool AutonomousActor::WaitForBelowAngle(double angle) {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
if (ShouldCancel()) {
return false;
@@ -276,8 +277,8 @@
}
bool AutonomousActor::WaitForDriveDone() {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
if (ShouldCancel()) {
@@ -397,8 +398,8 @@
LOG(ERROR, "Sending shooter goal failed.\n");
}
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
if (ShouldCancel()) return;
@@ -414,8 +415,8 @@
}
void AutonomousActor::WaitForShooterSpeed() {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
if (ShouldCancel()) return;
@@ -442,8 +443,8 @@
double last_angle = 0.0;
int ready_to_fire = 0;
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
::aos::time::Time end_time =
::aos::time::Time::Now() + align_duration;
while (end_time > ::aos::time::Time::Now()) {
@@ -785,8 +786,8 @@
}
void AutonomousActor::WaitForBallOrDriveDone() {
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
if (ShouldCancel()) {
return;
@@ -1091,6 +1092,7 @@
break;
case 5:
+ case 15:
TwoBallAuto();
return true;
break;
@@ -1166,8 +1168,8 @@
LOG(INFO, "Done %f\n", (aos::time::Time::Now() - start_time).ToSeconds());
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (!ShouldCancel()) {
phased_loop.SleepUntilNext();
diff --git a/y2016/actors/drivetrain_action.q b/y2016/actors/drivetrain_action.q
deleted file mode 100644
index 9bbebb2..0000000
--- a/y2016/actors/drivetrain_action.q
+++ /dev/null
@@ -1,29 +0,0 @@
-package y2016.actors;
-
-import "aos/common/actions/actions.q";
-
-// Parameters to send with start.
-struct DrivetrainActionParams {
- double left_initial_position;
- double right_initial_position;
- double y_offset;
- double theta_offset;
- double maximum_velocity;
- double maximum_acceleration;
- double maximum_turn_velocity;
- double maximum_turn_acceleration;
-};
-
-queue_group DrivetrainActionQueueGroup {
- implements aos.common.actions.ActionQueueGroup;
-
- message Goal {
- uint32_t run;
- DrivetrainActionParams params;
- };
-
- queue Goal goal;
- queue aos.common.actions.Status status;
-};
-
-queue_group DrivetrainActionQueueGroup drivetrain_action;
diff --git a/y2016/actors/drivetrain_actor.cc b/y2016/actors/drivetrain_actor.cc
deleted file mode 100644
index 2c7c0e5..0000000
--- a/y2016/actors/drivetrain_actor.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-#include "y2016/actors/drivetrain_actor.h"
-
-#include <functional>
-#include <numeric>
-
-#include <Eigen/Dense>
-
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/util/trapezoid_profile.h"
-#include "aos/common/commonmath.h"
-#include "aos/common/time.h"
-
-#include "y2016/actors/drivetrain_actor.h"
-#include "y2016/constants.h"
-#include "y2016/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
-#include "frc971/control_loops/drivetrain/drivetrain.q.h"
-
-namespace y2016 {
-namespace actors {
-
-DrivetrainActor::DrivetrainActor(actors::DrivetrainActionQueueGroup *s)
- : aos::common::actions::ActorBase<actors::DrivetrainActionQueueGroup>(s),
- loop_(::y2016::control_loops::drivetrain::MakeDrivetrainLoop()) {
- loop_.set_controller_index(3);
-}
-
-bool DrivetrainActor::RunAction(const actors::DrivetrainActionParams ¶ms) {
- static const auto K = loop_.K();
-
- const double yoffset = params.y_offset;
- const double turn_offset =
- params.theta_offset * control_loops::drivetrain::kRobotRadius;
- LOG(INFO, "Going to move %f and turn %f\n", yoffset, turn_offset);
-
- // Measured conversion to get the distance right.
- ::aos::util::TrapezoidProfile profile(::aos::time::Time::InMS(5));
- ::aos::util::TrapezoidProfile turn_profile(::aos::time::Time::InMS(5));
- const double goal_velocity = 0.0;
- const double epsilon = 0.01;
- ::Eigen::Matrix<double, 2, 1> left_goal_state, right_goal_state;
-
- profile.set_maximum_acceleration(params.maximum_acceleration);
- profile.set_maximum_velocity(params.maximum_velocity);
- turn_profile.set_maximum_acceleration(
- params.maximum_turn_acceleration *
- control_loops::drivetrain::kRobotRadius);
- turn_profile.set_maximum_velocity(params.maximum_turn_velocity *
- control_loops::drivetrain::kRobotRadius);
-
- while (true) {
- ::aos::time::PhasedLoopXMS(5, 2500);
-
- ::frc971::control_loops::drivetrain_queue.status.FetchLatest();
- if (::frc971::control_loops::drivetrain_queue.status.get()) {
- const auto &status = *::frc971::control_loops::drivetrain_queue.status;
- if (::std::abs(status.uncapped_left_voltage -
- status.uncapped_right_voltage) > 24) {
- LOG(DEBUG, "spinning in place\n");
- // They're more than 24V apart, so stop moving forwards and let it deal
- // with spinning first.
- profile.SetGoal(
- (status.estimated_left_position + status.estimated_right_position -
- params.left_initial_position - params.right_initial_position) /
- 2.0);
- } else {
- static const double divisor = K(0, 0) + K(0, 2);
- double dx_left, dx_right;
-
- if (status.uncapped_left_voltage > 12.0) {
- dx_left = (status.uncapped_left_voltage - 12.0) / divisor;
- } else if (status.uncapped_left_voltage < -12.0) {
- dx_left = (status.uncapped_left_voltage + 12.0) / divisor;
- } else {
- dx_left = 0;
- }
-
- if (status.uncapped_right_voltage > 12.0) {
- dx_right = (status.uncapped_right_voltage - 12.0) / divisor;
- } else if (status.uncapped_right_voltage < -12.0) {
- dx_right = (status.uncapped_right_voltage + 12.0) / divisor;
- } else {
- dx_right = 0;
- }
-
- double dx;
-
- if (dx_left == 0 && dx_right == 0) {
- dx = 0;
- } else if (dx_left != 0 && dx_right != 0 &&
- ::aos::sign(dx_left) != ::aos::sign(dx_right)) {
- // Both saturating in opposite directions. Don't do anything.
- LOG(DEBUG, "Saturating opposite ways, not adjusting\n");
- dx = 0;
- } else if (::std::abs(dx_left) > ::std::abs(dx_right)) {
- dx = dx_left;
- } else {
- dx = dx_right;
- }
-
- if (dx != 0) {
- LOG(DEBUG, "adjusting goal by %f\n", dx);
- profile.MoveGoal(-dx);
- }
- }
- } else {
- // If we ever get here, that's bad and we should just give up
- LOG(ERROR, "no drivetrain status!\n");
- return false;
- }
-
- const auto drive_profile_goal_state =
- profile.Update(yoffset, goal_velocity);
- const auto turn_profile_goal_state = turn_profile.Update(turn_offset, 0.0);
- left_goal_state = drive_profile_goal_state - turn_profile_goal_state;
- right_goal_state = drive_profile_goal_state + turn_profile_goal_state;
-
- if (::std::abs(drive_profile_goal_state(0, 0) - yoffset) < epsilon &&
- ::std::abs(turn_profile_goal_state(0, 0) - turn_offset) < epsilon) {
- break;
- }
-
- if (ShouldCancel()) return true;
-
- LOG(DEBUG, "Driving left to %f, right to %f\n",
- left_goal_state(0, 0) + params.left_initial_position,
- right_goal_state(0, 0) + params.right_initial_position);
- ::frc971::control_loops::drivetrain_queue.goal.MakeWithBuilder()
- .control_loop_driving(true)
- .highgear(true)
- .left_goal(left_goal_state(0, 0) + params.left_initial_position)
- .right_goal(right_goal_state(0, 0) + params.right_initial_position)
- .left_velocity_goal(left_goal_state(1, 0))
- .right_velocity_goal(right_goal_state(1, 0))
- .Send();
- }
- if (ShouldCancel()) return true;
- ::frc971::control_loops::drivetrain_queue.status.FetchLatest();
-
- while (!::frc971::control_loops::drivetrain_queue.status.get()) {
- LOG(WARNING,
- "No previous drivetrain status packet, trying to fetch again\n");
- ::frc971::control_loops::drivetrain_queue.status.FetchNextBlocking();
- if (ShouldCancel()) return true;
- }
-
- while (true) {
- if (ShouldCancel()) return true;
- const double kPositionThreshold = 0.05;
-
- const double left_error =
- ::std::abs(::frc971::control_loops::drivetrain_queue.status
- ->estimated_left_position -
- (left_goal_state(0, 0) + params.left_initial_position));
- const double right_error =
- ::std::abs(::frc971::control_loops::drivetrain_queue.status
- ->estimated_right_position -
- (right_goal_state(0, 0) + params.right_initial_position));
- const double velocity_error = ::std::abs(
- ::frc971::control_loops::drivetrain_queue.status->robot_speed);
- if (left_error < kPositionThreshold && right_error < kPositionThreshold &&
- velocity_error < 0.2) {
- break;
- } else {
- LOG(DEBUG, "Drivetrain error is %f, %f, %f\n", left_error, right_error,
- velocity_error);
- }
- ::frc971::control_loops::drivetrain_queue.status.FetchNextBlocking();
- }
-
- LOG(INFO, "Done moving\n");
- return true;
-}
-
-::std::unique_ptr<DrivetrainAction> MakeDrivetrainAction(
- const ::y2016::actors::DrivetrainActionParams ¶ms) {
- return ::std::unique_ptr<DrivetrainAction>(
- new DrivetrainAction(&::y2016::actors::drivetrain_action, params));
-}
-
-} // namespace actors
-} // namespace y2016
diff --git a/y2016/actors/drivetrain_actor.h b/y2016/actors/drivetrain_actor.h
deleted file mode 100644
index 0ab3bf2..0000000
--- a/y2016/actors/drivetrain_actor.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef Y2016_ACTORS_DRIVETRAIN_ACTOR_H_
-#define Y2016_ACTORS_DRIVETRAIN_ACTOR_H_
-
-#include <memory>
-
-#include "aos/common/actions/actor.h"
-#include "aos/common/actions/actions.h"
-#include "frc971/control_loops/state_feedback_loop.h"
-
-#include "y2016/actors/drivetrain_action.q.h"
-
-namespace y2016 {
-namespace actors {
-
-class DrivetrainActor
- : public ::aos::common::actions::ActorBase<DrivetrainActionQueueGroup> {
- public:
- explicit DrivetrainActor(DrivetrainActionQueueGroup *s);
-
- bool RunAction(const actors::DrivetrainActionParams ¶ms) override;
-
- private:
- StateFeedbackLoop<4, 2, 2> loop_;
-};
-
-typedef ::aos::common::actions::TypedAction<DrivetrainActionQueueGroup>
- DrivetrainAction;
-
-// Makes a new DrivetrainActor action.
-::std::unique_ptr<DrivetrainAction> MakeDrivetrainAction(
- const ::y2016::actors::DrivetrainActionParams ¶ms);
-
-} // namespace actors
-} // namespace y2016
-
-#endif
diff --git a/y2016/actors/drivetrain_actor_main.cc b/y2016/actors/drivetrain_actor_main.cc
deleted file mode 100644
index 0fe9e71..0000000
--- a/y2016/actors/drivetrain_actor_main.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-#include "aos/linux_code/init.h"
-#include "y2016/actors/drivetrain_action.q.h"
-#include "y2016/actors/drivetrain_actor.h"
-
-using ::aos::time::Time;
-
-int main(int /*argc*/, char* /*argv*/ []) {
- ::aos::Init(-1);
-
- ::y2016::actors::DrivetrainActor drivetrain(
- &::y2016::actors::drivetrain_action);
- drivetrain.Run();
-
- ::aos::Cleanup();
- return 0;
-}
diff --git a/y2016/actors/vision_align_actor.cc b/y2016/actors/vision_align_actor.cc
index 00695f0..9491cd4 100644
--- a/y2016/actors/vision_align_actor.cc
+++ b/y2016/actors/vision_align_actor.cc
@@ -1,5 +1,6 @@
#include "y2016/actors/vision_align_actor.h"
+#include <chrono>
#include <functional>
#include <numeric>
@@ -28,8 +29,8 @@
const actors::VisionAlignActionParams & /*params*/) {
const double robot_radius =
control_loops::drivetrain::GetDrivetrainConfig().robot_radius;
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(5) / 2);
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
while (true) {
const int iterations = phased_loop.SleepUntilNext();
if (iterations != 1) {
diff --git a/y2016/control_loops/drivetrain/drivetrain_base.cc b/y2016/control_loops/drivetrain/drivetrain_base.cc
index 9aeb4c8..1674540 100644
--- a/y2016/control_loops/drivetrain/drivetrain_base.cc
+++ b/y2016/control_loops/drivetrain/drivetrain_base.cc
@@ -37,7 +37,9 @@
kThreeStateDriveShifter,
kThreeStateDriveShifter,
true,
- constants::GetValues().down_error};
+ constants::GetValues().down_error,
+ 0.25,
+ 1.0};
return kDrivetrainConfig;
};
diff --git a/y2016/dashboard/dashboard.cc b/y2016/dashboard/dashboard.cc
index bdfedb8..16ad077 100644
--- a/y2016/dashboard/dashboard.cc
+++ b/y2016/dashboard/dashboard.cc
@@ -49,7 +49,7 @@
: cur_raw_data_("no data"),
sample_id_(0),
measure_index_(0),
- overflow_id_(20) {}
+ overflow_id_(1) {}
void DataCollector::RunIteration() {
::aos::MutexLocker locker(&mutex_);
@@ -124,7 +124,9 @@
AddPoint("big indicator", big_indicator);
AddPoint("superstructure state indicator", superstructure_state_indicator);
- AddPoint("auto mode indicator", auto_mode_indicator);
+ if(auto_mode_indicator != 15) {
+ AddPoint("auto mode indicator", auto_mode_indicator);
+ }
#endif
// Get ready for next iteration. /////
@@ -183,26 +185,28 @@
// Note that we are ignoring the from_sample being sent to keep up with the
// live data without worrying about client lag.
- int32_t cur_sample = sample_id_ - 2;
+ int32_t cur_sample = sample_id_;
int32_t adjusted_index = GetIndex(cur_sample);
message << "$"; // Begin data packet.
// Make sure we are not out of range.
- if (static_cast<size_t>(adjusted_index) <
- sample_items_.at(0).datapoints.size()) {
- message << cur_sample << "%"
- << sample_items_.at(0)
- .datapoints.at(adjusted_index)
- .time.ToSeconds() << "%"; // Send time.
- // Add comma-separated list of data points.
- for (size_t cur_measure = 0; cur_measure < sample_items_.size();
- cur_measure++) {
- if (cur_measure > 0) {
- message << ",";
- }
- message << sample_items_.at(cur_measure)
+ if (sample_items_.size() > 0) {
+ if (static_cast<size_t>(adjusted_index) <
+ sample_items_.at(0).datapoints.size()) {
+ message << cur_sample << "%"
+ << sample_items_.at(0)
.datapoints.at(adjusted_index)
- .value;
+ .time.ToSeconds() << "%"; // Send time.
+ // Add comma-separated list of data points.
+ for (size_t cur_measure = 0; cur_measure < sample_items_.size();
+ cur_measure++) {
+ if (cur_measure > 0) {
+ message << ",";
+ }
+ message << sample_items_.at(cur_measure)
+ .datapoints.at(adjusted_index)
+ .value;
+ }
}
}
diff --git a/y2016/dashboard/www/index.html b/y2016/dashboard/www/index.html
index da5512f..b7f943f 100644
--- a/y2016/dashboard/www/index.html
+++ b/y2016/dashboard/www/index.html
@@ -7,11 +7,11 @@
var escapable =
/[\x00-\x1f\ud800-\udfff\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufff0-\uffff]/g;
var ws;
-var intervalTime = 50;
+var intervalTime = 100;
var selected = 0;
var reconnecting = false;
var lastSampleID = 0;
-var resetTimeout;
+var reconnectTimeout;
// Filter out junky JSON packets that will otherwise cause nasty decoding
// errors. These errors come as a result of incomplete packets, corrupted data,
@@ -90,7 +90,7 @@
default:
$("#bigIndicator").css("background", "#000000");
$("#bigIndicator").css("color", "#444444");
- $("#bigIndicator").text("No ball, no target");
+ $("#bigIndicator").text("No ball");
break;
}
@@ -145,12 +145,13 @@
}
function reconnect() {
+ clearTimeout(reconnectTimeout);
$('#message').text('Reconnecting...');
$('#dataTable').empty();
lastSampleID = 0;
reconnecting = true;
- setTimeout(function(){
+ reconnectTimeout = setTimeout(function(){
initSocketLoop()
}, 500);
}
@@ -217,7 +218,8 @@
}
#autoModeIndicator {
- background: #FF0000;
+ background: #444444;
+ color: #AAAAAA;
}
</style>
</head>
diff --git a/y2016/joystick_reader.cc b/y2016/joystick_reader.cc
index 45733ff..6a0edf0 100644
--- a/y2016/joystick_reader.cc
+++ b/y2016/joystick_reader.cc
@@ -120,8 +120,6 @@
void HandleDrivetrain(const ::aos::input::driver_station::Data &data) {
bool is_control_loop_driving = false;
- static double left_goal = 0.0;
- static double right_goal = 0.0;
const double wheel = -data.GetAxis(kSteeringWheel);
const double throttle = -data.GetAxis(kDriveThrottle);
@@ -238,18 +236,15 @@
shooter_velocity_ = 640.0;
intake_goal_ = intake_when_shooting;
} else if (data.IsPressed(kBackFender)) {
- // Fender shot back
- shoulder_goal_ = M_PI / 2.0 - 0.2;
- wrist_goal_ = -0.55;
- shooter_velocity_ = 600.0;
+ // Backwards shot no IMU
+ shoulder_goal_ = M_PI / 2.0 - 0.4;
+ wrist_goal_ = -0.62 - 0.02;
+ shooter_velocity_ = 640.0;
intake_goal_ = intake_when_shooting;
} else if (data.IsPressed(kFrontFender)) {
- // Forwards shot, higher
+ // Forwards shot no IMU
shoulder_goal_ = M_PI / 2.0 + 0.1;
- wrist_goal_ = M_PI + 0.41 + 0.02 + 0.020;
- if (drivetrain_queue.status.get()) {
- wrist_goal_ += drivetrain_queue.status->ground_angle;
- }
+ wrist_goal_ = M_PI + 0.41 + 0.02 - 0.005;
shooter_velocity_ = 640.0;
intake_goal_ = intake_when_shooting;
} else if (data.IsPressed(kExpand) || data.IsPressed(kWinch)) {
@@ -458,6 +453,10 @@
double wrist_goal_;
double shooter_velocity_ = 0.0;
+ // Turning goals
+ double left_goal;
+ double right_goal;
+
bool was_running_ = false;
bool auto_running_ = false;
diff --git a/y2016/wpilib/wpilib_interface.cc b/y2016/wpilib/wpilib_interface.cc
index acf820f..d7fc261 100644
--- a/y2016/wpilib/wpilib_interface.cc
+++ b/y2016/wpilib/wpilib_interface.cc
@@ -3,6 +3,7 @@
#include <unistd.h>
#include <inttypes.h>
+#include <chrono>
#include <thread>
#include <mutex>
#include <functional>
@@ -282,8 +283,8 @@
dma_synchronizer_->Start();
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(5),
- ::aos::time::Time::InMS(4));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
::aos::SetCurrentThreadRealtimePriority(40);
while (run_) {
@@ -472,8 +473,8 @@
::aos::SetCurrentThreadName("Solenoids");
::aos::SetCurrentThreadRealtimePriority(27);
- ::aos::time::PhasedLoop phased_loop(::aos::time::Time::InMS(20),
- ::aos::time::Time::InMS(1));
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
while (run_) {
{
diff --git a/y2016_bot3/BUILD b/y2016_bot3/BUILD
new file mode 100644
index 0000000..1d89c1a
--- /dev/null
+++ b/y2016_bot3/BUILD
@@ -0,0 +1,53 @@
+load('/aos/downloader/downloader', 'aos_downloader')
+
+cc_binary(
+ name = 'joystick_reader',
+ srcs = [
+ 'joystick_reader.cc',
+ ],
+ deps = [
+ '//aos/common/actions:action_lib',
+ '//aos/common/logging',
+ '//aos/common/util:log_interval',
+ '//aos/common:time',
+ '//aos/input:joystick_input',
+ '//aos/linux_code:init',
+ '//frc971/autonomous:auto_queue',
+ '//frc971/control_loops/drivetrain:drivetrain_queue',
+ '//frc971/queues:gyro',
+ '//y2016_bot3/actors:autonomous_action_lib',
+ '//y2016_bot3/control_loops/intake:intake_lib',
+ '//y2016_bot3/control_loops/intake:intake_queue',
+ '//y2016_bot3/queues:ball_detector',
+ ],
+)
+
+aos_downloader(
+ name = 'download',
+ start_srcs = [
+ ':joystick_reader',
+ '//aos:prime_start_binaries',
+ '//y2016_bot3/control_loops/drivetrain:drivetrain',
+ '//y2016_bot3/control_loops/intake:intake',
+ '//y2016_bot3/actors:autonomous_action',
+ '//y2016_bot3/wpilib:wpilib_interface',
+ ],
+ srcs = [
+ '//aos:prime_binaries',
+ ],
+)
+
+aos_downloader(
+ name = 'download_stripped',
+ start_srcs = [
+ ':joystick_reader.stripped',
+ '//aos:prime_start_binaries_stripped',
+ '//y2016_bot3/control_loops/drivetrain:drivetrain.stripped',
+ '//y2016_bot3/control_loops/intake:intake.stripped',
+ '//y2016_bot3/actors:autonomous_action.stripped',
+ '//y2016_bot3/wpilib:wpilib_interface.stripped',
+ ],
+ srcs = [
+ '//aos:prime_binaries_stripped',
+ ],
+)
diff --git a/y2016_bot3/actors/BUILD b/y2016_bot3/actors/BUILD
new file mode 100644
index 0000000..aa774a3
--- /dev/null
+++ b/y2016_bot3/actors/BUILD
@@ -0,0 +1,53 @@
+package(default_visibility = ['//visibility:public'])
+
+load('/aos/build/queues', 'queue_library')
+
+filegroup(
+ name = 'binaries',
+ srcs = [
+ ':autonomous_action',
+ ],
+)
+
+queue_library(
+ name = 'autonomous_action_queue',
+ srcs = [
+ 'autonomous_action.q',
+ ],
+ deps = [
+ '//aos/common/actions:action_queue',
+ ],
+)
+
+cc_library(
+ name = 'autonomous_action_lib',
+ srcs = [
+ 'autonomous_actor.cc',
+ ],
+ hdrs = [
+ 'autonomous_actor.h',
+ ],
+ deps = [
+ ':autonomous_action_queue',
+ '//aos/common/util:phased_loop',
+ '//aos/common/logging',
+ '//aos/common/actions:action_lib',
+ '//frc971/control_loops/drivetrain:drivetrain_queue',
+ '//y2016_bot3/queues:ball_detector',
+ '//y2016_bot3/control_loops/intake:intake_queue',
+ '//y2016_bot3/control_loops/drivetrain:drivetrain_base',
+ '//y2016_bot3/queues:profile_params',
+ ],
+)
+
+cc_binary(
+ name = 'autonomous_action',
+ srcs = [
+ 'autonomous_actor_main.cc',
+ ],
+ deps = [
+ ':autonomous_action_lib',
+ ':autonomous_action_queue',
+ '//aos/linux_code:init',
+ ],
+)
diff --git a/y2016_bot3/actors/autonomous_action.q b/y2016_bot3/actors/autonomous_action.q
new file mode 100644
index 0000000..37e4866
--- /dev/null
+++ b/y2016_bot3/actors/autonomous_action.q
@@ -0,0 +1,29 @@
+package y2016_bot3.actors;
+
+import "aos/common/actions/actions.q";
+
+message AutonomousMode {
+ // Mode read from the mode setting sensors.
+ int32_t mode;
+};
+
+queue AutonomousMode auto_mode;
+
+struct AutonomousActionParams {
+ // The mode from the sensors when auto starts.
+ int32_t mode;
+};
+
+queue_group AutonomousActionQueueGroup {
+ implements aos.common.actions.ActionQueueGroup;
+
+ message Goal {
+ uint32_t run;
+ AutonomousActionParams params;
+ };
+
+ queue Goal goal;
+ queue aos.common.actions.Status status;
+};
+
+queue_group AutonomousActionQueueGroup autonomous_action;
diff --git a/y2016_bot3/actors/autonomous_actor.cc b/y2016_bot3/actors/autonomous_actor.cc
new file mode 100644
index 0000000..27dae0e
--- /dev/null
+++ b/y2016_bot3/actors/autonomous_actor.cc
@@ -0,0 +1,357 @@
+#include "y2016_bot3/actors/autonomous_actor.h"
+
+#include <inttypes.h>
+
+#include <cmath>
+
+#include "aos/common/util/phased_loop.h"
+#include "aos/common/logging/logging.h"
+
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_base.h"
+#include "y2016_bot3/control_loops/intake/intake.q.h"
+#include "y2016_bot3/actors/autonomous_action.q.h"
+#include "y2016_bot3/queues/ball_detector.q.h"
+
+namespace y2016_bot3 {
+namespace actors {
+using ::frc971::control_loops::drivetrain_queue;
+
+namespace {
+const ProfileParameters kLowBarDrive = {1.3, 2.5};
+} // namespace
+
+AutonomousActor::AutonomousActor(actors::AutonomousActionQueueGroup *s)
+ : aos::common::actions::ActorBase<actors::AutonomousActionQueueGroup>(s),
+ dt_config_(control_loops::drivetrain::GetDrivetrainConfig()),
+ initial_drivetrain_({0.0, 0.0}) {}
+
+void AutonomousActor::ResetDrivetrain() {
+ LOG(INFO, "resetting the drivetrain\n");
+ drivetrain_queue.goal.MakeWithBuilder()
+ .control_loop_driving(false)
+ .steering(0.0)
+ .throttle(0.0)
+ .left_goal(initial_drivetrain_.left)
+ .left_velocity_goal(0)
+ .right_goal(initial_drivetrain_.right)
+ .right_velocity_goal(0)
+ .Send();
+}
+
+void AutonomousActor::StartDrive(double distance, double angle,
+ ProfileParameters linear) {
+ {
+ LOG(INFO, "Driving distance %f, angle %f\n", distance, angle);
+ {
+ const double dangle = angle * dt_config_.robot_radius;
+ initial_drivetrain_.left += distance - dangle;
+ initial_drivetrain_.right += distance + dangle;
+ }
+
+ auto drivetrain_message = drivetrain_queue.goal.MakeMessage();
+ drivetrain_message->control_loop_driving = true;
+ drivetrain_message->steering = 0.0;
+ drivetrain_message->throttle = 0.0;
+ drivetrain_message->left_goal = initial_drivetrain_.left;
+ drivetrain_message->left_velocity_goal = 0;
+ drivetrain_message->right_goal = initial_drivetrain_.right;
+ drivetrain_message->right_velocity_goal = 0;
+ drivetrain_message->linear = linear;
+
+ LOG_STRUCT(DEBUG, "drivetrain_goal", *drivetrain_message);
+
+ drivetrain_message.Send();
+ }
+}
+
+void AutonomousActor::InitializeEncoders() {
+ drivetrain_queue.status.FetchAnother();
+ initial_drivetrain_.left = drivetrain_queue.status->estimated_left_position;
+ initial_drivetrain_.right = drivetrain_queue.status->estimated_right_position;
+}
+
+void AutonomousActor::WaitUntilDoneOrCanceled(
+ ::std::unique_ptr<aos::common::actions::Action> action) {
+ if (!action) {
+ LOG(ERROR, "No action, not waiting\n");
+ return;
+ }
+
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ while (true) {
+ // Poll the running bit and see if we should cancel.
+ phased_loop.SleepUntilNext();
+ if (!action->Running() || ShouldCancel()) {
+ return;
+ }
+ }
+}
+
+bool AutonomousActor::WaitForDriveNear(double distance, double angle) {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ constexpr double kPositionTolerance = 0.02;
+ constexpr double kProfileTolerance = 0.001;
+
+ while (true) {
+ if (ShouldCancel()) {
+ return false;
+ }
+ phased_loop.SleepUntilNext();
+ drivetrain_queue.status.FetchLatest();
+ if (drivetrain_queue.status.get()) {
+ const double left_profile_error =
+ (initial_drivetrain_.left -
+ drivetrain_queue.status->profiled_left_position_goal);
+ const double right_profile_error =
+ (initial_drivetrain_.right -
+ drivetrain_queue.status->profiled_right_position_goal);
+
+ const double left_error =
+ (initial_drivetrain_.left -
+ drivetrain_queue.status->estimated_left_position);
+ const double right_error =
+ (initial_drivetrain_.right -
+ drivetrain_queue.status->estimated_right_position);
+
+ const double profile_distance_to_go =
+ (left_profile_error + right_profile_error) / 2.0;
+ const double profile_angle_to_go =
+ (right_profile_error - left_profile_error) /
+ (dt_config_.robot_radius * 2.0);
+
+ const double distance_to_go = (left_error + right_error) / 2.0;
+ const double angle_to_go =
+ (right_error - left_error) / (dt_config_.robot_radius * 2.0);
+
+ if (::std::abs(profile_distance_to_go) < distance + kProfileTolerance &&
+ ::std::abs(profile_angle_to_go) < angle + kProfileTolerance &&
+ ::std::abs(distance_to_go) < distance + kPositionTolerance &&
+ ::std::abs(angle_to_go) < angle + kPositionTolerance) {
+ LOG(INFO, "Closer than %f distance, %f angle\n", distance, angle);
+ return true;
+ }
+ }
+ }
+}
+
+bool AutonomousActor::WaitForDriveProfileDone() {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ constexpr double kProfileTolerance = 0.001;
+
+ while (true) {
+ if (ShouldCancel()) {
+ return false;
+ }
+ phased_loop.SleepUntilNext();
+ drivetrain_queue.status.FetchLatest();
+ if (drivetrain_queue.status.get()) {
+ if (::std::abs(drivetrain_queue.status->profiled_left_position_goal -
+ initial_drivetrain_.left) < kProfileTolerance &&
+ ::std::abs(drivetrain_queue.status->profiled_right_position_goal -
+ initial_drivetrain_.right) < kProfileTolerance) {
+ LOG(INFO, "Finished drive\n");
+ return true;
+ }
+ }
+ }
+}
+
+bool AutonomousActor::IsDriveDone() {
+ constexpr double kPositionTolerance = 0.02;
+ constexpr double kVelocityTolerance = 0.10;
+ constexpr double kProfileTolerance = 0.001;
+
+ if (drivetrain_queue.status.get()) {
+ if (::std::abs(drivetrain_queue.status->profiled_left_position_goal -
+ initial_drivetrain_.left) < kProfileTolerance &&
+ ::std::abs(drivetrain_queue.status->profiled_right_position_goal -
+ initial_drivetrain_.right) < kProfileTolerance &&
+ ::std::abs(drivetrain_queue.status->estimated_left_position -
+ initial_drivetrain_.left) < kPositionTolerance &&
+ ::std::abs(drivetrain_queue.status->estimated_right_position -
+ initial_drivetrain_.right) < kPositionTolerance &&
+ ::std::abs(drivetrain_queue.status->estimated_left_velocity) <
+ kVelocityTolerance &&
+ ::std::abs(drivetrain_queue.status->estimated_right_velocity) <
+ kVelocityTolerance) {
+ LOG(INFO, "Finished drive\n");
+ return true;
+ }
+ }
+ return false;
+}
+
+bool AutonomousActor::WaitForDriveDone() {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+
+ while (true) {
+ if (ShouldCancel()) {
+ return false;
+ }
+ phased_loop.SleepUntilNext();
+ drivetrain_queue.status.FetchLatest();
+ if (IsDriveDone()) {
+ return true;
+ }
+ }
+}
+
+void AutonomousActor::MoveIntake(double intake_goal,
+ const ProfileParameters intake_params,
+ bool traverse_up, double roller_power) {
+ auto new_intake_goal =
+ ::y2016_bot3::control_loops::intake_queue.goal.MakeMessage();
+
+ new_intake_goal->angle_intake = intake_goal;
+
+ new_intake_goal->max_angular_velocity_intake = intake_params.max_velocity;
+
+ new_intake_goal->max_angular_acceleration_intake =
+ intake_params.max_acceleration;
+
+ new_intake_goal->voltage_top_rollers = roller_power;
+ new_intake_goal->voltage_bottom_rollers = roller_power;
+
+ new_intake_goal->traverse_down = !traverse_up;
+
+ if (!new_intake_goal.Send()) {
+ LOG(ERROR, "Sending intake goal failed.\n");
+ }
+}
+
+bool AutonomousActor::IntakeDone() {
+ control_loops::intake_queue.status.FetchAnother();
+
+ constexpr double kProfileError = 1e-5;
+ constexpr double kEpsilon = 0.15;
+
+ if (control_loops::intake_queue.status->state < 12 ||
+ control_loops::intake_queue.status->state == 16) {
+ LOG(ERROR, "Intake no longer running, aborting action\n");
+ return true;
+ }
+
+ if (::std::abs(control_loops::intake_queue.status->intake.goal_angle -
+ intake_goal_.intake) < kProfileError &&
+ ::std::abs(
+ control_loops::intake_queue.status->intake.goal_angular_velocity) <
+ kProfileError) {
+ LOG(DEBUG, "Profile done.\n");
+ if (::std::abs(control_loops::intake_queue.status->intake.angle -
+ intake_goal_.intake) < kEpsilon &&
+ ::std::abs(
+ control_loops::intake_queue.status->intake.angular_velocity) <
+ kEpsilon) {
+ LOG(INFO, "Near goal, done.\n");
+ return true;
+ }
+ }
+ return false;
+}
+
+void AutonomousActor::WaitForIntake() {
+ while (true) {
+ if (ShouldCancel()) return;
+ if (IntakeDone()) return;
+ }
+}
+
+void AutonomousActor::LowBarDrive() {
+ StartDrive(-5.5, 0.0, kLowBarDrive);
+
+ if (!WaitForDriveNear(5.3, 0.0)) return;
+
+ if (!WaitForDriveNear(5.0, 0.0)) return;
+
+ StartDrive(0.0, 0.0, kLowBarDrive);
+
+ if (!WaitForDriveNear(3.0, 0.0)) return;
+
+ StartDrive(0.0, 0.0, kLowBarDrive);
+
+ if (!WaitForDriveNear(1.0, 0.0)) return;
+
+ StartDrive(0, -M_PI / 4.0 - 0.2, kLowBarDrive);
+}
+
+void AutonomousActor::WaitForBallOrDriveDone() {
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+ while (true) {
+ if (ShouldCancel()) {
+ return;
+ }
+ phased_loop.SleepUntilNext();
+ drivetrain_queue.status.FetchLatest();
+ if (IsDriveDone()) {
+ return;
+ }
+
+ ::y2016_bot3::sensors::ball_detector.FetchLatest();
+ if (::y2016_bot3::sensors::ball_detector.get()) {
+ const bool ball_detected =
+ ::y2016_bot3::sensors::ball_detector->voltage > 2.5;
+ if (ball_detected) {
+ return;
+ }
+ }
+ }
+}
+
+void AutonomousActor::WaitForBall() {
+ while (true) {
+ ::y2016_bot3::sensors::ball_detector.FetchAnother();
+ if (::y2016_bot3::sensors::ball_detector.get()) {
+ const bool ball_detected =
+ ::y2016_bot3::sensors::ball_detector->voltage > 2.5;
+ if (ball_detected) {
+ return;
+ }
+ if (ShouldCancel()) return;
+ }
+ }
+}
+
+bool AutonomousActor::RunAction(const actors::AutonomousActionParams ¶ms) {
+ aos::time::Time start_time = aos::time::Time::Now();
+ LOG(INFO, "Starting autonomous action with mode %" PRId32 "\n", params.mode);
+
+ InitializeEncoders();
+ ResetDrivetrain();
+
+ switch (params.mode) {
+ case 0:
+ default:
+ // TODO: Write auto code
+ LOG(ERROR, "Uhh... someone implement this please :)");
+ break;
+ }
+
+ if (!WaitForDriveDone()) return true;
+
+ LOG(INFO, "Done %f\n", (aos::time::Time::Now() - start_time).ToSeconds());
+
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(5) / 2);
+
+ while (!ShouldCancel()) {
+ phased_loop.SleepUntilNext();
+ }
+ LOG(DEBUG, "Done running\n");
+
+ return true;
+}
+
+::std::unique_ptr<AutonomousAction> MakeAutonomousAction(
+ const ::y2016_bot3::actors::AutonomousActionParams ¶ms) {
+ return ::std::unique_ptr<AutonomousAction>(
+ new AutonomousAction(&::y2016_bot3::actors::autonomous_action, params));
+}
+
+} // namespace actors
+} // namespace y2016_bot3
diff --git a/y2016_bot3/actors/autonomous_actor.h b/y2016_bot3/actors/autonomous_actor.h
new file mode 100644
index 0000000..607e833
--- /dev/null
+++ b/y2016_bot3/actors/autonomous_actor.h
@@ -0,0 +1,90 @@
+#ifndef Y2016_BOT3_ACTORS_AUTONOMOUS_ACTOR_H_
+#define Y2016_BOT3_ACTORS_AUTONOMOUS_ACTOR_H_
+
+#include <memory>
+
+#include "aos/common/actions/actor.h"
+#include "aos/common/actions/actions.h"
+
+#include "y2016_bot3/actors/autonomous_action.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain_config.h"
+
+namespace y2016_bot3 {
+namespace actors {
+using ::frc971::ProfileParameters;
+
+class AutonomousActor
+ : public ::aos::common::actions::ActorBase<AutonomousActionQueueGroup> {
+ public:
+ explicit AutonomousActor(AutonomousActionQueueGroup *s);
+
+ bool RunAction(const actors::AutonomousActionParams ¶ms) override;
+
+ private:
+ void ResetDrivetrain();
+ void InitializeEncoders();
+ void WaitUntilDoneOrCanceled(::std::unique_ptr<aos::common::actions::Action>
+ action);
+ void StartDrive(double distance, double angle,
+ ::frc971::ProfileParameters linear);
+ // Waits for the drive motion to finish. Returns true if it succeeded, and
+ // false if it cancels.
+ bool WaitForDriveDone();
+ void WaitForBallOrDriveDone();
+
+ void StealAndMoveOverBy(double distance);
+
+ // Returns true if the drive has finished.
+ bool IsDriveDone();
+
+ // Waits until the profile and distance is within distance and angle of the
+ // goal. Returns true on success, and false when canceled.
+ bool WaitForDriveNear(double distance, double angle);
+
+ const ::frc971::control_loops::drivetrain::DrivetrainConfig dt_config_;
+
+ // Initial drivetrain positions.
+ struct InitialDrivetrain {
+ double left;
+ double right;
+ };
+ InitialDrivetrain initial_drivetrain_;
+
+ // Internal struct holding superstructure goals sent by autonomous to the
+ // loop.
+ struct IntakeGoal {
+ double intake;
+ };
+ IntakeGoal intake_goal_;
+
+ void MoveIntake(double intake, const ProfileParameters intake_params,
+ bool traverse_up, double roller_power);
+ void WaitForIntakeProfile();
+ void WaitForIntakeLow();
+ void WaitForIntake();
+ bool IntakeDone();
+ bool WaitForDriveProfileDone();
+
+ void WaitForBall();
+
+ void LowBarDrive();
+ // Drive to the middle spot over the middle position. Designed for the rock
+ // wall, rough terain, or ramparts.
+ void MiddleDrive();
+
+ void OneFromMiddleDrive(bool left);
+ void TwoFromMiddleDrive();
+};
+
+typedef ::aos::common::actions::TypedAction<AutonomousActionQueueGroup>
+ AutonomousAction;
+
+// Makes a new AutonomousActor action.
+::std::unique_ptr<AutonomousAction> MakeAutonomousAction(
+ const ::y2016_bot3::actors::AutonomousActionParams ¶ms);
+
+} // namespace actors
+} // namespace y2016_bot3
+
+#endif // Y2016_BOT3_ACTORS_AUTONOMOUS_ACTOR_H_
diff --git a/y2016_bot3/actors/autonomous_actor_main.cc b/y2016_bot3/actors/autonomous_actor_main.cc
new file mode 100644
index 0000000..43cbbe8
--- /dev/null
+++ b/y2016_bot3/actors/autonomous_actor_main.cc
@@ -0,0 +1,18 @@
+#include <stdio.h>
+
+#include "aos/linux_code/init.h"
+#include "y2016_bot3/actors/autonomous_action.q.h"
+#include "y2016_bot3/actors/autonomous_actor.h"
+
+using ::aos::time::Time;
+
+int main(int /*argc*/, char * /*argv*/ []) {
+ ::aos::Init(-1);
+
+ ::y2016_bot3::actors::AutonomousActor autonomous(
+ &::y2016_bot3::actors::autonomous_action);
+ autonomous.Run();
+
+ ::aos::Cleanup();
+ return 0;
+}
diff --git a/y2016_bot3/control_loops/drivetrain/BUILD b/y2016_bot3/control_loops/drivetrain/BUILD
new file mode 100644
index 0000000..c6e95c4
--- /dev/null
+++ b/y2016_bot3/control_loops/drivetrain/BUILD
@@ -0,0 +1,77 @@
+package(default_visibility = ['//visibility:public'])
+
+load('/aos/build/queues', 'queue_library')
+
+genrule(
+ name = 'genrule_drivetrain',
+ visibility = ['//visibility:private'],
+ cmd = '$(location //y2016_bot3/control_loops/python:drivetrain) $(OUTS)',
+ tools = [
+ '//y2016_bot3/control_loops/python:drivetrain',
+ ],
+ outs = [
+ 'drivetrain_dog_motor_plant.h',
+ 'drivetrain_dog_motor_plant.cc',
+ 'kalman_drivetrain_motor_plant.h',
+ 'kalman_drivetrain_motor_plant.cc',
+ ],
+)
+
+genrule(
+ name = 'genrule_polydrivetrain',
+ visibility = ['//visibility:private'],
+ cmd = '$(location //y2016_bot3/control_loops/python:polydrivetrain) $(OUTS)',
+ tools = [
+ '//y2016_bot3/control_loops/python:polydrivetrain',
+ ],
+ outs = [
+ 'polydrivetrain_dog_motor_plant.h',
+ 'polydrivetrain_dog_motor_plant.cc',
+ 'polydrivetrain_cim_plant.h',
+ 'polydrivetrain_cim_plant.cc',
+ ],
+)
+
+cc_library(
+ name = 'polydrivetrain_plants',
+ srcs = [
+ 'polydrivetrain_dog_motor_plant.cc',
+ 'drivetrain_dog_motor_plant.cc',
+ 'kalman_drivetrain_motor_plant.cc',
+ ],
+ hdrs = [
+ 'polydrivetrain_dog_motor_plant.h',
+ 'drivetrain_dog_motor_plant.h',
+ 'kalman_drivetrain_motor_plant.h',
+ ],
+ deps = [
+ '//frc971/control_loops:state_feedback_loop',
+ ],
+)
+
+cc_library(
+ name = 'drivetrain_base',
+ srcs = [
+ 'drivetrain_base.cc',
+ ],
+ hdrs = [
+ 'drivetrain_base.h',
+ ],
+ deps = [
+ ':polydrivetrain_plants',
+ '//frc971/control_loops/drivetrain:drivetrain_config',
+ '//frc971:shifter_hall_effect',
+ ],
+)
+
+cc_binary(
+ name = 'drivetrain',
+ srcs = [
+ 'drivetrain_main.cc',
+ ],
+ deps = [
+ ':drivetrain_base',
+ '//aos/linux_code:init',
+ '//frc971/control_loops/drivetrain:drivetrain_lib',
+ ],
+)
diff --git a/y2016_bot3/control_loops/drivetrain/drivetrain_base.cc b/y2016_bot3/control_loops/drivetrain/drivetrain_base.cc
new file mode 100644
index 0000000..5997342
--- /dev/null
+++ b/y2016_bot3/control_loops/drivetrain/drivetrain_base.cc
@@ -0,0 +1,48 @@
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_base.h"
+
+#include "frc971/control_loops/drivetrain/drivetrain_config.h"
+
+#include "frc971/control_loops/state_feedback_loop.h"
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
+#include "y2016_bot3/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
+#include "y2016_bot3/control_loops/drivetrain/kalman_drivetrain_motor_plant.h"
+
+using ::frc971::control_loops::drivetrain::DrivetrainConfig;
+
+namespace y2016_bot3 {
+namespace control_loops {
+namespace drivetrain {
+
+using ::frc971::constants::ShifterHallEffect;
+
+const ShifterHallEffect kThreeStateDriveShifter{0.0, 0.0, 0.0, 0.0, 0.25, 0.75};
+
+const DrivetrainConfig &GetDrivetrainConfig() {
+ static DrivetrainConfig kDrivetrainConfig{
+ ::frc971::control_loops::drivetrain::ShifterType::NO_SHIFTER,
+ ::frc971::control_loops::drivetrain::LoopType::CLOSED_LOOP,
+
+ ::y2016_bot3::control_loops::drivetrain::MakeDrivetrainLoop,
+ ::y2016_bot3::control_loops::drivetrain::MakeVelocityDrivetrainLoop,
+ ::y2016_bot3::control_loops::drivetrain::MakeKFDrivetrainLoop,
+
+ drivetrain::kDt,
+ drivetrain::kRobotRadius,
+ drivetrain::kWheelRadius,
+ drivetrain::kV,
+
+ drivetrain::kHighGearRatio,
+ drivetrain::kHighGearRatio,
+ kThreeStateDriveShifter,
+ kThreeStateDriveShifter,
+ true,
+ 0.0,
+ 0.4,
+ 1.0};
+
+ return kDrivetrainConfig;
+};
+
+} // namespace drivetrain
+} // namespace control_loops
+} // namespace y2016_bot3
diff --git a/y2016_bot3/control_loops/drivetrain/drivetrain_base.h b/y2016_bot3/control_loops/drivetrain/drivetrain_base.h
new file mode 100644
index 0000000..280d1c5
--- /dev/null
+++ b/y2016_bot3/control_loops/drivetrain/drivetrain_base.h
@@ -0,0 +1,23 @@
+#ifndef Y2016_BOT3_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_BASE_H_
+#define Y2016_BOT3_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_BASE_H_
+
+#include "frc971/control_loops/drivetrain/drivetrain_config.h"
+
+namespace y2016_bot3 {
+namespace constants {
+static constexpr double drivetrain_max_speed = 5.0;
+
+// The ratio from the encoder shaft to the drivetrain wheels.
+static constexpr double kDrivetrainEncoderRatio = 1.0;
+
+} // namespace constants
+namespace control_loops {
+namespace drivetrain {
+const ::frc971::control_loops::drivetrain::DrivetrainConfig &
+GetDrivetrainConfig();
+
+} // namespace drivetrain
+} // namespace control_loops
+} // namespace y2016_bot3
+
+#endif // Y2016_BOT3_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_BASE_H_
diff --git a/y2016_bot3/control_loops/drivetrain/drivetrain_main.cc b/y2016_bot3/control_loops/drivetrain/drivetrain_main.cc
new file mode 100644
index 0000000..3eaccce
--- /dev/null
+++ b/y2016_bot3/control_loops/drivetrain/drivetrain_main.cc
@@ -0,0 +1,15 @@
+#include "aos/linux_code/init.h"
+
+#include "frc971/control_loops/drivetrain/drivetrain.h"
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_base.h"
+
+using ::frc971::control_loops::drivetrain::DrivetrainLoop;
+
+int main() {
+ ::aos::Init();
+ DrivetrainLoop drivetrain(
+ ::y2016_bot3::control_loops::drivetrain::GetDrivetrainConfig());
+ drivetrain.Run();
+ ::aos::Cleanup();
+ return 0;
+}
diff --git a/y2016_bot3/control_loops/intake/BUILD b/y2016_bot3/control_loops/intake/BUILD
new file mode 100644
index 0000000..887a63c
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/BUILD
@@ -0,0 +1,96 @@
+package(default_visibility = ['//visibility:public'])
+
+load('/aos/build/queues', 'queue_library')
+
+queue_library(
+ name = 'intake_queue',
+ srcs = [
+ 'intake.q',
+ ],
+ deps = [
+ '//aos/common/controls:control_loop_queues',
+ '//frc971/control_loops:queues',
+ ],
+)
+
+genrule(
+ name = 'genrule_intake',
+ visibility = ['//visibility:private'],
+ cmd = '$(location //y2016_bot3/control_loops/python:intake) $(OUTS)',
+ tools = [
+ '//y2016_bot3/control_loops/python:intake',
+ ],
+ outs = [
+ 'intake_plant.h',
+ 'intake_plant.cc',
+ 'integral_intake_plant.h',
+ 'integral_intake_plant.cc',
+ ],
+)
+
+cc_library(
+ name = 'intake_plants',
+ srcs = [
+ 'intake_plant.cc',
+ 'integral_intake_plant.cc',
+ ],
+ hdrs = [
+ 'intake_plant.h',
+ 'integral_intake_plant.h',
+ ],
+ deps = [
+ '//frc971/control_loops:state_feedback_loop',
+ ],
+)
+
+cc_library(
+ name = 'intake_lib',
+ srcs = [
+ 'intake.cc',
+ 'intake_controls.cc',
+ ],
+ hdrs = [
+ 'intake.h',
+ 'intake_controls.h',
+ ],
+ deps = [
+ ':intake_queue',
+ ':intake_plants',
+ '//aos/common/controls:control_loop',
+ '//aos/common/util:trapezoid_profile',
+ '//aos/common:math',
+ '//y2016_bot3/queues:ball_detector',
+ '//frc971/control_loops:state_feedback_loop',
+ '//frc971/control_loops:simple_capped_state_feedback_loop',
+ '//frc971/zeroing',
+ ],
+)
+
+cc_test(
+ name = 'intake_lib_test',
+ srcs = [
+ 'intake_lib_test.cc',
+ ],
+ deps = [
+ ':intake_queue',
+ ':intake_lib',
+ '//aos/testing:googletest',
+ '//aos/common:queues',
+ '//aos/common/controls:control_loop_test',
+ '//aos/common:math',
+ '//aos/common:time',
+ '//frc971/control_loops:position_sensor_sim',
+ ],
+)
+
+cc_binary(
+ name = 'intake',
+ srcs = [
+ 'intake_main.cc',
+ ],
+ deps = [
+ '//aos/linux_code:init',
+ ':intake_lib',
+ ':intake_queue',
+ ],
+)
diff --git a/y2016_bot3/control_loops/intake/intake.cc b/y2016_bot3/control_loops/intake/intake.cc
new file mode 100644
index 0000000..b3d86af
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake.cc
@@ -0,0 +1,247 @@
+#include "y2016_bot3/control_loops/intake/intake.h"
+#include "y2016_bot3/control_loops/intake/intake_controls.h"
+
+#include "aos/common/commonmath.h"
+#include "aos/common/controls/control_loops.q.h"
+#include "aos/common/logging/logging.h"
+
+#include "y2016_bot3/control_loops/intake/integral_intake_plant.h"
+#include "y2016_bot3/queues/ball_detector.q.h"
+
+namespace y2016_bot3 {
+namespace control_loops {
+namespace intake {
+
+namespace {
+// The maximum voltage the intake roller will be allowed to use.
+constexpr float kMaxIntakeTopVoltage = 12.0;
+constexpr float kMaxIntakeBottomVoltage = 12.0;
+constexpr float kMaxIntakeRollersVoltage = 12.0;
+}
+// namespace
+
+void LimitChecker::UpdateGoal(double intake_angle_goal) {
+ intake_->set_unprofiled_goal(intake_angle_goal);
+}
+
+Intake::Intake(control_loops::IntakeQueue *intake_queue)
+ : aos::controls::ControlLoop<control_loops::IntakeQueue>(intake_queue),
+ limit_checker_(&intake_) {}
+bool Intake::IsIntakeNear(double tolerance) {
+ return ((intake_.unprofiled_goal() - intake_.X_hat())
+ .block<2, 1>(0, 0)
+ .lpNorm<Eigen::Infinity>() < tolerance);
+}
+
+void Intake::RunIteration(const control_loops::IntakeQueue::Goal *unsafe_goal,
+ const control_loops::IntakeQueue::Position *position,
+ control_loops::IntakeQueue::Output *output,
+ control_loops::IntakeQueue::Status *status) {
+ const State state_before_switch = state_;
+ if (WasReset()) {
+ LOG(ERROR, "WPILib reset, restarting\n");
+ intake_.Reset();
+ state_ = UNINITIALIZED;
+ }
+
+ // Bool to track if we should turn the motors on or not.
+ bool disable = output == nullptr;
+
+ intake_.Correct(position->intake);
+
+ // There are 2 main zeroing paths, HIGH_ARM_ZERO and LOW_ARM_ZERO.
+ //
+ // HIGH_ARM_ZERO works by lifting the arm all the way up so it is clear,
+ // moving the shooter to be horizontal, moving the intake out, and then moving
+ // the arm back down.
+ //
+ // LOW_ARM_ZERO works by moving the intake out of the way, lifting the arm up,
+ // leveling the shooter, and then moving back down.
+
+ if (intake_.error()) {
+ state_ = ESTOP;
+ }
+
+ switch (state_) {
+ case UNINITIALIZED:
+ // Wait in the uninitialized state until intake is initialized.
+ LOG(DEBUG, "Uninitialized, waiting for intake\n");
+ if (intake_.initialized()) {
+ state_ = DISABLED_INITIALIZED;
+ }
+ disable = true;
+ break;
+
+ case DISABLED_INITIALIZED:
+ // Wait here until we are either fully zeroed while disabled, or we become
+ // enabled.
+ if (disable) {
+ if (intake_.zeroed()) {
+ state_ = SLOW_RUNNING;
+ }
+ } else {
+ if (intake_.angle() <= kIntakeMiddleAngle) {
+ state_ = ZERO_LIFT_INTAKE;
+ } else {
+ state_ = ZERO_LOWER_INTAKE;
+ }
+ }
+
+ // Set the goals to where we are now so when we start back up, we don't
+ // jump.
+ intake_.ForceGoal(intake_.angle());
+ // Set up the profile to be the zeroing profile.
+ intake_.AdjustProfile(0.5, 10);
+
+ // We are not ready to start doing anything yet.
+ disable = true;
+ break;
+
+ case ZERO_LOWER_INTAKE:
+ if (disable) {
+ state_ = DISABLED_INITIALIZED;
+ } else {
+ intake_.set_unprofiled_goal(kIntakeDownAngle);
+
+ if (IsIntakeNear(kLooseTolerance)) {
+ // Close enough, start the next move.
+ state_ = RUNNING;
+ }
+ }
+ break;
+
+ case ZERO_LIFT_INTAKE:
+ if (disable) {
+ state_ = DISABLED_INITIALIZED;
+ } else {
+ intake_.set_unprofiled_goal(kIntakeUpAngle);
+
+ if (IsIntakeNear(kLooseTolerance)) {
+ // Close enough, start the next move.
+ state_ = RUNNING;
+ }
+ }
+ break;
+
+ // These 4 cases are very similar.
+ case SLOW_RUNNING:
+ case RUNNING: {
+ if (disable) {
+ // If we are disabled, go to slow running if we are collided.
+ // Reset the profile to the current position so it moves well from here.
+ intake_.ForceGoal(intake_.angle());
+ }
+
+ double requested_intake = M_PI / 2.0;
+
+ if (unsafe_goal) {
+ intake_.AdjustProfile(unsafe_goal->max_angular_velocity_intake,
+ unsafe_goal->max_angular_acceleration_intake);
+
+ requested_intake = unsafe_goal->angle_intake;
+ }
+ // Push the request out to the hardware.
+ limit_checker_.UpdateGoal(requested_intake);
+
+ // ESTOP if we hit the hard limits.
+ if (intake_.CheckHardLimits() && output) {
+ state_ = ESTOP;
+ }
+ } break;
+
+ case ESTOP:
+ LOG(ERROR, "Estop\n");
+ disable = true;
+ break;
+ }
+
+ // Set the voltage limits.
+ const double max_voltage =
+ (state_ == RUNNING) ? kOperatingVoltage : kZeroingVoltage;
+
+ intake_.set_max_voltage(max_voltage);
+
+ // Calculate the loops for a cycle.
+ {
+ Eigen::Matrix<double, 3, 1> error = intake_.controller().error();
+ status->intake.position_power = intake_.controller().K(0, 0) * error(0, 0);
+ status->intake.velocity_power = intake_.controller().K(0, 1) * error(1, 0);
+ }
+
+ intake_.Update(disable);
+
+ // Write out all the voltages.
+ if (output) {
+ output->voltage_intake = intake_.intake_voltage();
+
+ output->voltage_top_rollers = 0.0;
+ output->voltage_bottom_rollers = 0.0;
+ output->voltage_intake_rollers = 0.0;
+
+ if (unsafe_goal) {
+ // Ball detector lights.
+ ::y2016_bot3::sensors::ball_detector.FetchLatest();
+ bool ball_detected = false;
+ if (::y2016_bot3::sensors::ball_detector.get()) {
+ ball_detected = ::y2016_bot3::sensors::ball_detector->voltage > 2.5;
+ }
+
+ // Intake.
+ if (unsafe_goal->force_intake || !ball_detected) {
+ output->voltage_top_rollers = ::std::max(
+ -kMaxIntakeTopVoltage,
+ ::std::min(unsafe_goal->voltage_top_rollers, kMaxIntakeTopVoltage));
+ output->voltage_intake_rollers =
+ ::std::max(-kMaxIntakeRollersVoltage,
+ ::std::min(unsafe_goal->voltage_intake_rollers,
+ kMaxIntakeRollersVoltage));
+ output->voltage_bottom_rollers =
+ ::std::max(-kMaxIntakeBottomVoltage,
+ ::std::min(unsafe_goal->voltage_bottom_rollers,
+ kMaxIntakeBottomVoltage));
+ } else {
+ output->voltage_top_rollers = 0.0;
+ output->voltage_bottom_rollers = 0.0;
+ }
+
+ // Traverse.
+ output->traverse_down = unsafe_goal->traverse_down;
+ }
+ }
+
+ // Save debug/internal state.
+ status->zeroed = intake_.zeroed();
+
+ status->intake.angle = intake_.X_hat(0, 0);
+ status->intake.angular_velocity = intake_.X_hat(1, 0);
+ status->intake.goal_angle = intake_.goal(0, 0);
+ status->intake.goal_angular_velocity = intake_.goal(1, 0);
+ status->intake.unprofiled_goal_angle = intake_.unprofiled_goal(0, 0);
+ status->intake.unprofiled_goal_angular_velocity =
+ intake_.unprofiled_goal(1, 0);
+ status->intake.calculated_velocity =
+ (intake_.angle() - last_intake_angle_) / 0.005;
+ status->intake.voltage_error = intake_.X_hat(2, 0);
+ status->intake.estimator_state = intake_.IntakeEstimatorState();
+ status->intake.feedforwards_power = intake_.controller().ff_U(0, 0);
+
+ last_intake_angle_ = intake_.angle();
+
+ status->estopped = (state_ == ESTOP);
+
+ status->state = state_;
+
+ last_state_ = state_before_switch;
+}
+
+constexpr double Intake::kZeroingVoltage;
+constexpr double Intake::kOperatingVoltage;
+constexpr double Intake::kLooseTolerance;
+constexpr double Intake::kTightTolerance;
+constexpr double Intake::kIntakeUpAngle;
+constexpr double Intake::kIntakeMiddleAngle;
+constexpr double Intake::kIntakeDownAngle;
+
+} // namespace intake
+} // namespace control_loops
+} // namespace y2016_bot3
diff --git a/y2016_bot3/control_loops/intake/intake.h b/y2016_bot3/control_loops/intake/intake.h
new file mode 100644
index 0000000..cfc204f
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake.h
@@ -0,0 +1,146 @@
+#ifndef Y2016_BOT3_CONTROL_LOOPS_INTAKE_INTAKE_H_
+#define Y2016_BOT3_CONTROL_LOOPS_INTAKE_INTAKE_H_
+
+#include <memory>
+
+#include "aos/common/controls/control_loop.h"
+#include "aos/common/util/trapezoid_profile.h"
+#include "frc971/control_loops/state_feedback_loop.h"
+
+#include "frc971/zeroing/zeroing.h"
+#include "y2016_bot3/control_loops/intake/intake.q.h"
+#include "y2016_bot3/control_loops/intake/intake_controls.h"
+
+namespace y2016_bot3 {
+namespace constants {
+static const int kZeroingSampleSize = 200;
+
+// Ratios for our subsystems.
+// TODO(constants): Update these.
+static constexpr double kIntakeEncoderRatio = 18.0 / 72.0 * 15.0 / 48.0;
+
+static constexpr double kIntakePotRatio = 15.0 / 48.0;
+
+// Difference in radians between index pulses.
+static constexpr double kIntakeEncoderIndexDifference =
+ 2.0 * M_PI * kIntakeEncoderRatio;
+
+// Subsystem motion ranges, in whatever units that their respective queues say
+// the use.
+// TODO(constants): Update these.
+static constexpr ::frc971::constants::Range kIntakeRange{// Lower hard stop
+ -0.4,
+ // Upper hard stop
+ 2.90,
+ // Lower soft stop
+ -0.28,
+ // Uppper soft stop
+ 2.77};
+
+struct IntakeZero {
+ double pot_offset = 5.462409 + 0.333162;
+ ::frc971::constants::ZeroingConstants zeroing{kZeroingSampleSize,
+ kIntakeEncoderIndexDifference,
+ +(-0.291240 + 0.148604), 0.3};
+};
+} // namespace constants
+namespace control_loops {
+namespace intake {
+namespace testing {
+class IntakeTest_RespectsRange_Test;
+class IntakeTest_DisabledGoalTest_Test;
+class IntakeTest_IntakeZeroingErrorTest_Test;
+class IntakeTest_UpperHardstopStartup_Test;
+class IntakeTest_DisabledWhileZeroingHigh_Test;
+class IntakeTest_DisabledWhileZeroingLow_Test;
+}
+
+// TODO(Adam): Implement this class and delete it from here.
+class LimitChecker {
+ public:
+ LimitChecker(IntakeArm *intake) : intake_(intake) {}
+ void UpdateGoal(double intake_angle_goal);
+
+ private:
+ IntakeArm *intake_;
+};
+
+class Intake : public ::aos::controls::ControlLoop<control_loops::IntakeQueue> {
+ public:
+ explicit Intake(
+ control_loops::IntakeQueue *my_intake = &control_loops::intake_queue);
+
+ static constexpr double kZeroingVoltage = 6.0;
+ static constexpr double kOperatingVoltage = 12.0;
+
+ // This is the large scale movement tolerance.
+ static constexpr double kLooseTolerance = 0.05;
+
+ // This is the small scale movement tolerance.
+ static constexpr double kTightTolerance = 0.03;
+
+ static constexpr double kIntakeUpAngle = M_PI / 2;
+
+ static constexpr double kIntakeDownAngle = 0.0;
+
+ static constexpr double kIntakeMiddleAngle =
+ (kIntakeUpAngle + kIntakeDownAngle) / 2;
+
+ enum State {
+ // Wait for all the filters to be ready before starting the initialization
+ // process.
+ UNINITIALIZED = 0,
+
+ // We now are ready to decide how to zero. Decide what to do once we are
+ // enabled.
+ DISABLED_INITIALIZED = 1,
+
+ ZERO_LOWER_INTAKE = 2,
+
+ ZERO_LIFT_INTAKE = 3,
+ // Run, but limit power to zeroing voltages.
+ SLOW_RUNNING = 12,
+ // Run with full power.
+ RUNNING = 13,
+ // Internal error caused the intake to abort.
+ ESTOP = 16,
+ };
+
+ bool IsRunning() const {
+ return (state_ == SLOW_RUNNING || state_ == RUNNING);
+ }
+
+ State state() const { return state_; }
+
+ protected:
+ void RunIteration(const control_loops::IntakeQueue::Goal *unsafe_goal,
+ const control_loops::IntakeQueue::Position *position,
+ control_loops::IntakeQueue::Output *output,
+ control_loops::IntakeQueue::Status *status) override;
+
+ private:
+ friend class testing::IntakeTest_DisabledGoalTest_Test;
+ friend class testing::IntakeTest_IntakeZeroingErrorTest_Test;
+ friend class testing::IntakeTest_RespectsRange_Test;
+ friend class testing::IntakeTest_UpperHardstopStartup_Test;
+ friend class testing::IntakeTest_DisabledWhileZeroingHigh_Test;
+ friend class testing::IntakeTest_DisabledWhileZeroingLow_Test;
+ IntakeArm intake_;
+
+ State state_ = UNINITIALIZED;
+ State last_state_ = UNINITIALIZED;
+
+ float last_intake_angle_ = 0.0;
+ LimitChecker limit_checker_;
+ // Returns true if the profile has finished, and the joint is within the
+ // specified tolerance.
+ bool IsIntakeNear(double tolerance);
+
+ DISALLOW_COPY_AND_ASSIGN(Intake);
+};
+
+} // namespace intake
+} // namespace control_loops
+} // namespace y2016_bot3
+
+#endif // Y2016_BOT3_CONTROL_LOOPS_SUPERSTRUCTURE_SUPERSTRUCTURE_H_
diff --git a/y2016_bot3/control_loops/intake/intake.q b/y2016_bot3/control_loops/intake/intake.q
new file mode 100644
index 0000000..55d102d
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake.q
@@ -0,0 +1,105 @@
+package y2016_bot3.control_loops;
+
+import "aos/common/controls/control_loops.q";
+import "frc971/control_loops/control_loops.q";
+
+struct JointState {
+ // Angle of the joint in radians.
+ float angle;
+ // Angular velocity of the joint in radians/second.
+ float angular_velocity;
+ // Profiled goal angle of the joint in radians.
+ float goal_angle;
+ // Profiled goal angular velocity of the joint in radians/second.
+ float goal_angular_velocity;
+ // Unprofiled goal angle of the joint in radians.
+ float unprofiled_goal_angle;
+ // Unprofiled goal angular velocity of the joint in radians/second.
+ float unprofiled_goal_angular_velocity;
+
+ // The estimated voltage error.
+ float voltage_error;
+
+ // The calculated velocity with delta x/delta t
+ float calculated_velocity;
+
+ // Components of the control loop output
+ float position_power;
+ float velocity_power;
+ float feedforwards_power;
+
+ // State of the estimator.
+ .frc971.EstimatorState estimator_state;
+};
+
+queue_group IntakeQueue {
+ implements aos.control_loops.ControlLoop;
+
+ message Goal {
+ // Zero on the intake is when the horizontal tube stock members are level
+ // with the ground. This will be essentially when we are in the intaking
+ // position. Positive is up. The angle is measured relative to the top
+ // of the robot frame.
+ // Zero on the shoulder is horizontal. Positive is up. The angle is
+ // measured relative to the top of the robot frame.
+ // Zero on the wrist is horizontal and landed in the bellypan. Positive is
+ // the same direction as the shoulder. The angle is measured relative to
+ // the top of the robot frame.
+
+ // Goal angles and angular velocities of the intake.
+ double angle_intake;
+
+ // Caps on velocity/acceleration for profiling. 0 for the default.
+ float max_angular_velocity_intake;
+
+ float max_angular_acceleration_intake;
+
+ // Voltage to send to the rollers. Positive is sucking in.
+ float voltage_top_rollers;
+ float voltage_bottom_rollers;
+ float voltage_intake_rollers;
+
+ bool force_intake;
+
+ // If true, fire the traverse mechanism down.
+ bool traverse_down;
+ };
+
+ message Status {
+ // Is the intake zeroed?
+ bool zeroed;
+
+ // If true, we have aborted.
+ bool estopped;
+
+ // The internal state of the state machine.
+ int32_t state;
+
+ // Estimated angle and angular velocitie of the intake.
+ JointState intake;
+ };
+
+ message Position {
+ // Zero for the intake potentiometer value is horizontal, and positive is
+ // up.
+ .frc971.PotAndIndexPosition intake;
+ };
+
+ message Output {
+ float voltage_intake;
+
+ float voltage_top_rollers;
+ float voltage_bottom_rollers;
+ float voltage_intake_rollers;
+
+ // If true, fire the traverse mechanism down.
+ bool traverse_down;
+ };
+
+ queue Goal goal;
+ queue Position position;
+ queue Output output;
+ queue Status status;
+};
+
+queue_group IntakeQueue intake_queue;
diff --git a/y2016_bot3/control_loops/intake/intake_controls.cc b/y2016_bot3/control_loops/intake/intake_controls.cc
new file mode 100644
index 0000000..f5ada8c
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake_controls.cc
@@ -0,0 +1,168 @@
+#include "y2016_bot3/control_loops/intake/intake_controls.h"
+
+#include "aos/common/controls/control_loops.q.h"
+#include "aos/common/logging/logging.h"
+
+#include "y2016_bot3/control_loops/intake/integral_intake_plant.h"
+
+#include "y2016_bot3/control_loops/intake/intake.h"
+
+namespace y2016_bot3 {
+namespace constants {
+IntakeZero intake_zero;
+}
+namespace control_loops {
+namespace intake {
+
+using ::frc971::PotAndIndexPosition;
+using ::frc971::EstimatorState;
+
+namespace {
+double UseUnlessZero(double target_value, double default_value) {
+ if (target_value != 0.0) {
+ return target_value;
+ } else {
+ return default_value;
+ }
+}
+} // namespace
+
+// Intake
+IntakeArm::IntakeArm()
+ : loop_(new ::frc971::control_loops::SimpleCappedStateFeedbackLoop<3, 1, 1>(
+ ::y2016_bot3::control_loops::intake::MakeIntegralIntakeLoop())),
+ estimator_(y2016_bot3::constants::intake_zero.zeroing),
+ profile_(::aos::controls::kLoopFrequency) {
+ Y_.setZero();
+ unprofiled_goal_.setZero();
+ offset_.setZero();
+ AdjustProfile(0.0, 0.0);
+}
+
+void IntakeArm::UpdateIntakeOffset(double offset) {
+ const double doffset = offset - offset_(0, 0);
+ LOG(INFO, "Adjusting Intake offset from %f to %f\n", offset_(0, 0), offset);
+
+ loop_->mutable_X_hat()(0, 0) += doffset;
+ Y_(0, 0) += doffset;
+ loop_->mutable_R(0, 0) += doffset;
+
+ profile_.MoveGoal(doffset);
+ offset_(0, 0) = offset;
+
+ CapGoal("R", &loop_->mutable_R());
+}
+
+void IntakeArm::Correct(PotAndIndexPosition position) {
+ estimator_.UpdateEstimate(position);
+
+ if (estimator_.error()) {
+ LOG(ERROR, "zeroing error with intake_estimator\n");
+ return;
+ }
+
+ if (!initialized_) {
+ if (estimator_.offset_ready()) {
+ UpdateIntakeOffset(estimator_.offset());
+ initialized_ = true;
+ }
+ }
+
+ if (!zeroed_ && estimator_.zeroed()) {
+ UpdateIntakeOffset(estimator_.offset());
+ zeroed_ = true;
+ }
+
+ Y_ << position.encoder;
+ Y_ += offset_;
+ loop_->Correct(Y_);
+}
+
+void IntakeArm::CapGoal(const char *name, Eigen::Matrix<double, 3, 1> *goal) {
+ // Limit the goal to min/max allowable angles.
+ if ((*goal)(0, 0) > y2016_bot3::constants::kIntakeRange.upper) {
+ LOG(WARNING, "Intake goal %s above limit, %f > %f\n", name, (*goal)(0, 0),
+ y2016_bot3::constants::kIntakeRange.upper);
+ (*goal)(0, 0) = y2016_bot3::constants::kIntakeRange.upper;
+ }
+ if ((*goal)(0, 0) < y2016_bot3::constants::kIntakeRange.lower) {
+ LOG(WARNING, "Intake goal %s below limit, %f < %f\n", name, (*goal)(0, 0),
+ y2016_bot3::constants::kIntakeRange.lower);
+ (*goal)(0, 0) = y2016_bot3::constants::kIntakeRange.lower;
+ }
+}
+
+void IntakeArm::ForceGoal(double goal) {
+ set_unprofiled_goal(goal);
+ loop_->mutable_R() = unprofiled_goal_;
+ loop_->mutable_next_R() = loop_->R();
+
+ profile_.MoveCurrentState(loop_->R().block<2, 1>(0, 0));
+}
+
+void IntakeArm::set_unprofiled_goal(double unprofiled_goal) {
+ unprofiled_goal_(0, 0) = unprofiled_goal;
+ unprofiled_goal_(1, 0) = 0.0;
+ unprofiled_goal_(2, 0) = 0.0;
+ CapGoal("unprofiled R", &unprofiled_goal_);
+}
+
+void IntakeArm::Update(bool disable) {
+ if (!disable) {
+ ::Eigen::Matrix<double, 2, 1> goal_state =
+ profile_.Update(unprofiled_goal_(0, 0), unprofiled_goal_(1, 0));
+
+ loop_->mutable_next_R(0, 0) = goal_state(0, 0);
+ loop_->mutable_next_R(1, 0) = goal_state(1, 0);
+ loop_->mutable_next_R(2, 0) = 0.0;
+ CapGoal("next R", &loop_->mutable_next_R());
+ }
+
+ loop_->Update(disable);
+
+ if (!disable && loop_->U(0, 0) != loop_->U_uncapped(0, 0)) {
+ profile_.MoveCurrentState(loop_->R().block<2, 1>(0, 0));
+ }
+}
+
+bool IntakeArm::CheckHardLimits() {
+ // Returns whether hard limits have been exceeded.
+
+ if (angle() > y2016_bot3::constants::kIntakeRange.upper_hard ||
+ angle() < y2016_bot3::constants::kIntakeRange.lower_hard) {
+ LOG(ERROR, "Intake at %f out of bounds [%f, %f], ESTOPing\n", angle(),
+ y2016_bot3::constants::kIntakeRange.lower_hard,
+ y2016_bot3::constants::kIntakeRange.upper_hard);
+ return true;
+ }
+
+ return false;
+}
+
+void IntakeArm::set_max_voltage(double voltage) {
+ loop_->set_max_voltage(0, voltage);
+}
+
+void IntakeArm::AdjustProfile(double max_angular_velocity,
+ double max_angular_acceleration) {
+ profile_.set_maximum_velocity(UseUnlessZero(max_angular_velocity, 10.0));
+ profile_.set_maximum_acceleration(
+ UseUnlessZero(max_angular_acceleration, 10.0));
+}
+
+void IntakeArm::Reset() {
+ estimator_.Reset();
+ initialized_ = false;
+ zeroed_ = false;
+}
+
+EstimatorState IntakeArm::IntakeEstimatorState() {
+ EstimatorState estimator_state;
+ ::frc971::zeroing::PopulateEstimatorState(estimator_, &estimator_state);
+
+ return estimator_state;
+}
+
+} // namespace intake
+} // namespace control_loops
+} // namespace y2016_bot3
diff --git a/y2016_bot3/control_loops/intake/intake_controls.h b/y2016_bot3/control_loops/intake/intake_controls.h
new file mode 100644
index 0000000..0b2daa0
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake_controls.h
@@ -0,0 +1,112 @@
+#ifndef Y2016_BOT3_CONTROL_LOOPS_INTAKE_INTAKE_CONTROLS_H_
+#define Y2016_BOT3_CONTROL_LOOPS_INTAKE_INTAKE_CONTROLS_H_
+
+#include <memory>
+
+#include "aos/common/controls/control_loop.h"
+#include "frc971/control_loops/state_feedback_loop.h"
+#include "frc971/control_loops/simple_capped_state_feedback_loop.h"
+#include "aos/common/util/trapezoid_profile.h"
+
+#include "frc971/zeroing/zeroing.h"
+#include "y2016_bot3/control_loops/intake/intake.q.h"
+
+namespace y2016_bot3 {
+namespace control_loops {
+namespace intake {
+namespace testing {
+class IntakeTest_DisabledGoalTest_Test;
+} // namespace testing
+
+class IntakeArm {
+ public:
+ IntakeArm();
+ // Returns whether the estimators have been initialized and zeroed.
+ bool initialized() const { return initialized_; }
+ bool zeroed() const { return zeroed_; }
+ // Returns whether an error has occured
+ bool error() const { return estimator_.error(); }
+
+ // Updates our estimator with the latest position.
+ void Correct(::frc971::PotAndIndexPosition position);
+ // Runs the controller and profile generator for a cycle.
+ void Update(bool disabled);
+ // Sets the maximum voltage that will be commanded by the loop.
+ void set_max_voltage(double voltage);
+
+ // Forces the current goal to the provided goal, bypassing the profiler.
+ void ForceGoal(double goal);
+ // Sets the unprofiled goal. The profiler will generate a profile to go to
+ // this goal.
+ void set_unprofiled_goal(double unprofiled_goal);
+ // Limits our profiles to a max velocity and acceleration for proper motion.
+ void AdjustProfile(double max_angular_velocity,
+ double max_angular_acceleration);
+
+ // Returns true if we have exceeded any hard limits.
+ bool CheckHardLimits();
+ // Resets the internal state.
+ void Reset();
+
+ // Returns the current internal estimator state for logging.
+ ::frc971::EstimatorState IntakeEstimatorState();
+
+ // Returns the requested intake voltage.
+ double intake_voltage() const { return loop_->U(0, 0); }
+
+ // Returns the current position.
+ double angle() const { return Y_(0, 0); }
+
+ // Returns the controller error.
+ const StateFeedbackLoop<3, 1, 1> &controller() const { return *loop_; }
+
+ // Returns the filtered goal.
+ const Eigen::Matrix<double, 3, 1> &goal() const { return loop_->R(); }
+ double goal(int row, int col) const { return loop_->R(row, col); }
+
+ // Returns the unprofiled goal.
+ const Eigen::Matrix<double, 3, 1> &unprofiled_goal() const {
+ return unprofiled_goal_;
+ }
+ double unprofiled_goal(int row, int col) const {
+ return unprofiled_goal_(row, col);
+ }
+
+ // Returns the current state estimate.
+ const Eigen::Matrix<double, 3, 1> &X_hat() const { return loop_->X_hat(); }
+ double X_hat(int row, int col) const { return loop_->X_hat(row, col); }
+
+ // For testing:
+ // Triggers an estimator error.
+ void TriggerEstimatorError() { estimator_.TriggerError(); }
+
+ private:
+ // Limits the provided goal to the soft limits. Prints "name" when it fails
+ // to aid debugging.
+ void CapGoal(const char *name, Eigen::Matrix<double, 3, 1> *goal);
+
+ void UpdateIntakeOffset(double offset);
+
+ ::std::unique_ptr<
+ ::frc971::control_loops::SimpleCappedStateFeedbackLoop<3, 1, 1>> loop_;
+
+ ::frc971::zeroing::ZeroingEstimator estimator_;
+ aos::util::TrapezoidProfile profile_;
+
+ // Current measurement.
+ Eigen::Matrix<double, 1, 1> Y_;
+ // Current offset. Y_ = offset_ + raw_sensor;
+ Eigen::Matrix<double, 1, 1> offset_;
+
+ // The goal that the profile tries to reach.
+ Eigen::Matrix<double, 3, 1> unprofiled_goal_;
+
+ bool initialized_ = false;
+ bool zeroed_ = false;
+};
+
+} // namespace intake
+} // namespace control_loops
+} // namespace y2016_bot3
+
+#endif // Y2016_CONTROL_LOOPS_SUPERSTRUCTURE_SUPERSTRUCTURE_CONTROLS_H_
diff --git a/y2016_bot3/control_loops/intake/intake_lib_test.cc b/y2016_bot3/control_loops/intake/intake_lib_test.cc
new file mode 100644
index 0000000..4048a19
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake_lib_test.cc
@@ -0,0 +1,544 @@
+#include "y2016_bot3/control_loops/intake/intake.h"
+
+#include <unistd.h>
+
+#include <memory>
+
+#include "gtest/gtest.h"
+#include "aos/common/queue.h"
+#include "aos/common/controls/control_loop_test.h"
+#include "aos/common/commonmath.h"
+#include "aos/common/time.h"
+#include "frc971/control_loops/position_sensor_sim.h"
+#include "y2016_bot3/control_loops/intake/intake.q.h"
+#include "y2016_bot3/control_loops/intake/intake_plant.h"
+
+using ::aos::time::Time;
+using ::frc971::control_loops::PositionSensorSimulator;
+
+namespace y2016_bot3 {
+namespace control_loops {
+namespace intake {
+namespace testing {
+
+class IntakePlant : public StateFeedbackPlant<2, 1, 1> {
+ public:
+ explicit IntakePlant(StateFeedbackPlant<2, 1, 1> &&other)
+ : StateFeedbackPlant<2, 1, 1>(::std::move(other)) {}
+
+ void CheckU() override {
+ for (int i = 0; i < kNumInputs; ++i) {
+ assert(U(i, 0) <= U_max(i, 0) + 0.00001 + voltage_offset_);
+ assert(U(i, 0) >= U_min(i, 0) - 0.00001 + voltage_offset_);
+ }
+ }
+
+ double voltage_offset() const { return voltage_offset_; }
+ void set_voltage_offset(double voltage_offset) {
+ voltage_offset_ = voltage_offset;
+ }
+
+ private:
+ double voltage_offset_ = 0.0;
+};
+
+// Class which simulates the intake and sends out queue messages with
+// the position.
+class IntakeSimulation {
+ public:
+ static constexpr double kNoiseScalar = 0.1;
+ IntakeSimulation()
+ : intake_plant_(new IntakePlant(MakeIntakePlant())),
+ pot_encoder_intake_(
+ y2016_bot3::constants::kIntakeEncoderIndexDifference),
+ intake_queue_(".y2016_bot3.control_loops.intake", 0x0,
+ ".y2016_bot3.control_loops.intake.goal",
+ ".y2016_bot3.control_loops.intake.status",
+ ".y2016_bot3.control_loops.intake.output",
+ ".y2016_bot3.control_loops.intake.status") {
+ InitializeIntakePosition(0.0);
+ }
+
+ void InitializeIntakePosition(double start_pos) {
+ intake_plant_->mutable_X(0, 0) = start_pos;
+ intake_plant_->mutable_X(1, 0) = 0.0;
+
+ pot_encoder_intake_.Initialize(start_pos, kNoiseScalar);
+ }
+
+ // Sends a queue message with the position.
+ void SendPositionMessage() {
+ ::aos::ScopedMessagePtr<control_loops::IntakeQueue::Position> position =
+ intake_queue_.position.MakeMessage();
+
+ pot_encoder_intake_.GetSensorValues(&position->intake);
+
+ position.Send();
+ }
+
+ double intake_angle() const { return intake_plant_->X(0, 0); }
+ double intake_angular_velocity() const { return intake_plant_->X(1, 0); }
+
+ // Sets the difference between the commanded and applied powers.
+ // This lets us test that the integrators work.
+ void set_power_error(double power_error_intake) {
+ intake_plant_->set_voltage_offset(power_error_intake);
+ }
+
+ // Simulates for a single timestep.
+ void Simulate() {
+ EXPECT_TRUE(intake_queue_.output.FetchLatest());
+
+ // Feed voltages into physics simulation.
+ intake_plant_->mutable_U() << intake_queue_.output->voltage_intake +
+ intake_plant_->voltage_offset();
+
+ // Verify that the correct power limits are being respected depending on
+ // which mode we are in.
+ EXPECT_TRUE(intake_queue_.status.FetchLatest());
+ if (intake_queue_.status->state == Intake::RUNNING) {
+ CHECK_LE(::std::abs(intake_queue_.output->voltage_intake),
+ Intake::kOperatingVoltage);
+ } else {
+ CHECK_LE(::std::abs(intake_queue_.output->voltage_intake),
+ Intake::kZeroingVoltage);
+ }
+
+ // Use the plant to generate the next physical state given the voltages to
+ // the motors.
+ intake_plant_->Update();
+
+ const double angle_intake = intake_plant_->Y(0, 0);
+
+ // Use the physical state to simulate sensor readings.
+ pot_encoder_intake_.MoveTo(angle_intake);
+
+ // Validate that everything is within range.
+ EXPECT_GE(angle_intake, y2016_bot3::constants::kIntakeRange.lower_hard);
+ EXPECT_LE(angle_intake, y2016_bot3::constants::kIntakeRange.upper_hard);
+ }
+
+ private:
+ ::std::unique_ptr<IntakePlant> intake_plant_;
+
+ PositionSensorSimulator pot_encoder_intake_;
+
+ IntakeQueue intake_queue_;
+};
+
+class IntakeTest : public ::aos::testing::ControlLoopTest {
+ protected:
+ IntakeTest()
+ : intake_queue_(".y2016_bot3.control_loops.intake", 0x0,
+ ".y2016_bot3.control_loops.intake.goal",
+ ".y2016_bot3.control_loops.intake.status",
+ ".y2016_bot3.control_loops.intake.output",
+ ".y2016_bot3.control_loops.intake.status"),
+ intake_(&intake_queue_),
+ intake_plant_() {}
+
+ void VerifyNearGoal() {
+ intake_queue_.goal.FetchLatest();
+ intake_queue_.status.FetchLatest();
+
+ EXPECT_TRUE(intake_queue_.goal.get() != nullptr);
+ EXPECT_TRUE(intake_queue_.status.get() != nullptr);
+
+ EXPECT_NEAR(intake_queue_.goal->angle_intake,
+ intake_queue_.status->intake.angle, 0.001);
+ EXPECT_NEAR(intake_queue_.goal->angle_intake, intake_plant_.intake_angle(),
+ 0.001);
+ }
+
+ // Runs one iteration of the whole simulation
+ void RunIteration(bool enabled = true) {
+ SendMessages(enabled);
+
+ intake_plant_.SendPositionMessage();
+ intake_.Iterate();
+ intake_plant_.Simulate();
+
+ TickTime();
+ }
+
+ // Runs iterations until the specified amount of simulated time has elapsed.
+ void RunForTime(const Time &run_for, bool enabled = true) {
+ const auto start_time = Time::Now();
+ while (Time::Now() < start_time + run_for) {
+ const auto loop_start_time = Time::Now();
+ double begin_intake_velocity = intake_plant_.intake_angular_velocity();
+ RunIteration(enabled);
+ const double loop_time = (Time::Now() - loop_start_time).ToSeconds();
+ const double intake_acceleration =
+ (intake_plant_.intake_angular_velocity() - begin_intake_velocity) /
+ loop_time;
+ EXPECT_GE(peak_intake_acceleration_, intake_acceleration);
+ EXPECT_LE(-peak_intake_acceleration_, intake_acceleration);
+
+ EXPECT_GE(peak_intake_velocity_, intake_plant_.intake_angular_velocity());
+ EXPECT_LE(-peak_intake_velocity_,
+ intake_plant_.intake_angular_velocity());
+ }
+ }
+
+ // Runs iterations while watching the average acceleration per cycle and
+ // making sure it doesn't exceed the provided bounds.
+ void set_peak_intake_acceleration(double value) {
+ peak_intake_acceleration_ = value;
+ }
+ void set_peak_intake_velocity(double value) { peak_intake_velocity_ = value; }
+
+
+
+ // Create a new instance of the test queue so that it invalidates the queue
+ // that it points to. Otherwise, we will have a pointed to
+ // shared memory that is no longer valid.
+ IntakeQueue intake_queue_;
+
+ // Create a control loop and simulation.
+ Intake intake_;
+ IntakeSimulation intake_plant_;
+
+ private:
+ // The acceleration limits to check for while moving for the 3 axes.
+ double peak_intake_acceleration_ = 1e10;
+ // The velocity limits to check for while moving for the 3 axes.
+ double peak_intake_velocity_ = 1e10;
+};
+
+// Tests that the intake does nothing when the goal is zero.
+TEST_F(IntakeTest, DoesNothing) {
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(0)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ // TODO(phil): Send a goal of some sort.
+ RunForTime(Time::InSeconds(5));
+ VerifyNearGoal();
+}
+
+// Tests that the loop can reach a goal.
+TEST_F(IntakeTest, ReachesGoal) {
+ // Set a reasonable goal.
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(M_PI / 4.0)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ // Give it a lot of time to get there.
+ RunForTime(Time::InSeconds(8));
+
+ VerifyNearGoal();
+}
+
+// Tests that the loop doesn't try and go beyond the physical range of the
+// mechanisms.
+TEST_F(IntakeTest, RespectsRange) {
+ // Set some ridiculous goals to test upper limits.
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(M_PI * 10)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+ RunForTime(Time::InSeconds(10));
+
+ // Check that we are near our soft limit.
+ intake_queue_.status.FetchLatest();
+ EXPECT_NEAR(y2016_bot3::constants::kIntakeRange.upper,
+ intake_queue_.status->intake.angle, 0.001);
+
+
+ // Set some ridiculous goals to test lower limits.
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(-M_PI * 10)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ RunForTime(Time::InSeconds(10));
+
+ // Check that we are near our soft limit.
+ intake_queue_.status.FetchLatest();
+ EXPECT_NEAR(y2016_bot3::constants::kIntakeRange.lower,
+ intake_queue_.status->intake.angle, 0.001);
+}
+
+// Tests that the loop zeroes when run for a while.
+TEST_F(IntakeTest, ZeroTest) {
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.lower)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ RunForTime(Time::InSeconds(10));
+
+ VerifyNearGoal();
+}
+
+// Tests that the loop zeroes when run for a while without a goal.
+TEST_F(IntakeTest, ZeroNoGoal) {
+ RunForTime(Time::InSeconds(5));
+
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+}
+
+// Tests that starting at the lower hardstops doesn't cause an abort.
+TEST_F(IntakeTest, LowerHardstopStartup) {
+ intake_plant_.InitializeIntakePosition(
+ y2016_bot3::constants::kIntakeRange.lower);
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.upper)
+ .Send());
+
+ RunForTime(Time::InSeconds(15));
+ VerifyNearGoal();
+}
+
+// Tests that starting at the upper hardstops doesn't cause an abort.
+TEST_F(IntakeTest, UpperHardstopStartup) {
+ intake_plant_.InitializeIntakePosition(
+ y2016_bot3::constants::kIntakeRange.upper);
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.lower)
+ .Send());
+
+ RunForTime(Time::InSeconds(15));
+ VerifyNearGoal();
+}
+
+// Tests that resetting WPILib results in a rezero.
+TEST_F(IntakeTest, ResetTest) {
+ intake_plant_.InitializeIntakePosition(
+ y2016_bot3::constants::kIntakeRange.upper);
+
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.lower + 0.3)
+ .Send());
+ RunForTime(Time::InSeconds(15));
+
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+ VerifyNearGoal();
+ SimulateSensorReset();
+ RunForTime(Time::InMS(100));
+ EXPECT_NE(Intake::RUNNING, intake_.state());
+ RunForTime(Time::InMS(10000));
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+ VerifyNearGoal();
+}
+
+// Tests that the internal goals don't change while disabled.
+TEST_F(IntakeTest, DisabledGoalTest) {
+ ASSERT_TRUE(
+ intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.lower + 0.03)
+ .Send());
+
+ RunForTime(Time::InMS(100), false);
+ EXPECT_EQ(0.0, intake_.intake_.goal(0, 0));
+
+ // Now make sure they move correctly
+ RunForTime(Time::InMS(4000), true);
+ EXPECT_NE(0.0, intake_.intake_.goal(0, 0));
+}
+
+// Tests that disabling while zeroing at any state restarts from beginning
+TEST_F(IntakeTest, DisabledWhileZeroingHigh) {
+ intake_plant_.InitializeIntakePosition(
+ y2016_bot3::constants::kIntakeRange.upper);
+
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.upper)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ // Expected states to cycle through and check in order.
+ Intake::State ExpectedStateOrder[] = {
+ Intake::DISABLED_INITIALIZED, Intake::ZERO_LOWER_INTAKE};
+
+ // Cycle through until intake_ is initialized in intake.cc
+ while (intake_.state() < Intake::DISABLED_INITIALIZED) {
+ RunIteration(true);
+ }
+
+ static const int kNumberOfStates =
+ sizeof(ExpectedStateOrder) / sizeof(ExpectedStateOrder[0]);
+
+ // Next state when reached to disable
+ for (int i = 0; i < kNumberOfStates; i++) {
+ // Next expected state after being disabled that is expected until next
+ // state to disable at is reached
+ for (int j = 0; intake_.state() != ExpectedStateOrder[i] && j <= i; j++) {
+ // RunIteration until next expected state is reached with a maximum
+ // of 10000 times to ensure a breakout
+ for (int o = 0; intake_.state() < ExpectedStateOrder[j] && o < 10000;
+ o++) {
+ RunIteration(true);
+ }
+ EXPECT_EQ(ExpectedStateOrder[j], intake_.state());
+ }
+
+ EXPECT_EQ(ExpectedStateOrder[i], intake_.state());
+
+ // Disable
+ RunIteration(false);
+
+ EXPECT_EQ(Intake::DISABLED_INITIALIZED, intake_.state());
+ }
+
+ RunForTime(Time::InSeconds(10));
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+}
+
+// Tests that disabling while zeroing at any state restarts from beginning
+TEST_F(IntakeTest, DisabledWhileZeroingLow) {
+ intake_plant_.InitializeIntakePosition(
+ y2016_bot3::constants::kIntakeRange.lower);
+
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(y2016_bot3::constants::kIntakeRange.lower)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ // Expected states to cycle through and check in order.
+ Intake::State ExpectedStateOrder[] = {
+ Intake::DISABLED_INITIALIZED, Intake::ZERO_LIFT_INTAKE};
+
+ // Cycle through until intake_ is initialized in intake.cc
+ while (intake_.state() < Intake::DISABLED_INITIALIZED) {
+ RunIteration(true);
+ }
+
+ static const int kNumberOfStates =
+ sizeof(ExpectedStateOrder) / sizeof(ExpectedStateOrder[0]);
+
+ // Next state when reached to disable
+ for (int i = 0; i < kNumberOfStates; i++) {
+ // Next expected state after being disabled that is expected until next
+ // state to disable at is reached
+ for (int j = 0; intake_.state() != ExpectedStateOrder[i] && j <= i; j++) {
+ // RunIteration until next expected state is reached with a maximum
+ // of 10000 times to ensure a breakout
+ for (int o = 0; intake_.state() < ExpectedStateOrder[j] && o < 10000;
+ o++) {
+ RunIteration(true);
+ }
+ EXPECT_EQ(ExpectedStateOrder[j], intake_.state());
+ }
+
+ EXPECT_EQ(ExpectedStateOrder[i], intake_.state());
+
+ // Disable
+ RunIteration(false);
+
+ EXPECT_EQ(Intake::DISABLED_INITIALIZED, intake_.state());
+ }
+
+ RunForTime(Time::InSeconds(10));
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+}
+
+// Tests that the integrators works.
+TEST_F(IntakeTest, IntegratorTest) {
+ intake_plant_.InitializeIntakePosition(
+ y2016_bot3::constants::kIntakeRange.lower);
+ intake_plant_.set_power_error(1.0);
+ intake_queue_.goal.MakeWithBuilder().angle_intake(0.0).Send();
+
+ RunForTime(Time::InSeconds(8));
+
+ VerifyNearGoal();
+}
+
+// Tests that zeroing while disabled works. Starts the superstructure near a
+// pulse, lets it initialize, moves it past the pulse, enables, and then make
+// sure it goes to the right spot.
+TEST_F(IntakeTest, DisabledZeroTest) {
+ intake_plant_.InitializeIntakePosition(-0.001);
+
+ intake_queue_.goal.MakeWithBuilder().angle_intake(0.0).Send();
+
+ // Run disabled for 2 seconds
+ RunForTime(Time::InSeconds(2), false);
+ EXPECT_EQ(Intake::DISABLED_INITIALIZED, intake_.state());
+
+ intake_plant_.set_power_error(1.0);
+
+ RunForTime(Time::InSeconds(1), false);
+
+ EXPECT_EQ(Intake::SLOW_RUNNING, intake_.state());
+ RunForTime(Time::InSeconds(2), true);
+
+ VerifyNearGoal();
+}
+
+// Tests that the zeroing errors in the intake are caught
+TEST_F(IntakeTest, IntakeZeroingErrorTest) {
+ RunIteration();
+ EXPECT_NE(Intake::ESTOP, intake_.state());
+ intake_.intake_.TriggerEstimatorError();
+ RunIteration();
+
+ EXPECT_EQ(Intake::ESTOP, intake_.state());
+}
+
+// Tests that the loop respects intake acceleration limits while moving.
+TEST_F(IntakeTest, IntakeAccelerationLimitTest) {
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(0.0)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ RunForTime(Time::InSeconds(6));
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+
+ VerifyNearGoal();
+
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(0.5)
+ .max_angular_velocity_intake(1)
+ .max_angular_acceleration_intake(1)
+ .Send());
+
+ set_peak_intake_acceleration(1.20);
+ RunForTime(Time::InSeconds(4));
+
+ VerifyNearGoal();
+}
+
+// Tests that the loop respects intake handles saturation while accelerating
+// correctly.
+TEST_F(IntakeTest, SaturatedIntakeProfileTest) {
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(0.0)
+ .max_angular_velocity_intake(20)
+ .max_angular_acceleration_intake(20)
+ .Send());
+
+ RunForTime(Time::InSeconds(6));
+ EXPECT_EQ(Intake::RUNNING, intake_.state());
+
+ VerifyNearGoal();
+
+ ASSERT_TRUE(intake_queue_.goal.MakeWithBuilder()
+ .angle_intake(0.5)
+ .max_angular_velocity_intake(4.5)
+ .max_angular_acceleration_intake(800)
+ .Send());
+
+ set_peak_intake_velocity(4.65);
+ RunForTime(Time::InSeconds(4));
+
+ VerifyNearGoal();
+}
+
+} // namespace testing
+} // namespace intake
+} // namespace control_loops
+} // namespace frc971
diff --git a/y2016_bot3/control_loops/intake/intake_main.cc b/y2016_bot3/control_loops/intake/intake_main.cc
new file mode 100644
index 0000000..a60f914
--- /dev/null
+++ b/y2016_bot3/control_loops/intake/intake_main.cc
@@ -0,0 +1,11 @@
+#include "y2016_bot3/control_loops/intake/intake.h"
+
+#include "aos/linux_code/init.h"
+
+int main() {
+ ::aos::Init();
+ ::y2016_bot3::control_loops::intake::Intake intake;
+ intake.Run();
+ ::aos::Cleanup();
+ return 0;
+}
diff --git a/y2016_bot3/control_loops/python/BUILD b/y2016_bot3/control_loops/python/BUILD
new file mode 100644
index 0000000..1c2ef63
--- /dev/null
+++ b/y2016_bot3/control_loops/python/BUILD
@@ -0,0 +1,65 @@
+package(default_visibility = ['//y2016_bot3:__subpackages__'])
+
+py_binary(
+ name = 'drivetrain',
+ srcs = [
+ 'drivetrain.py',
+ ],
+ deps = [
+ '//external:python-gflags',
+ '//external:python-glog',
+ '//frc971/control_loops/python:controls',
+ ],
+)
+
+py_binary(
+ name = 'polydrivetrain',
+ srcs = [
+ 'polydrivetrain.py',
+ 'drivetrain.py',
+ ],
+ deps = [
+ '//external:python-gflags',
+ '//external:python-glog',
+ '//frc971/control_loops/python:controls',
+ ],
+)
+
+py_library(
+ name = 'polydrivetrain_lib',
+ srcs = [
+ 'polydrivetrain.py',
+ 'drivetrain.py',
+ ],
+ deps = [
+ '//external:python-gflags',
+ '//external:python-glog',
+ '//frc971/control_loops/python:controls',
+ ],
+)
+
+py_binary(
+ name = 'intake',
+ srcs = [
+ 'intake.py',
+ ],
+ deps = [
+ '//aos/common/util:py_trapezoid_profile',
+ '//external:python-gflags',
+ '//external:python-glog',
+ '//frc971/control_loops/python:controls',
+ ],
+)
+
+py_library(
+ name = 'intake_lib',
+ srcs = [
+ 'intake.py',
+ ],
+ deps = [
+ '//aos/common/util:py_trapezoid_profile',
+ '//external:python-gflags',
+ '//external:python-glog',
+ '//frc971/control_loops/python:controls',
+ ],
+)
diff --git a/y2016_bot3/control_loops/python/drivetrain.py b/y2016_bot3/control_loops/python/drivetrain.py
new file mode 100755
index 0000000..5de7dbc
--- /dev/null
+++ b/y2016_bot3/control_loops/python/drivetrain.py
@@ -0,0 +1,398 @@
+#!/usr/bin/python
+
+from frc971.control_loops.python import control_loop
+from frc971.control_loops.python import controls
+import numpy
+import sys
+import argparse
+from matplotlib import pylab
+
+import gflags
+import glog
+
+FLAGS = gflags.FLAGS
+
+gflags.DEFINE_bool('plot', False, 'If true, plot the loop response.')
+
+class CIM(control_loop.ControlLoop):
+ def __init__(self):
+ super(CIM, self).__init__("CIM")
+ # Stall Torque in N m
+ self.stall_torque = 2.42
+ # Stall Current in Amps
+ self.stall_current = 133
+ # Free Speed in RPM
+ self.free_speed = 4650.0
+ # Free Current in Amps
+ self.free_current = 2.7
+ # Moment of inertia of the CIM in kg m^2
+ self.J = 0.0001
+ # Resistance of the motor, divided by 2 to account for the 2 motors
+ self.resistance = 12.0 / self.stall_current
+ # Motor velocity constant
+ self.Kv = ((self.free_speed / 60.0 * 2.0 * numpy.pi) /
+ (12.0 - self.resistance * self.free_current))
+ # Torque constant
+ self.Kt = self.stall_torque / self.stall_current
+ # Control loop time step
+ self.dt = 0.005
+
+ # State feedback matrices
+ self.A_continuous = numpy.matrix(
+ [[-self.Kt / self.Kv / (self.J * self.resistance)]])
+ self.B_continuous = numpy.matrix(
+ [[self.Kt / (self.J * self.resistance)]])
+ self.C = numpy.matrix([[1]])
+ self.D = numpy.matrix([[0]])
+
+ self.A, self.B = self.ContinuousToDiscrete(self.A_continuous,
+ self.B_continuous, self.dt)
+
+ self.PlaceControllerPoles([0.01])
+ self.PlaceObserverPoles([0.01])
+
+ self.U_max = numpy.matrix([[12.0]])
+ self.U_min = numpy.matrix([[-12.0]])
+
+ self.InitializeState()
+
+
+class Drivetrain(control_loop.ControlLoop):
+ def __init__(self, name="Drivetrain", left_low=True, right_low=True):
+ super(Drivetrain, self).__init__(name)
+ # Number of motors per side
+ self.num_motors = 2
+ # Stall Torque in N m
+ self.stall_torque = 2.42 * self.num_motors * 0.60
+ # Stall Current in Amps
+ self.stall_current = 133.0 * self.num_motors
+ # Free Speed in RPM. Used number from last year.
+ self.free_speed = 5500.0
+ # Free Current in Amps
+ self.free_current = 4.7 * self.num_motors
+ # Moment of inertia of the drivetrain in kg m^2
+ self.J = 8.0
+ # Mass of the robot, in kg.
+ self.m = 45
+ # Radius of the robot, in meters (requires tuning by hand)
+ self.rb = 0.601 / 2.0
+ # Radius of the wheels, in meters.
+ self.r = 0.097155 * 0.9811158901447808 / 118.0 * 115.75
+ # Resistance of the motor, divided by the number of motors.
+ self.resistance = 12.0 / self.stall_current
+ # Motor velocity constant
+ self.Kv = ((self.free_speed / 60.0 * 2.0 * numpy.pi) /
+ (12.0 - self.resistance * self.free_current))
+ # Torque constant
+ self.Kt = self.stall_torque / self.stall_current
+ # Gear ratios
+ self.G_low = 14.0 / 48.0 * 18.0 / 60.0 * 18.0 / 36.0
+ self.G_high = 14.0 / 48.0 * 28.0 / 50.0 * 18.0 / 36.0
+ if left_low:
+ self.Gl = self.G_low
+ else:
+ self.Gl = self.G_high
+ if right_low:
+ self.Gr = self.G_low
+ else:
+ self.Gr = self.G_high
+
+ # Control loop time step
+ self.dt = 0.005
+
+ # These describe the way that a given side of a robot will be influenced
+ # by the other side. Units of 1 / kg.
+ self.msp = 1.0 / self.m + self.rb * self.rb / self.J
+ self.msn = 1.0 / self.m - self.rb * self.rb / self.J
+ # The calculations which we will need for A and B.
+ self.tcl = -self.Kt / self.Kv / (self.Gl * self.Gl * self.resistance * self.r * self.r)
+ self.tcr = -self.Kt / self.Kv / (self.Gr * self.Gr * self.resistance * self.r * self.r)
+ self.mpl = self.Kt / (self.Gl * self.resistance * self.r)
+ self.mpr = self.Kt / (self.Gr * self.resistance * self.r)
+
+ # State feedback matrices
+ # X will be of the format
+ # [[positionl], [velocityl], [positionr], velocityr]]
+ self.A_continuous = numpy.matrix(
+ [[0, 1, 0, 0],
+ [0, self.msp * self.tcl, 0, self.msn * self.tcr],
+ [0, 0, 0, 1],
+ [0, self.msn * self.tcl, 0, self.msp * self.tcr]])
+ self.B_continuous = numpy.matrix(
+ [[0, 0],
+ [self.msp * self.mpl, self.msn * self.mpr],
+ [0, 0],
+ [self.msn * self.mpl, self.msp * self.mpr]])
+ self.C = numpy.matrix([[1, 0, 0, 0],
+ [0, 0, 1, 0]])
+ self.D = numpy.matrix([[0, 0],
+ [0, 0]])
+
+ self.A, self.B = self.ContinuousToDiscrete(
+ self.A_continuous, self.B_continuous, self.dt)
+
+ if left_low or right_low:
+ q_pos = 0.12
+ q_vel = 1.0
+ else:
+ q_pos = 0.14
+ q_vel = 0.95
+
+ self.Q = numpy.matrix([[(1.0 / (q_pos ** 2.0)), 0.0, 0.0, 0.0],
+ [0.0, (1.0 / (q_vel ** 2.0)), 0.0, 0.0],
+ [0.0, 0.0, (1.0 / (q_pos ** 2.0)), 0.0],
+ [0.0, 0.0, 0.0, (1.0 / (q_vel ** 2.0))]])
+
+ self.R = numpy.matrix([[(1.0 / (12.0 ** 2.0)), 0.0],
+ [0.0, (1.0 / (12.0 ** 2.0))]])
+ self.K = controls.dlqr(self.A, self.B, self.Q, self.R)
+
+ glog.debug('DT q_pos %f q_vel %s %s', q_pos, q_vel, name)
+ glog.debug(str(numpy.linalg.eig(self.A - self.B * self.K)[0]))
+ glog.debug('K %s', repr(self.K))
+
+ self.hlp = 0.3
+ self.llp = 0.4
+ self.PlaceObserverPoles([self.hlp, self.hlp, self.llp, self.llp])
+
+ self.U_max = numpy.matrix([[12.0], [12.0]])
+ self.U_min = numpy.matrix([[-12.0], [-12.0]])
+
+ self.InitializeState()
+
+
+class KFDrivetrain(Drivetrain):
+ def __init__(self, name="KFDrivetrain", left_low=True, right_low=True):
+ super(KFDrivetrain, self).__init__(name, left_low, right_low)
+
+ self.unaugmented_A_continuous = self.A_continuous
+ self.unaugmented_B_continuous = self.B_continuous
+
+ # The states are
+ # The practical voltage applied to the wheels is
+ # V_left = U_left + left_voltage_error
+ #
+ # [left position, left velocity, right position, right velocity,
+ # left voltage error, right voltage error, angular_error]
+ #
+ # The left and right positions are filtered encoder positions and are not
+ # adjusted for heading error.
+ # The turn velocity as computed by the left and right velocities is
+ # adjusted by the gyro velocity.
+ # The angular_error is the angular velocity error between the wheel speed
+ # and the gyro speed.
+ self.A_continuous = numpy.matrix(numpy.zeros((7, 7)))
+ self.B_continuous = numpy.matrix(numpy.zeros((7, 2)))
+ self.A_continuous[0:4,0:4] = self.unaugmented_A_continuous
+ self.A_continuous[0:4,4:6] = self.unaugmented_B_continuous
+ self.B_continuous[0:4,0:2] = self.unaugmented_B_continuous
+ self.A_continuous[0,6] = 1
+ self.A_continuous[2,6] = -1
+
+ self.A, self.B = self.ContinuousToDiscrete(
+ self.A_continuous, self.B_continuous, self.dt)
+
+ self.C = numpy.matrix([[1, 0, 0, 0, 0, 0, 0],
+ [0, 0, 1, 0, 0, 0, 0],
+ [0, -0.5 / self.rb, 0, 0.5 / self.rb, 0, 0, 0]])
+
+ self.D = numpy.matrix([[0, 0],
+ [0, 0],
+ [0, 0]])
+
+ q_pos = 0.05
+ q_vel = 1.00
+ q_voltage = 10.0
+ q_encoder_uncertainty = 2.00
+
+ self.Q = numpy.matrix([[(q_pos ** 2.0), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+ [0.0, (q_vel ** 2.0), 0.0, 0.0, 0.0, 0.0, 0.0],
+ [0.0, 0.0, (q_pos ** 2.0), 0.0, 0.0, 0.0, 0.0],
+ [0.0, 0.0, 0.0, (q_vel ** 2.0), 0.0, 0.0, 0.0],
+ [0.0, 0.0, 0.0, 0.0, (q_voltage ** 2.0), 0.0, 0.0],
+ [0.0, 0.0, 0.0, 0.0, 0.0, (q_voltage ** 2.0), 0.0],
+ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, (q_encoder_uncertainty ** 2.0)]])
+
+ r_pos = 0.0001
+ r_gyro = 0.000001
+ self.R = numpy.matrix([[(r_pos ** 2.0), 0.0, 0.0],
+ [0.0, (r_pos ** 2.0), 0.0],
+ [0.0, 0.0, (r_gyro ** 2.0)]])
+
+ # Solving for kf gains.
+ self.KalmanGain, self.Q_steady = controls.kalman(
+ A=self.A, B=self.B, C=self.C, Q=self.Q, R=self.R)
+
+ self.L = self.A * self.KalmanGain
+
+ unaug_K = self.K
+
+ # Implement a nice closed loop controller for use by the closed loop
+ # controller.
+ self.K = numpy.matrix(numpy.zeros((self.B.shape[1], self.A.shape[0])))
+ self.K[0:2, 0:4] = unaug_K
+ self.K[0, 4] = 1.0
+ self.K[1, 5] = 1.0
+
+ self.Qff = numpy.matrix(numpy.zeros((4, 4)))
+ qff_pos = 0.005
+ qff_vel = 1.00
+ self.Qff[0, 0] = 1.0 / qff_pos ** 2.0
+ self.Qff[1, 1] = 1.0 / qff_vel ** 2.0
+ self.Qff[2, 2] = 1.0 / qff_pos ** 2.0
+ self.Qff[3, 3] = 1.0 / qff_vel ** 2.0
+ self.Kff = numpy.matrix(numpy.zeros((2, 7)))
+ self.Kff[0:2, 0:4] = controls.TwoStateFeedForwards(self.B[0:4,:], self.Qff)
+
+ self.InitializeState()
+
+
+def main(argv):
+ argv = FLAGS(argv)
+ glog.init()
+
+ # Simulate the response of the system to a step input.
+ drivetrain = Drivetrain(left_low=False, right_low=False)
+ simulated_left = []
+ simulated_right = []
+ for _ in xrange(100):
+ drivetrain.Update(numpy.matrix([[12.0], [12.0]]))
+ simulated_left.append(drivetrain.X[0, 0])
+ simulated_right.append(drivetrain.X[2, 0])
+
+ if FLAGS.plot:
+ pylab.plot(range(100), simulated_left)
+ pylab.plot(range(100), simulated_right)
+ pylab.suptitle('Acceleration Test')
+ pylab.show()
+
+ # Simulate forwards motion.
+ drivetrain = Drivetrain(left_low=False, right_low=False)
+ close_loop_left = []
+ close_loop_right = []
+ left_power = []
+ right_power = []
+ R = numpy.matrix([[1.0], [0.0], [1.0], [0.0]])
+ for _ in xrange(300):
+ U = numpy.clip(drivetrain.K * (R - drivetrain.X_hat),
+ drivetrain.U_min, drivetrain.U_max)
+ drivetrain.UpdateObserver(U)
+ drivetrain.Update(U)
+ close_loop_left.append(drivetrain.X[0, 0])
+ close_loop_right.append(drivetrain.X[2, 0])
+ left_power.append(U[0, 0])
+ right_power.append(U[1, 0])
+
+ if FLAGS.plot:
+ pylab.plot(range(300), close_loop_left, label='left position')
+ pylab.plot(range(300), close_loop_right, label='right position')
+ pylab.plot(range(300), left_power, label='left power')
+ pylab.plot(range(300), right_power, label='right power')
+ pylab.suptitle('Linear Move')
+ pylab.legend()
+ pylab.show()
+
+ # Try turning in place
+ drivetrain = Drivetrain()
+ close_loop_left = []
+ close_loop_right = []
+ R = numpy.matrix([[-1.0], [0.0], [1.0], [0.0]])
+ for _ in xrange(100):
+ U = numpy.clip(drivetrain.K * (R - drivetrain.X_hat),
+ drivetrain.U_min, drivetrain.U_max)
+ drivetrain.UpdateObserver(U)
+ drivetrain.Update(U)
+ close_loop_left.append(drivetrain.X[0, 0])
+ close_loop_right.append(drivetrain.X[2, 0])
+
+ if FLAGS.plot:
+ pylab.plot(range(100), close_loop_left)
+ pylab.plot(range(100), close_loop_right)
+ pylab.suptitle('Angular Move')
+ pylab.show()
+
+ # Try turning just one side.
+ drivetrain = Drivetrain()
+ close_loop_left = []
+ close_loop_right = []
+ R = numpy.matrix([[0.0], [0.0], [1.0], [0.0]])
+ for _ in xrange(100):
+ U = numpy.clip(drivetrain.K * (R - drivetrain.X_hat),
+ drivetrain.U_min, drivetrain.U_max)
+ drivetrain.UpdateObserver(U)
+ drivetrain.Update(U)
+ close_loop_left.append(drivetrain.X[0, 0])
+ close_loop_right.append(drivetrain.X[2, 0])
+
+ if FLAGS.plot:
+ pylab.plot(range(100), close_loop_left)
+ pylab.plot(range(100), close_loop_right)
+ pylab.suptitle('Pivot')
+ pylab.show()
+
+ # Write the generated constants out to a file.
+ drivetrain_low_low = Drivetrain(
+ name="DrivetrainLowLow", left_low=True, right_low=True)
+ drivetrain_low_high = Drivetrain(
+ name="DrivetrainLowHigh", left_low=True, right_low=False)
+ drivetrain_high_low = Drivetrain(
+ name="DrivetrainHighLow", left_low=False, right_low=True)
+ drivetrain_high_high = Drivetrain(
+ name="DrivetrainHighHigh", left_low=False, right_low=False)
+
+ kf_drivetrain_low_low = KFDrivetrain(
+ name="KFDrivetrainLowLow", left_low=True, right_low=True)
+ kf_drivetrain_low_high = KFDrivetrain(
+ name="KFDrivetrainLowHigh", left_low=True, right_low=False)
+ kf_drivetrain_high_low = KFDrivetrain(
+ name="KFDrivetrainHighLow", left_low=False, right_low=True)
+ kf_drivetrain_high_high = KFDrivetrain(
+ name="KFDrivetrainHighHigh", left_low=False, right_low=False)
+
+ if len(argv) != 5:
+ print "Expected .h file name and .cc file name"
+ else:
+ namespaces = ['y2016_bot3', 'control_loops', 'drivetrain']
+ dog_loop_writer = control_loop.ControlLoopWriter(
+ "Drivetrain", [drivetrain_low_low, drivetrain_low_high,
+ drivetrain_high_low, drivetrain_high_high],
+ namespaces = namespaces)
+ dog_loop_writer.AddConstant(control_loop.Constant("kDt", "%f",
+ drivetrain_low_low.dt))
+ dog_loop_writer.AddConstant(control_loop.Constant("kStallTorque", "%f",
+ drivetrain_low_low.stall_torque))
+ dog_loop_writer.AddConstant(control_loop.Constant("kStallCurrent", "%f",
+ drivetrain_low_low.stall_current))
+ dog_loop_writer.AddConstant(control_loop.Constant("kFreeSpeedRPM", "%f",
+ drivetrain_low_low.free_speed))
+ dog_loop_writer.AddConstant(control_loop.Constant("kFreeCurrent", "%f",
+ drivetrain_low_low.free_current))
+ dog_loop_writer.AddConstant(control_loop.Constant("kJ", "%f",
+ drivetrain_low_low.J))
+ dog_loop_writer.AddConstant(control_loop.Constant("kMass", "%f",
+ drivetrain_low_low.m))
+ dog_loop_writer.AddConstant(control_loop.Constant("kRobotRadius", "%f",
+ drivetrain_low_low.rb))
+ dog_loop_writer.AddConstant(control_loop.Constant("kWheelRadius", "%f",
+ drivetrain_low_low.r))
+ dog_loop_writer.AddConstant(control_loop.Constant("kR", "%f",
+ drivetrain_low_low.resistance))
+ dog_loop_writer.AddConstant(control_loop.Constant("kV", "%f",
+ drivetrain_low_low.Kv))
+ dog_loop_writer.AddConstant(control_loop.Constant("kT", "%f",
+ drivetrain_low_low.Kt))
+ dog_loop_writer.AddConstant(control_loop.Constant("kLowGearRatio", "%f",
+ drivetrain_low_low.G_low))
+ dog_loop_writer.AddConstant(control_loop.Constant("kHighGearRatio", "%f",
+ drivetrain_high_high.G_high))
+
+ dog_loop_writer.Write(argv[1], argv[2])
+
+ kf_loop_writer = control_loop.ControlLoopWriter(
+ "KFDrivetrain", [kf_drivetrain_low_low, kf_drivetrain_low_high,
+ kf_drivetrain_high_low, kf_drivetrain_high_high],
+ namespaces = namespaces)
+ kf_loop_writer.Write(argv[3], argv[4])
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/y2016_bot3/control_loops/python/intake.py b/y2016_bot3/control_loops/python/intake.py
new file mode 100755
index 0000000..fa34063
--- /dev/null
+++ b/y2016_bot3/control_loops/python/intake.py
@@ -0,0 +1,314 @@
+#!/usr/bin/python
+
+from aos.common.util.trapezoid_profile import TrapezoidProfile
+from frc971.control_loops.python import control_loop
+from frc971.control_loops.python import controls
+import numpy
+import sys
+import matplotlib
+from matplotlib import pylab
+import gflags
+import glog
+
+FLAGS = gflags.FLAGS
+
+try:
+ gflags.DEFINE_bool('plot', False, 'If true, plot the loop response.')
+except gflags.DuplicateFlagError:
+ pass
+
+class Intake(control_loop.ControlLoop):
+ def __init__(self, name="Intake"):
+ super(Intake, self).__init__(name)
+ # TODO(constants): Update all of these & retune poles.
+ # Stall Torque in N m
+ self.stall_torque = 0.71
+ # Stall Current in Amps
+ self.stall_current = 134
+ # Free Speed in RPM
+ self.free_speed = 18730
+ # Free Current in Amps
+ self.free_current = 0.7
+
+ # Resistance of the motor
+ self.R = 12.0 / self.stall_current
+ # Motor velocity constant
+ self.Kv = ((self.free_speed / 60.0 * 2.0 * numpy.pi) /
+ (12.0 - self.R * self.free_current))
+ # Torque constant
+ self.Kt = self.stall_torque / self.stall_current
+ # Gear ratio
+ self.G = (56.0 / 12.0) * (54.0 / 14.0) * (64.0 / 18.0) * (48.0 / 16.0)
+
+ # Moment of inertia, measured in CAD.
+ # Extra mass to compensate for friction is added on.
+ self.J = 0.34 + 0.40
+
+ # Control loop time step
+ self.dt = 0.005
+
+ # State is [position, velocity]
+ # Input is [Voltage]
+
+ C1 = self.G * self.G * self.Kt / (self.R * self.J * self.Kv)
+ C2 = self.Kt * self.G / (self.J * self.R)
+
+ self.A_continuous = numpy.matrix(
+ [[0, 1],
+ [0, -C1]])
+
+ # Start with the unmodified input
+ self.B_continuous = numpy.matrix(
+ [[0],
+ [C2]])
+
+ self.C = numpy.matrix([[1, 0]])
+ self.D = numpy.matrix([[0]])
+
+ self.A, self.B = self.ContinuousToDiscrete(
+ self.A_continuous, self.B_continuous, self.dt)
+
+ controllability = controls.ctrb(self.A, self.B)
+
+ glog.debug("Free speed is %f", self.free_speed * numpy.pi * 2.0 / 60.0 / self.G)
+
+ q_pos = 0.20
+ q_vel = 5.0
+ self.Q = numpy.matrix([[(1.0 / (q_pos ** 2.0)), 0.0],
+ [0.0, (1.0 / (q_vel ** 2.0))]])
+
+ self.R = numpy.matrix([[(1.0 / (12.0 ** 2.0))]])
+ self.K = controls.dlqr(self.A, self.B, self.Q, self.R)
+
+ q_pos_ff = 0.005
+ q_vel_ff = 1.0
+ self.Qff = numpy.matrix([[(1.0 / (q_pos_ff ** 2.0)), 0.0],
+ [0.0, (1.0 / (q_vel_ff ** 2.0))]])
+
+ self.Kff = controls.TwoStateFeedForwards(self.B, self.Qff)
+
+ glog.debug('K %s', repr(self.K))
+ glog.debug('Poles are %s',
+ repr(numpy.linalg.eig(self.A - self.B * self.K)[0]))
+
+ self.rpl = 0.30
+ self.ipl = 0.10
+ self.PlaceObserverPoles([self.rpl + 1j * self.ipl,
+ self.rpl - 1j * self.ipl])
+
+ glog.debug('L is %s', repr(self.L))
+
+ q_pos = 0.10
+ q_vel = 1.65
+ self.Q = numpy.matrix([[(q_pos ** 2.0), 0.0],
+ [0.0, (q_vel ** 2.0)]])
+
+ r_volts = 0.025
+ self.R = numpy.matrix([[(r_volts ** 2.0)]])
+
+ self.KalmanGain, self.Q_steady = controls.kalman(
+ A=self.A, B=self.B, C=self.C, Q=self.Q, R=self.R)
+
+ glog.debug('Kal %s', repr(self.KalmanGain))
+ self.L = self.A * self.KalmanGain
+ glog.debug('KalL is %s', repr(self.L))
+
+ # The box formed by U_min and U_max must encompass all possible values,
+ # or else Austin's code gets angry.
+ self.U_max = numpy.matrix([[12.0]])
+ self.U_min = numpy.matrix([[-12.0]])
+
+ self.InitializeState()
+
+class IntegralIntake(Intake):
+ def __init__(self, name="IntegralIntake"):
+ super(IntegralIntake, self).__init__(name=name)
+
+ self.A_continuous_unaugmented = self.A_continuous
+ self.B_continuous_unaugmented = self.B_continuous
+
+ self.A_continuous = numpy.matrix(numpy.zeros((3, 3)))
+ self.A_continuous[0:2, 0:2] = self.A_continuous_unaugmented
+ self.A_continuous[0:2, 2] = self.B_continuous_unaugmented
+
+ self.B_continuous = numpy.matrix(numpy.zeros((3, 1)))
+ self.B_continuous[0:2, 0] = self.B_continuous_unaugmented
+
+ self.C_unaugmented = self.C
+ self.C = numpy.matrix(numpy.zeros((1, 3)))
+ self.C[0:1, 0:2] = self.C_unaugmented
+
+ self.A, self.B = self.ContinuousToDiscrete(
+ self.A_continuous, self.B_continuous, self.dt)
+
+ q_pos = 0.12
+ q_vel = 2.00
+ q_voltage = 4.0
+ self.Q = numpy.matrix([[(q_pos ** 2.0), 0.0, 0.0],
+ [0.0, (q_vel ** 2.0), 0.0],
+ [0.0, 0.0, (q_voltage ** 2.0)]])
+
+ r_pos = 0.05
+ self.R = numpy.matrix([[(r_pos ** 2.0)]])
+
+ self.KalmanGain, self.Q_steady = controls.kalman(
+ A=self.A, B=self.B, C=self.C, Q=self.Q, R=self.R)
+ self.L = self.A * self.KalmanGain
+
+ self.K_unaugmented = self.K
+ self.K = numpy.matrix(numpy.zeros((1, 3)))
+ self.K[0, 0:2] = self.K_unaugmented
+ self.K[0, 2] = 1
+
+ self.Kff = numpy.concatenate((self.Kff, numpy.matrix(numpy.zeros((1, 1)))), axis=1)
+
+ self.InitializeState()
+
+class ScenarioPlotter(object):
+ def __init__(self):
+ # Various lists for graphing things.
+ self.t = []
+ self.x = []
+ self.v = []
+ self.a = []
+ self.x_hat = []
+ self.u = []
+ self.offset = []
+
+ def run_test(self, intake, end_goal,
+ controller_intake,
+ observer_intake=None,
+ iterations=200):
+ """Runs the intake plant with an initial condition and goal.
+
+ Args:
+ intake: intake object to use.
+ end_goal: end_goal state.
+ controller_intake: Intake object to get K from, or None if we should
+ use intake.
+ observer_intake: Intake object to use for the observer, or None if we should
+ use the actual state.
+ iterations: Number of timesteps to run the model for.
+ """
+
+ if controller_intake is None:
+ controller_intake = intake
+
+ vbat = 12.0
+
+ if self.t:
+ initial_t = self.t[-1] + intake.dt
+ else:
+ initial_t = 0
+
+ goal = numpy.concatenate((intake.X, numpy.matrix(numpy.zeros((1, 1)))), axis=0)
+
+ profile = TrapezoidProfile(intake.dt)
+ profile.set_maximum_acceleration(70.0)
+ profile.set_maximum_velocity(10.0)
+ profile.SetGoal(goal[0, 0])
+
+ U_last = numpy.matrix(numpy.zeros((1, 1)))
+ for i in xrange(iterations):
+ observer_intake.Y = intake.Y
+ observer_intake.CorrectObserver(U_last)
+
+ self.offset.append(observer_intake.X_hat[2, 0])
+ self.x_hat.append(observer_intake.X_hat[0, 0])
+
+ next_goal = numpy.concatenate(
+ (profile.Update(end_goal[0, 0], end_goal[1, 0]),
+ numpy.matrix(numpy.zeros((1, 1)))),
+ axis=0)
+
+ ff_U = controller_intake.Kff * (next_goal - observer_intake.A * goal)
+
+ U_uncapped = controller_intake.K * (goal - observer_intake.X_hat) + ff_U
+ U = U_uncapped.copy()
+ U[0, 0] = numpy.clip(U[0, 0], -vbat, vbat)
+ self.x.append(intake.X[0, 0])
+
+ if self.v:
+ last_v = self.v[-1]
+ else:
+ last_v = 0
+
+ self.v.append(intake.X[1, 0])
+ self.a.append((self.v[-1] - last_v) / intake.dt)
+
+ offset = 0.0
+ if i > 100:
+ offset = 2.0
+ intake.Update(U + offset)
+
+ observer_intake.PredictObserver(U)
+
+ self.t.append(initial_t + i * intake.dt)
+ self.u.append(U[0, 0])
+
+ ff_U -= U_uncapped - U
+ goal = controller_intake.A * goal + controller_intake.B * ff_U
+
+ if U[0, 0] != U_uncapped[0, 0]:
+ profile.MoveCurrentState(
+ numpy.matrix([[goal[0, 0]], [goal[1, 0]]]))
+
+ glog.debug('Time: %f', self.t[-1])
+ glog.debug('goal_error %s', repr(end_goal - goal))
+ glog.debug('error %s', repr(observer_intake.X_hat - end_goal))
+
+ def Plot(self):
+ pylab.subplot(3, 1, 1)
+ pylab.plot(self.t, self.x, label='x')
+ pylab.plot(self.t, self.x_hat, label='x_hat')
+ pylab.legend()
+
+ pylab.subplot(3, 1, 2)
+ pylab.plot(self.t, self.u, label='u')
+ pylab.plot(self.t, self.offset, label='voltage_offset')
+ pylab.legend()
+
+ pylab.subplot(3, 1, 3)
+ pylab.plot(self.t, self.a, label='a')
+ pylab.legend()
+
+ pylab.show()
+
+
+def main(argv):
+ argv = FLAGS(argv)
+ glog.init()
+
+ scenario_plotter = ScenarioPlotter()
+
+ intake = Intake()
+ intake_controller = IntegralIntake()
+ observer_intake = IntegralIntake()
+
+ # Test moving the intake with constant separation.
+ initial_X = numpy.matrix([[0.0], [0.0]])
+ R = numpy.matrix([[numpy.pi/2.0], [0.0], [0.0]])
+ scenario_plotter.run_test(intake, end_goal=R,
+ controller_intake=intake_controller,
+ observer_intake=observer_intake, iterations=200)
+
+ if FLAGS.plot:
+ scenario_plotter.Plot()
+
+ # Write the generated constants out to a file.
+ if len(argv) != 5:
+ glog.fatal('Expected .h file name and .cc file name for the intake and integral intake.')
+ else:
+ namespaces = ['y2016_bot3', 'control_loops', 'intake']
+ intake = Intake("Intake")
+ loop_writer = control_loop.ControlLoopWriter('Intake', [intake],
+ namespaces=namespaces)
+ loop_writer.Write(argv[1], argv[2])
+
+ integral_intake = IntegralIntake("IntegralIntake")
+ integral_loop_writer = control_loop.ControlLoopWriter("IntegralIntake", [integral_intake],
+ namespaces=namespaces)
+ integral_loop_writer.Write(argv[3], argv[4])
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/y2016_bot3/control_loops/python/polydrivetrain.py b/y2016_bot3/control_loops/python/polydrivetrain.py
new file mode 100755
index 0000000..07f9ff9
--- /dev/null
+++ b/y2016_bot3/control_loops/python/polydrivetrain.py
@@ -0,0 +1,501 @@
+#!/usr/bin/python
+
+import numpy
+import sys
+from frc971.control_loops.python import polytope
+from y2016_bot3.control_loops.python import drivetrain
+from frc971.control_loops.python import control_loop
+from frc971.control_loops.python import controls
+from matplotlib import pylab
+
+import gflags
+import glog
+
+__author__ = 'Austin Schuh (austin.linux@gmail.com)'
+
+FLAGS = gflags.FLAGS
+
+try:
+ gflags.DEFINE_bool('plot', False, 'If true, plot the loop response.')
+except gflags.DuplicateFlagError:
+ pass
+
+def CoerceGoal(region, K, w, R):
+ """Intersects a line with a region, and finds the closest point to R.
+
+ Finds a point that is closest to R inside the region, and on the line
+ defined by K X = w. If it is not possible to find a point on the line,
+ finds a point that is inside the region and closest to the line. This
+ function assumes that
+
+ Args:
+ region: HPolytope, the valid goal region.
+ K: numpy.matrix (2 x 1), the matrix for the equation [K1, K2] [x1; x2] = w
+ w: float, the offset in the equation above.
+ R: numpy.matrix (2 x 1), the point to be closest to.
+
+ Returns:
+ numpy.matrix (2 x 1), the point.
+ """
+ return DoCoerceGoal(region, K, w, R)[0]
+
+def DoCoerceGoal(region, K, w, R):
+ if region.IsInside(R):
+ return (R, True)
+
+ perpendicular_vector = K.T / numpy.linalg.norm(K)
+ parallel_vector = numpy.matrix([[perpendicular_vector[1, 0]],
+ [-perpendicular_vector[0, 0]]])
+
+ # We want to impose the constraint K * X = w on the polytope H * X <= k.
+ # We do this by breaking X up into parallel and perpendicular components to
+ # the half plane. This gives us the following equation.
+ #
+ # parallel * (parallel.T \dot X) + perpendicular * (perpendicular \dot X)) = X
+ #
+ # Then, substitute this into the polytope.
+ #
+ # H * (parallel * (parallel.T \dot X) + perpendicular * (perpendicular \dot X)) <= k
+ #
+ # Substitute K * X = w
+ #
+ # H * parallel * (parallel.T \dot X) + H * perpendicular * w <= k
+ #
+ # Move all the knowns to the right side.
+ #
+ # H * parallel * ([parallel1 parallel2] * X) <= k - H * perpendicular * w
+ #
+ # Let t = parallel.T \dot X, the component parallel to the surface.
+ #
+ # H * parallel * t <= k - H * perpendicular * w
+ #
+ # This is a polytope which we can solve, and use to figure out the range of X
+ # that we care about!
+
+ t_poly = polytope.HPolytope(
+ region.H * parallel_vector,
+ region.k - region.H * perpendicular_vector * w)
+
+ vertices = t_poly.Vertices()
+
+ if vertices.shape[0]:
+ # The region exists!
+ # Find the closest vertex
+ min_distance = numpy.infty
+ closest_point = None
+ for vertex in vertices:
+ point = parallel_vector * vertex + perpendicular_vector * w
+ length = numpy.linalg.norm(R - point)
+ if length < min_distance:
+ min_distance = length
+ closest_point = point
+
+ return (closest_point, True)
+ else:
+ # Find the vertex of the space that is closest to the line.
+ region_vertices = region.Vertices()
+ min_distance = numpy.infty
+ closest_point = None
+ for vertex in region_vertices:
+ point = vertex.T
+ length = numpy.abs((perpendicular_vector.T * point)[0, 0])
+ if length < min_distance:
+ min_distance = length
+ closest_point = point
+
+ return (closest_point, False)
+
+
+class VelocityDrivetrainModel(control_loop.ControlLoop):
+ def __init__(self, left_low=True, right_low=True, name="VelocityDrivetrainModel"):
+ super(VelocityDrivetrainModel, self).__init__(name)
+ self._drivetrain = drivetrain.Drivetrain(left_low=left_low,
+ right_low=right_low)
+ self.dt = 0.005
+ self.A_continuous = numpy.matrix(
+ [[self._drivetrain.A_continuous[1, 1], self._drivetrain.A_continuous[1, 3]],
+ [self._drivetrain.A_continuous[3, 1], self._drivetrain.A_continuous[3, 3]]])
+
+ self.B_continuous = numpy.matrix(
+ [[self._drivetrain.B_continuous[1, 0], self._drivetrain.B_continuous[1, 1]],
+ [self._drivetrain.B_continuous[3, 0], self._drivetrain.B_continuous[3, 1]]])
+ self.C = numpy.matrix(numpy.eye(2))
+ self.D = numpy.matrix(numpy.zeros((2, 2)))
+
+ self.A, self.B = self.ContinuousToDiscrete(self.A_continuous,
+ self.B_continuous, self.dt)
+
+ # FF * X = U (steady state)
+ self.FF = self.B.I * (numpy.eye(2) - self.A)
+
+ self.PlaceControllerPoles([0.85, 0.85])
+ self.PlaceObserverPoles([0.02, 0.02])
+
+ self.G_high = self._drivetrain.G_high
+ self.G_low = self._drivetrain.G_low
+ self.resistance = self._drivetrain.resistance
+ self.r = self._drivetrain.r
+ self.Kv = self._drivetrain.Kv
+ self.Kt = self._drivetrain.Kt
+
+ self.U_max = self._drivetrain.U_max
+ self.U_min = self._drivetrain.U_min
+
+
+class VelocityDrivetrain(object):
+ HIGH = 'high'
+ LOW = 'low'
+ SHIFTING_UP = 'up'
+ SHIFTING_DOWN = 'down'
+
+ def __init__(self):
+ self.drivetrain_low_low = VelocityDrivetrainModel(
+ left_low=True, right_low=True, name='VelocityDrivetrainLowLow')
+ self.drivetrain_low_high = VelocityDrivetrainModel(left_low=True, right_low=False, name='VelocityDrivetrainLowHigh')
+ self.drivetrain_high_low = VelocityDrivetrainModel(left_low=False, right_low=True, name = 'VelocityDrivetrainHighLow')
+ self.drivetrain_high_high = VelocityDrivetrainModel(left_low=False, right_low=False, name = 'VelocityDrivetrainHighHigh')
+
+ # X is [lvel, rvel]
+ self.X = numpy.matrix(
+ [[0.0],
+ [0.0]])
+
+ self.U_poly = polytope.HPolytope(
+ numpy.matrix([[1, 0],
+ [-1, 0],
+ [0, 1],
+ [0, -1]]),
+ numpy.matrix([[12],
+ [12],
+ [12],
+ [12]]))
+
+ self.U_max = numpy.matrix(
+ [[12.0],
+ [12.0]])
+ self.U_min = numpy.matrix(
+ [[-12.0000000000],
+ [-12.0000000000]])
+
+ self.dt = 0.005
+
+ self.R = numpy.matrix(
+ [[0.0],
+ [0.0]])
+
+ self.U_ideal = numpy.matrix(
+ [[0.0],
+ [0.0]])
+
+ # ttrust is the comprimise between having full throttle negative inertia,
+ # and having no throttle negative inertia. A value of 0 is full throttle
+ # inertia. A value of 1 is no throttle negative inertia.
+ self.ttrust = 1.0
+
+ self.left_gear = VelocityDrivetrain.LOW
+ self.right_gear = VelocityDrivetrain.LOW
+ self.left_shifter_position = 0.0
+ self.right_shifter_position = 0.0
+ self.left_cim = drivetrain.CIM()
+ self.right_cim = drivetrain.CIM()
+
+ def IsInGear(self, gear):
+ return gear is VelocityDrivetrain.HIGH or gear is VelocityDrivetrain.LOW
+
+ def MotorRPM(self, shifter_position, velocity):
+ if shifter_position > 0.5:
+ return (velocity / self.CurrentDrivetrain().G_high /
+ self.CurrentDrivetrain().r)
+ else:
+ return (velocity / self.CurrentDrivetrain().G_low /
+ self.CurrentDrivetrain().r)
+
+ def CurrentDrivetrain(self):
+ if self.left_shifter_position > 0.5:
+ if self.right_shifter_position > 0.5:
+ return self.drivetrain_high_high
+ else:
+ return self.drivetrain_high_low
+ else:
+ if self.right_shifter_position > 0.5:
+ return self.drivetrain_low_high
+ else:
+ return self.drivetrain_low_low
+
+ def SimShifter(self, gear, shifter_position):
+ if gear is VelocityDrivetrain.HIGH or gear is VelocityDrivetrain.SHIFTING_UP:
+ shifter_position = min(shifter_position + 0.5, 1.0)
+ else:
+ shifter_position = max(shifter_position - 0.5, 0.0)
+
+ if shifter_position == 1.0:
+ gear = VelocityDrivetrain.HIGH
+ elif shifter_position == 0.0:
+ gear = VelocityDrivetrain.LOW
+
+ return gear, shifter_position
+
+ def ComputeGear(self, wheel_velocity, should_print=False, current_gear=False, gear_name=None):
+ high_omega = (wheel_velocity / self.CurrentDrivetrain().G_high /
+ self.CurrentDrivetrain().r)
+ low_omega = (wheel_velocity / self.CurrentDrivetrain().G_low /
+ self.CurrentDrivetrain().r)
+ #print gear_name, "Motor Energy Difference.", 0.5 * 0.000140032647 * (low_omega * low_omega - high_omega * high_omega), "joules"
+ high_torque = ((12.0 - high_omega / self.CurrentDrivetrain().Kv) *
+ self.CurrentDrivetrain().Kt / self.CurrentDrivetrain().resistance)
+ low_torque = ((12.0 - low_omega / self.CurrentDrivetrain().Kv) *
+ self.CurrentDrivetrain().Kt / self.CurrentDrivetrain().resistance)
+ high_power = high_torque * high_omega
+ low_power = low_torque * low_omega
+ #if should_print:
+ # print gear_name, "High omega", high_omega, "Low omega", low_omega
+ # print gear_name, "High torque", high_torque, "Low torque", low_torque
+ # print gear_name, "High power", high_power, "Low power", low_power
+
+ # Shift algorithm improvements.
+ # TODO(aschuh):
+ # It takes time to shift. Shifting down for 1 cycle doesn't make sense
+ # because you will end up slower than without shifting. Figure out how
+ # to include that info.
+ # If the driver is still in high gear, but isn't asking for the extra power
+ # from low gear, don't shift until he asks for it.
+ goal_gear_is_high = high_power > low_power
+ #goal_gear_is_high = True
+
+ if not self.IsInGear(current_gear):
+ glog.debug('%s Not in gear.', gear_name)
+ return current_gear
+ else:
+ is_high = current_gear is VelocityDrivetrain.HIGH
+ if is_high != goal_gear_is_high:
+ if goal_gear_is_high:
+ glog.debug('%s Shifting up.', gear_name)
+ return VelocityDrivetrain.SHIFTING_UP
+ else:
+ glog.debug('%s Shifting down.', gear_name)
+ return VelocityDrivetrain.SHIFTING_DOWN
+ else:
+ return current_gear
+
+ def FilterVelocity(self, throttle):
+ # Invert the plant to figure out how the velocity filter would have to work
+ # out in order to filter out the forwards negative inertia.
+ # This math assumes that the left and right power and velocity are equal.
+
+ # The throttle filter should filter such that the motor in the highest gear
+ # should be controlling the time constant.
+ # Do this by finding the index of FF that has the lowest value, and computing
+ # the sums using that index.
+ FF_sum = self.CurrentDrivetrain().FF.sum(axis=1)
+ min_FF_sum_index = numpy.argmin(FF_sum)
+ min_FF_sum = FF_sum[min_FF_sum_index, 0]
+ min_K_sum = self.CurrentDrivetrain().K[min_FF_sum_index, :].sum()
+ # Compute the FF sum for high gear.
+ high_min_FF_sum = self.drivetrain_high_high.FF[0, :].sum()
+
+ # U = self.K[0, :].sum() * (R - x_avg) + self.FF[0, :].sum() * R
+ # throttle * 12.0 = (self.K[0, :].sum() + self.FF[0, :].sum()) * R
+ # - self.K[0, :].sum() * x_avg
+
+ # R = (throttle * 12.0 + self.K[0, :].sum() * x_avg) /
+ # (self.K[0, :].sum() + self.FF[0, :].sum())
+
+ # U = (K + FF) * R - K * X
+ # (K + FF) ^-1 * (U + K * X) = R
+
+ # Scale throttle by min_FF_sum / high_min_FF_sum. This will make low gear
+ # have the same velocity goal as high gear, and so that the robot will hold
+ # the same speed for the same throttle for all gears.
+ adjusted_ff_voltage = numpy.clip(throttle * 12.0 * min_FF_sum / high_min_FF_sum, -12.0, 12.0)
+ return ((adjusted_ff_voltage + self.ttrust * min_K_sum * (self.X[0, 0] + self.X[1, 0]) / 2.0)
+ / (self.ttrust * min_K_sum + min_FF_sum))
+
+ def Update(self, throttle, steering):
+ # Shift into the gear which sends the most power to the floor.
+ # This is the same as sending the most torque down to the floor at the
+ # wheel.
+
+ self.left_gear = self.right_gear = True
+ if True:
+ self.left_gear = self.ComputeGear(self.X[0, 0], should_print=True,
+ current_gear=self.left_gear,
+ gear_name="left")
+ self.right_gear = self.ComputeGear(self.X[1, 0], should_print=True,
+ current_gear=self.right_gear,
+ gear_name="right")
+ if self.IsInGear(self.left_gear):
+ self.left_cim.X[0, 0] = self.MotorRPM(self.left_shifter_position, self.X[0, 0])
+
+ if self.IsInGear(self.right_gear):
+ self.right_cim.X[0, 0] = self.MotorRPM(self.right_shifter_position, self.X[0, 0])
+
+ if self.IsInGear(self.left_gear) and self.IsInGear(self.right_gear):
+ # Filter the throttle to provide a nicer response.
+ fvel = self.FilterVelocity(throttle)
+
+ # Constant radius means that angualar_velocity / linear_velocity = constant.
+ # Compute the left and right velocities.
+ steering_velocity = numpy.abs(fvel) * steering
+ left_velocity = fvel - steering_velocity
+ right_velocity = fvel + steering_velocity
+
+ # Write this constraint in the form of K * R = w
+ # angular velocity / linear velocity = constant
+ # (left - right) / (left + right) = constant
+ # left - right = constant * left + constant * right
+
+ # (fvel - steering * numpy.abs(fvel) - fvel - steering * numpy.abs(fvel)) /
+ # (fvel - steering * numpy.abs(fvel) + fvel + steering * numpy.abs(fvel)) =
+ # constant
+ # (- 2 * steering * numpy.abs(fvel)) / (2 * fvel) = constant
+ # (-steering * sign(fvel)) = constant
+ # (-steering * sign(fvel)) * (left + right) = left - right
+ # (steering * sign(fvel) + 1) * left + (steering * sign(fvel) - 1) * right = 0
+
+ equality_k = numpy.matrix(
+ [[1 + steering * numpy.sign(fvel), -(1 - steering * numpy.sign(fvel))]])
+ equality_w = 0.0
+
+ self.R[0, 0] = left_velocity
+ self.R[1, 0] = right_velocity
+
+ # Construct a constraint on R by manipulating the constraint on U
+ # Start out with H * U <= k
+ # U = FF * R + K * (R - X)
+ # H * (FF * R + K * R - K * X) <= k
+ # H * (FF + K) * R <= k + H * K * X
+ R_poly = polytope.HPolytope(
+ self.U_poly.H * (self.CurrentDrivetrain().K + self.CurrentDrivetrain().FF),
+ self.U_poly.k + self.U_poly.H * self.CurrentDrivetrain().K * self.X)
+
+ # Limit R back inside the box.
+ self.boxed_R = CoerceGoal(R_poly, equality_k, equality_w, self.R)
+
+ FF_volts = self.CurrentDrivetrain().FF * self.boxed_R
+ self.U_ideal = self.CurrentDrivetrain().K * (self.boxed_R - self.X) + FF_volts
+ else:
+ glog.debug('Not all in gear')
+ if not self.IsInGear(self.left_gear) and not self.IsInGear(self.right_gear):
+ # TODO(austin): Use battery volts here.
+ R_left = self.MotorRPM(self.left_shifter_position, self.X[0, 0])
+ self.U_ideal[0, 0] = numpy.clip(
+ self.left_cim.K * (R_left - self.left_cim.X) + R_left / self.left_cim.Kv,
+ self.left_cim.U_min, self.left_cim.U_max)
+ self.left_cim.Update(self.U_ideal[0, 0])
+
+ R_right = self.MotorRPM(self.right_shifter_position, self.X[1, 0])
+ self.U_ideal[1, 0] = numpy.clip(
+ self.right_cim.K * (R_right - self.right_cim.X) + R_right / self.right_cim.Kv,
+ self.right_cim.U_min, self.right_cim.U_max)
+ self.right_cim.Update(self.U_ideal[1, 0])
+ else:
+ assert False
+
+ self.U = numpy.clip(self.U_ideal, self.U_min, self.U_max)
+
+ # TODO(austin): Model the robot as not accelerating when you shift...
+ # This hack only works when you shift at the same time.
+ if self.IsInGear(self.left_gear) and self.IsInGear(self.right_gear):
+ self.X = self.CurrentDrivetrain().A * self.X + self.CurrentDrivetrain().B * self.U
+
+ self.left_gear, self.left_shifter_position = self.SimShifter(
+ self.left_gear, self.left_shifter_position)
+ self.right_gear, self.right_shifter_position = self.SimShifter(
+ self.right_gear, self.right_shifter_position)
+
+ glog.debug('U is %s %s', str(self.U[0, 0]), str(self.U[1, 0]))
+ glog.debug('Left shifter %s %d Right shifter %s %d',
+ self.left_gear, self.left_shifter_position,
+ self.right_gear, self.right_shifter_position)
+
+
+def main(argv):
+ argv = FLAGS(argv)
+
+ vdrivetrain = VelocityDrivetrain()
+
+ if not FLAGS.plot:
+ if len(argv) != 5:
+ glog.fatal('Expected .h file name and .cc file name')
+ else:
+ namespaces = ['y2016_bot3', 'control_loops', 'drivetrain']
+ dog_loop_writer = control_loop.ControlLoopWriter(
+ "VelocityDrivetrain", [vdrivetrain.drivetrain_low_low,
+ vdrivetrain.drivetrain_low_high,
+ vdrivetrain.drivetrain_high_low,
+ vdrivetrain.drivetrain_high_high],
+ namespaces=namespaces)
+
+ dog_loop_writer.Write(argv[1], argv[2])
+
+ cim_writer = control_loop.ControlLoopWriter(
+ "CIM", [drivetrain.CIM()])
+
+ cim_writer.Write(argv[3], argv[4])
+ return
+
+ vl_plot = []
+ vr_plot = []
+ ul_plot = []
+ ur_plot = []
+ radius_plot = []
+ t_plot = []
+ left_gear_plot = []
+ right_gear_plot = []
+ vdrivetrain.left_shifter_position = 0.0
+ vdrivetrain.right_shifter_position = 0.0
+ vdrivetrain.left_gear = VelocityDrivetrain.LOW
+ vdrivetrain.right_gear = VelocityDrivetrain.LOW
+
+ glog.debug('K is %s', str(vdrivetrain.CurrentDrivetrain().K))
+
+ if vdrivetrain.left_gear is VelocityDrivetrain.HIGH:
+ glog.debug('Left is high')
+ else:
+ glog.debug('Left is low')
+ if vdrivetrain.right_gear is VelocityDrivetrain.HIGH:
+ glog.debug('Right is high')
+ else:
+ glog.debug('Right is low')
+
+ for t in numpy.arange(0, 1.7, vdrivetrain.dt):
+ if t < 0.5:
+ vdrivetrain.Update(throttle=0.00, steering=1.0)
+ elif t < 1.2:
+ vdrivetrain.Update(throttle=0.5, steering=1.0)
+ else:
+ vdrivetrain.Update(throttle=0.00, steering=1.0)
+ t_plot.append(t)
+ vl_plot.append(vdrivetrain.X[0, 0])
+ vr_plot.append(vdrivetrain.X[1, 0])
+ ul_plot.append(vdrivetrain.U[0, 0])
+ ur_plot.append(vdrivetrain.U[1, 0])
+ left_gear_plot.append((vdrivetrain.left_gear is VelocityDrivetrain.HIGH) * 2.0 - 10.0)
+ right_gear_plot.append((vdrivetrain.right_gear is VelocityDrivetrain.HIGH) * 2.0 - 10.0)
+
+ fwd_velocity = (vdrivetrain.X[1, 0] + vdrivetrain.X[0, 0]) / 2
+ turn_velocity = (vdrivetrain.X[1, 0] - vdrivetrain.X[0, 0])
+ if abs(fwd_velocity) < 0.0000001:
+ radius_plot.append(turn_velocity)
+ else:
+ radius_plot.append(turn_velocity / fwd_velocity)
+
+ # TODO(austin):
+ # Shifting compensation.
+
+ # Tighten the turn.
+ # Closed loop drive.
+
+ pylab.plot(t_plot, vl_plot, label='left velocity')
+ pylab.plot(t_plot, vr_plot, label='right velocity')
+ pylab.plot(t_plot, ul_plot, label='left voltage')
+ pylab.plot(t_plot, ur_plot, label='right voltage')
+ pylab.plot(t_plot, radius_plot, label='radius')
+ pylab.plot(t_plot, left_gear_plot, label='left gear high')
+ pylab.plot(t_plot, right_gear_plot, label='right gear high')
+ pylab.legend()
+ pylab.show()
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/y2016_bot3/control_loops/python/polydrivetrain_test.py b/y2016_bot3/control_loops/python/polydrivetrain_test.py
new file mode 100755
index 0000000..434cdca
--- /dev/null
+++ b/y2016_bot3/control_loops/python/polydrivetrain_test.py
@@ -0,0 +1,82 @@
+#!/usr/bin/python
+
+import polydrivetrain
+import numpy
+from numpy.testing import *
+import polytope
+import unittest
+
+__author__ = 'Austin Schuh (austin.linux@gmail.com)'
+
+
+class TestVelocityDrivetrain(unittest.TestCase):
+ def MakeBox(self, x1_min, x1_max, x2_min, x2_max):
+ H = numpy.matrix([[1, 0],
+ [-1, 0],
+ [0, 1],
+ [0, -1]])
+ K = numpy.matrix([[x1_max],
+ [-x1_min],
+ [x2_max],
+ [-x2_min]])
+ return polytope.HPolytope(H, K)
+
+ def test_coerce_inside(self):
+ """Tests coercion when the point is inside the box."""
+ box = self.MakeBox(1, 2, 1, 2)
+
+ # x1 = x2
+ K = numpy.matrix([[1, -1]])
+ w = 0
+
+ assert_array_equal(polydrivetrain.CoerceGoal(box, K, w,
+ numpy.matrix([[1.5], [1.5]])),
+ numpy.matrix([[1.5], [1.5]]))
+
+ def test_coerce_outside_intersect(self):
+ """Tests coercion when the line intersects the box."""
+ box = self.MakeBox(1, 2, 1, 2)
+
+ # x1 = x2
+ K = numpy.matrix([[1, -1]])
+ w = 0
+
+ assert_array_equal(polydrivetrain.CoerceGoal(box, K, w, numpy.matrix([[5], [5]])),
+ numpy.matrix([[2.0], [2.0]]))
+
+ def test_coerce_outside_no_intersect(self):
+ """Tests coercion when the line does not intersect the box."""
+ box = self.MakeBox(3, 4, 1, 2)
+
+ # x1 = x2
+ K = numpy.matrix([[1, -1]])
+ w = 0
+
+ assert_array_equal(polydrivetrain.CoerceGoal(box, K, w, numpy.matrix([[5], [5]])),
+ numpy.matrix([[3.0], [2.0]]))
+
+ def test_coerce_middle_of_edge(self):
+ """Tests coercion when the line intersects the middle of an edge."""
+ box = self.MakeBox(0, 4, 1, 2)
+
+ # x1 = x2
+ K = numpy.matrix([[-1, 1]])
+ w = 0
+
+ assert_array_equal(polydrivetrain.CoerceGoal(box, K, w, numpy.matrix([[5], [5]])),
+ numpy.matrix([[2.0], [2.0]]))
+
+ def test_coerce_perpendicular_line(self):
+ """Tests coercion when the line does not intersect and is in quadrant 2."""
+ box = self.MakeBox(1, 2, 1, 2)
+
+ # x1 = -x2
+ K = numpy.matrix([[1, 1]])
+ w = 0
+
+ assert_array_equal(polydrivetrain.CoerceGoal(box, K, w, numpy.matrix([[5], [5]])),
+ numpy.matrix([[1.0], [1.0]]))
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/y2016_bot3/joystick_reader.cc b/y2016_bot3/joystick_reader.cc
new file mode 100644
index 0000000..02e6817
--- /dev/null
+++ b/y2016_bot3/joystick_reader.cc
@@ -0,0 +1,268 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <math.h>
+
+#include "aos/linux_code/init.h"
+#include "aos/input/joystick_input.h"
+#include "aos/common/input/driver_station_data.h"
+#include "aos/common/logging/logging.h"
+#include "aos/common/util/log_interval.h"
+#include "aos/common/time.h"
+#include "aos/common/actions/actions.h"
+
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
+#include "y2016_bot3/control_loops/intake/intake.q.h"
+#include "y2016_bot3/control_loops/intake/intake.h"
+#include "y2016_bot3/queues/ball_detector.q.h"
+
+#include "frc971/queues/gyro.q.h"
+#include "frc971/autonomous/auto.q.h"
+#include "y2016_bot3/actors/autonomous_actor.h"
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_base.h"
+
+using ::frc971::control_loops::drivetrain_queue;
+using ::y2016_bot3::control_loops::intake_queue;
+
+using ::aos::input::driver_station::ButtonLocation;
+using ::aos::input::driver_station::ControlBit;
+using ::aos::input::driver_station::JoystickAxis;
+using ::aos::input::driver_station::POVLocation;
+
+namespace y2016_bot3 {
+namespace input {
+namespace joysticks {
+
+const JoystickAxis kSteeringWheel(1, 1), kDriveThrottle(2, 2);
+const ButtonLocation kQuickTurn(1, 5);
+
+const ButtonLocation kTurn1(1, 7);
+const ButtonLocation kTurn2(1, 11);
+
+// Buttons on the lexan driver station to get things running on bring-up day.
+const ButtonLocation kIntakeDown(3, 5);
+const ButtonLocation kIntakeIn(3, 4);
+const ButtonLocation kFire(3, 3);
+const ButtonLocation kIntakeOut(3, 3);
+const ButtonLocation kChevalDeFrise(3, 11);
+
+class Reader : public ::aos::input::JoystickInput {
+ public:
+ Reader()
+ : intake_goal_(0.0),
+ dt_config_(control_loops::drivetrain::GetDrivetrainConfig()) {}
+
+ void RunIteration(const ::aos::input::driver_station::Data &data) override {
+ bool last_auto_running = auto_running_;
+ auto_running_ = data.GetControlBit(ControlBit::kAutonomous) &&
+ data.GetControlBit(ControlBit::kEnabled);
+ if (auto_running_ != last_auto_running) {
+ if (auto_running_) {
+ StartAuto();
+ } else {
+ StopAuto();
+ }
+ }
+
+ if (!data.GetControlBit(ControlBit::kEnabled)) {
+ // If we are not enabled, reset the waiting for zero bit.
+ LOG(DEBUG, "Waiting for zero.\n");
+ waiting_for_zero_ = true;
+ }
+
+ if (!auto_running_) {
+ HandleDrivetrain(data);
+ HandleTeleop(data);
+ }
+
+ // Process any pending actions.
+ action_queue_.Tick();
+ was_running_ = action_queue_.Running();
+ }
+
+ void HandleDrivetrain(const ::aos::input::driver_station::Data &data) {
+ bool is_control_loop_driving = false;
+ static double left_goal = 0.0;
+ static double right_goal = 0.0;
+
+ const double wheel = -data.GetAxis(kSteeringWheel);
+ const double throttle = -data.GetAxis(kDriveThrottle);
+ drivetrain_queue.status.FetchLatest();
+
+ if (data.PosEdge(kTurn1) || data.PosEdge(kTurn2)) {
+ if (drivetrain_queue.status.get()) {
+ left_goal = drivetrain_queue.status->estimated_left_position;
+ right_goal = drivetrain_queue.status->estimated_right_position;
+ }
+ }
+ if (data.IsPressed(kTurn1) || data.IsPressed(kTurn2)) {
+ is_control_loop_driving = true;
+ }
+ if (!drivetrain_queue.goal.MakeWithBuilder()
+ .steering(wheel)
+ .throttle(throttle)
+ .quickturn(data.IsPressed(kQuickTurn))
+ .control_loop_driving(is_control_loop_driving)
+ .left_goal(left_goal - wheel * 0.5 + throttle * 0.3)
+ .right_goal(right_goal + wheel * 0.5 + throttle * 0.3)
+ .left_velocity_goal(0)
+ .right_velocity_goal(0)
+ .Send()) {
+ LOG(WARNING, "sending stick values failed\n");
+ }
+ }
+
+ void HandleTeleop(const ::aos::input::driver_station::Data &data) {
+ intake_goal_ = y2016_bot3::constants::kIntakeRange.upper - 0.04;
+
+ if (!data.GetControlBit(ControlBit::kEnabled)) {
+ action_queue_.CancelAllActions();
+ LOG(DEBUG, "Canceling\n");
+ }
+
+ intake_queue.status.FetchLatest();
+ if (!intake_queue.status.get()) {
+ LOG(ERROR, "Got no intake status packet.\n");
+ }
+
+ if (intake_queue.status.get() && intake_queue.status->zeroed) {
+ if (waiting_for_zero_) {
+ LOG(DEBUG, "Zeroed! Starting teleop mode.\n");
+ waiting_for_zero_ = false;
+ }
+ } else {
+ waiting_for_zero_ = true;
+ }
+
+ bool ball_detected = false;
+ ::y2016_bot3::sensors::ball_detector.FetchLatest();
+ if (::y2016_bot3::sensors::ball_detector.get()) {
+ ball_detected = ::y2016_bot3::sensors::ball_detector->voltage > 2.5;
+ }
+ if (data.PosEdge(kIntakeIn)) {
+ saw_ball_when_started_intaking_ = ball_detected;
+ }
+
+ is_intaking_ = data.IsPressed(kIntakeIn) &&
+ (!ball_detected || saw_ball_when_started_intaking_);
+
+ is_outtaking_ = data.IsPressed(kIntakeOut);
+
+ if (is_intaking_ || is_outtaking_) {
+ recently_intaking_accumulator_ = 20;
+ }
+
+ if (data.IsPressed(kIntakeDown)) {
+ if (recently_intaking_accumulator_) {
+ intake_goal_ = 0.1;
+ } else {
+ intake_goal_ = -0.05;
+ }
+ }
+
+ if (recently_intaking_accumulator_ > 0) {
+ --recently_intaking_accumulator_;
+ }
+
+ if (data.IsPressed(kChevalDeFrise)) {
+ traverse_down_ = true;
+ } else {
+ traverse_down_ = false;
+ }
+
+ if (!waiting_for_zero_) {
+ auto new_intake_goal = intake_queue.goal.MakeMessage();
+ new_intake_goal->angle_intake = intake_goal_;
+
+ new_intake_goal->max_angular_velocity_intake = 7.0;
+ new_intake_goal->max_angular_acceleration_intake = 40.0;
+
+#define GrannyMode false
+#if GrannyMode
+ new_intake_goal->max_angular_velocity_intake = 0.2;
+ new_intake_goal->max_angular_acceleration_intake = 1.0;
+#endif
+
+ if (is_intaking_) {
+ new_intake_goal->voltage_intake_rollers = -12.0;
+ new_intake_goal->voltage_top_rollers = -12.0;
+ new_intake_goal->voltage_bottom_rollers = 12.0;
+ } else if (is_outtaking_) {
+ new_intake_goal->voltage_intake_rollers = 12.0;
+ new_intake_goal->voltage_top_rollers = 12.0;
+ new_intake_goal->voltage_bottom_rollers = -7.0;
+ } else {
+ new_intake_goal->voltage_intake_rollers = 0.0;
+ new_intake_goal->voltage_top_rollers = 0.0;
+ new_intake_goal->voltage_bottom_rollers = 0.0;
+ }
+
+ new_intake_goal->traverse_down = traverse_down_;
+ new_intake_goal->force_intake = true;
+
+ if (!new_intake_goal.Send()) {
+ LOG(ERROR, "Sending intake goal failed.\n");
+ } else {
+ LOG(DEBUG, "sending goal: intake: %f\n", intake_goal_);
+ }
+ }
+ }
+
+ private:
+ void StartAuto() {
+ LOG(INFO, "Starting auto mode\n");
+
+ actors::AutonomousActionParams params;
+ actors::auto_mode.FetchLatest();
+ if (actors::auto_mode.get() != nullptr) {
+ params.mode = actors::auto_mode->mode;
+ } else {
+ LOG(WARNING, "no auto mode values\n");
+ params.mode = 0;
+ }
+ action_queue_.EnqueueAction(actors::MakeAutonomousAction(params));
+ }
+
+ void StopAuto() {
+ LOG(INFO, "Stopping auto mode\n");
+ action_queue_.CancelAllActions();
+ }
+
+ // Whatever these are set to are our default goals to send out after zeroing.
+ double intake_goal_;
+
+ bool was_running_ = false;
+ bool auto_running_ = false;
+
+ bool traverse_down_ = false;
+
+ // If we're waiting for the subsystems to zero.
+ bool waiting_for_zero_ = true;
+
+ // If true, the ball was present when the intaking button was pressed.
+ bool saw_ball_when_started_intaking_ = false;
+
+ bool is_intaking_ = false;
+ bool is_outtaking_ = false;
+
+ int recently_intaking_accumulator_ = 0;
+
+ ::aos::common::actions::ActionQueue action_queue_;
+
+ const ::frc971::control_loops::drivetrain::DrivetrainConfig dt_config_;
+
+ ::aos::util::SimpleLogInterval no_drivetrain_status_ =
+ ::aos::util::SimpleLogInterval(::aos::time::Time::InSeconds(0.2), WARNING,
+ "no drivetrain status");
+};
+
+} // namespace joysticks
+} // namespace input
+} // namespace y2016_bot3
+
+int main() {
+ ::aos::Init(-1);
+ ::y2016_bot3::input::joysticks::Reader reader;
+ reader.Run();
+ ::aos::Cleanup();
+}
diff --git a/y2016_bot3/queues/BUILD b/y2016_bot3/queues/BUILD
new file mode 100644
index 0000000..81f75d4
--- /dev/null
+++ b/y2016_bot3/queues/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ['//visibility:public'])
+
+load('/aos/build/queues', 'queue_library')
+
+queue_library(
+ name = 'ball_detector',
+ srcs = [
+ 'ball_detector.q',
+ ],
+)
+
+queue_library(
+ name = 'profile_params',
+ srcs = [
+ 'profile_params.q',
+ ],
+)
diff --git a/y2016_bot3/queues/ball_detector.q b/y2016_bot3/queues/ball_detector.q
new file mode 100644
index 0000000..bd2e02f
--- /dev/null
+++ b/y2016_bot3/queues/ball_detector.q
@@ -0,0 +1,13 @@
+package y2016_bot3.sensors;
+
+message BallDetector {
+ // Voltage measured by the ball detector sensor.
+
+ // Higher voltage means ball is closer to detector, lower voltage means ball
+ // is far from the sensor or not in the robot at all.
+ // TODO(comran): Check to see if our sensor's output corresponds with the
+ // comment above.
+
+ double voltage;
+};
+queue BallDetector ball_detector;
diff --git a/y2016_bot3/queues/profile_params.q b/y2016_bot3/queues/profile_params.q
new file mode 100644
index 0000000..351682d
--- /dev/null
+++ b/y2016_bot3/queues/profile_params.q
@@ -0,0 +1,6 @@
+package y2016_bot3;
+
+struct ProfileParams {
+ double velocity;
+ double acceleration;
+};
diff --git a/y2016_bot3/wpilib/BUILD b/y2016_bot3/wpilib/BUILD
new file mode 100644
index 0000000..e86eacc
--- /dev/null
+++ b/y2016_bot3/wpilib/BUILD
@@ -0,0 +1,43 @@
+package(default_visibility = ['//visibility:public'])
+
+cc_binary(
+ name = 'wpilib_interface',
+ srcs = [
+ 'wpilib_interface.cc',
+ ],
+ deps = [
+ '//aos/common:stl_mutex',
+ '//aos/common/logging',
+ '//aos/common:math',
+ '//aos/common/controls:control_loop',
+ '//aos/common/util:log_interval',
+ '//aos/common:time',
+ '//aos/common/logging:queue_logging',
+ '//aos/common/messages:robot_state',
+ '//aos/common/util:phased_loop',
+ '//aos/common/util:wrapping_counter',
+ '//aos/linux_code:init',
+ '//third_party/allwpilib_2016:wpilib',
+ '//frc971/control_loops/drivetrain:drivetrain_queue',
+ '//frc971/control_loops:queues',
+ '//frc971/wpilib:joystick_sender',
+ '//frc971/wpilib:loop_output_handler',
+ '//frc971/wpilib:buffered_pcm',
+ '//frc971/wpilib:gyro_sender',
+ '//frc971/wpilib:dma_edge_counting',
+ '//frc971/wpilib:interrupt_edge_counting',
+ '//frc971/wpilib:wpilib_robot_base',
+ '//frc971/wpilib:encoder_and_potentiometer',
+ '//frc971/wpilib:logging_queue',
+ '//frc971/wpilib:wpilib_interface',
+ '//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:ADIS16448',
+ '//frc971/wpilib:dma',
+ '//y2016_bot3/control_loops/drivetrain:polydrivetrain_plants',
+ '//y2016_bot3/control_loops/intake:intake_queue',
+ '//y2016_bot3/queues:ball_detector',
+ '//y2016_bot3/actors:autonomous_action_queue',
+ '//y2016_bot3/control_loops/intake:intake_lib',
+ '//y2016_bot3/control_loops/drivetrain:drivetrain_base',
+ ],
+)
diff --git a/y2016_bot3/wpilib/wpilib_interface.cc b/y2016_bot3/wpilib/wpilib_interface.cc
new file mode 100644
index 0000000..3d7d8ce
--- /dev/null
+++ b/y2016_bot3/wpilib/wpilib_interface.cc
@@ -0,0 +1,517 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <thread>
+#include <mutex>
+#include <functional>
+#include <array>
+
+#include "Encoder.h"
+#include "Talon.h"
+#include "Relay.h"
+#include "DriverStation.h"
+#include "AnalogInput.h"
+#include "Compressor.h"
+#include "frc971/wpilib/wpilib_robot_base.h"
+#include "DigitalGlitchFilter.h"
+#undef ERROR
+
+#include "aos/common/logging/logging.h"
+#include "aos/common/logging/queue_logging.h"
+#include "aos/common/time.h"
+#include "aos/common/util/log_interval.h"
+#include "aos/common/util/phased_loop.h"
+#include "aos/common/util/wrapping_counter.h"
+#include "aos/common/stl_mutex.h"
+#include "aos/linux_code/init.h"
+#include "aos/common/messages/robot_state.q.h"
+#include "aos/common/commonmath.h"
+
+#include "frc971/control_loops/control_loops.q.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
+#include "y2016_bot3/control_loops/intake/intake.q.h"
+#include "y2016_bot3/queues/ball_detector.q.h"
+#include "y2016_bot3/actors/autonomous_action.q.h"
+
+#include "frc971/wpilib/joystick_sender.h"
+#include "frc971/wpilib/loop_output_handler.h"
+#include "frc971/wpilib/buffered_solenoid.h"
+#include "frc971/wpilib/buffered_pcm.h"
+#include "frc971/wpilib/gyro_sender.h"
+#include "frc971/wpilib/dma_edge_counting.h"
+#include "frc971/wpilib/interrupt_edge_counting.h"
+#include "frc971/wpilib/encoder_and_potentiometer.h"
+#include "frc971/wpilib/logging.q.h"
+#include "frc971/wpilib/wpilib_interface.h"
+#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/dma.h"
+
+#include "y2016_bot3/control_loops/intake/intake.h"
+#include "y2016_bot3/control_loops/drivetrain/drivetrain_base.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+using ::frc971::control_loops::drivetrain_queue;
+using ::y2016_bot3::control_loops::intake_queue;
+
+namespace y2016_bot3 {
+namespace constants {
+IntakeZero intake_zero;
+}
+namespace wpilib {
+namespace {
+constexpr double kMaxBringupPower = 12.0;
+} // namespace
+
+// TODO(Brian): Fix the interpretation of the result of GetRaw here and in the
+// DMA stuff and then removing the * 2.0 in *_translate.
+// The low bit is direction.
+
+// TODO(brian): Replace this with ::std::make_unique once all our toolchains
+// have support.
+template <class T, class... U>
+std::unique_ptr<T> make_unique(U &&... u) {
+ return std::unique_ptr<T>(new T(std::forward<U>(u)...));
+}
+
+// TODO(Campbell): Update values
+// Translates for the sensor values to convert raw index pulses into something
+// with proper units.
+
+double drivetrain_translate(int32_t in) {
+ return -static_cast<double>(in) / (512.0 /*cpr*/ * 4.0 /*4x*/) *
+ ::y2016_bot3::constants::kDrivetrainEncoderRatio *
+ control_loops::drivetrain::kWheelRadius * 2.0 * M_PI;
+}
+
+double drivetrain_velocity_translate(double in) {
+ return (1.0 / in) / 512.0 /*cpr*/ *
+ ::y2016_bot3::constants::kDrivetrainEncoderRatio *
+ control_loops::drivetrain::kWheelRadius * 2.0 * M_PI;
+}
+
+double intake_translate(int32_t in) {
+ return static_cast<double>(in) / (512.0 /*cpr*/ * 4.0 /*4x*/) *
+ ::y2016_bot3::constants::kIntakeEncoderRatio * (2 * M_PI /*radians*/);
+}
+
+double intake_pot_translate(double voltage) {
+ return voltage * ::y2016_bot3::constants::kIntakePotRatio *
+ (5.0 /*turns*/ / 5.0 /*volts*/) * (2 * M_PI /*radians*/);
+}
+
+constexpr double kMaxDrivetrainEncoderPulsesPerSecond =
+ 5600.0 /* CIM free speed RPM */ * 14.0 / 48.0 /* 1st reduction */ * 28.0 /
+ 50.0 /* 2nd reduction (high gear) */ * 30.0 / 44.0 /* encoder gears */ /
+ 60.0 /* seconds per minute */ * 256.0 /* CPR */ * 4 /* edges per cycle */;
+
+// Class to send position messages with sensor readings to our loops.
+class SensorReader {
+ public:
+ SensorReader() {
+ // Set it to filter out anything shorter than 1/4 of the minimum pulse width
+ // we should ever see.
+ drivetrain_encoder_filter_.SetPeriodNanoSeconds(
+ static_cast<int>(1 / 4.0 /* built-in tolerance */ /
+ kMaxDrivetrainEncoderPulsesPerSecond * 1e9 +
+ 0.5));
+ }
+
+ // Drivetrain setters.
+ void set_drivetrain_left_encoder(::std::unique_ptr<Encoder> encoder) {
+ drivetrain_encoder_filter_.Add(encoder.get());
+ drivetrain_left_encoder_ = ::std::move(encoder);
+ }
+
+ void set_drivetrain_right_encoder(::std::unique_ptr<Encoder> encoder) {
+ drivetrain_encoder_filter_.Add(encoder.get());
+ drivetrain_right_encoder_ = ::std::move(encoder);
+ }
+
+ // Intake setters.
+ void set_intake_encoder(::std::unique_ptr<Encoder> encoder) {
+ intake_encoder_filter_.Add(encoder.get());
+ intake_encoder_.set_encoder(::std::move(encoder));
+ }
+
+ void set_intake_potentiometer(::std::unique_ptr<AnalogInput> potentiometer) {
+ intake_encoder_.set_potentiometer(::std::move(potentiometer));
+ }
+
+ void set_intake_index(::std::unique_ptr<DigitalInput> index) {
+ intake_encoder_filter_.Add(index.get());
+ intake_encoder_.set_index(::std::move(index));
+ }
+
+ // Ball detector setter.
+ void set_ball_detector(::std::unique_ptr<AnalogInput> analog) {
+ ball_detector_ = ::std::move(analog);
+ }
+
+ // All of the DMA-related set_* calls must be made before this, and it doesn't
+ // hurt to do all of them.
+
+ void set_dma(::std::unique_ptr<DMA> dma) {
+ dma_synchronizer_.reset(
+ new ::frc971::wpilib::DMASynchronizer(::std::move(dma)));
+ dma_synchronizer_->Add(&intake_encoder_);
+ }
+
+ void operator()() {
+ ::aos::SetCurrentThreadName("SensorReader");
+
+ my_pid_ = getpid();
+ ds_ = &DriverStation::GetInstance();
+
+ dma_synchronizer_->Start();
+
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
+ ::std::chrono::milliseconds(4));
+
+ ::aos::SetCurrentThreadRealtimePriority(40);
+ while (run_) {
+ {
+ const int iterations = phased_loop.SleepUntilNext();
+ if (iterations != 1) {
+ LOG(WARNING, "SensorReader skipped %d iterations\n", iterations - 1);
+ }
+ }
+ RunIteration();
+ }
+ }
+
+ void RunIteration() {
+ ::frc971::wpilib::SendRobotState(my_pid_, ds_);
+
+ const auto intake_pot_offset =
+ y2016_bot3::constants::intake_zero.pot_offset;
+
+ {
+ auto drivetrain_message = drivetrain_queue.position.MakeMessage();
+ drivetrain_message->right_encoder =
+ drivetrain_translate(drivetrain_right_encoder_->GetRaw());
+ drivetrain_message->left_encoder =
+ -drivetrain_translate(drivetrain_left_encoder_->GetRaw());
+ drivetrain_message->left_speed =
+ drivetrain_velocity_translate(drivetrain_left_encoder_->GetPeriod());
+ drivetrain_message->right_speed =
+ drivetrain_velocity_translate(drivetrain_right_encoder_->GetPeriod());
+
+ drivetrain_message.Send();
+ }
+
+ dma_synchronizer_->RunIteration();
+
+ {
+ auto intake_message = intake_queue.position.MakeMessage();
+ CopyPotAndIndexPosition(intake_encoder_, &intake_message->intake,
+ intake_translate, intake_pot_translate, true,
+ intake_pot_offset);
+
+ intake_message.Send();
+ }
+
+ {
+ auto ball_detector_message =
+ ::y2016_bot3::sensors::ball_detector.MakeMessage();
+ ball_detector_message->voltage = ball_detector_->GetVoltage();
+ LOG_STRUCT(DEBUG, "ball detector", *ball_detector_message);
+ ball_detector_message.Send();
+ }
+
+ {
+ auto auto_mode_message = ::y2016_bot3::actors::auto_mode.MakeMessage();
+ auto_mode_message->mode = 0;
+ LOG_STRUCT(DEBUG, "auto mode", *auto_mode_message);
+ auto_mode_message.Send();
+ }
+ }
+
+ void Quit() { run_ = false; }
+
+ private:
+ void CopyPotAndIndexPosition(
+ const ::frc971::wpilib::DMAEncoderAndPotentiometer &encoder,
+ ::frc971::PotAndIndexPosition *position,
+ ::std::function<double(int32_t)> encoder_translate,
+ ::std::function<double(double)> potentiometer_translate, bool reverse,
+ double pot_offset) {
+ const double multiplier = reverse ? -1.0 : 1.0;
+ position->encoder =
+ multiplier * encoder_translate(encoder.polled_encoder_value());
+ position->pot = multiplier * potentiometer_translate(
+ encoder.polled_potentiometer_voltage()) +
+ pot_offset;
+ position->latched_encoder =
+ multiplier * encoder_translate(encoder.last_encoder_value());
+ position->latched_pot =
+ multiplier *
+ potentiometer_translate(encoder.last_potentiometer_voltage()) +
+ pot_offset;
+ position->index_pulses = encoder.index_posedge_count();
+ }
+
+ int32_t my_pid_;
+ DriverStation *ds_;
+
+ ::std::unique_ptr<::frc971::wpilib::DMASynchronizer> dma_synchronizer_;
+
+ ::std::unique_ptr<Encoder> drivetrain_left_encoder_,
+ drivetrain_right_encoder_;
+
+ ::frc971::wpilib::DMAEncoderAndPotentiometer intake_encoder_;
+ ::std::unique_ptr<AnalogInput> ball_detector_;
+
+ ::std::atomic<bool> run_{true};
+ DigitalGlitchFilter drivetrain_encoder_filter_, intake_encoder_filter_;
+};
+
+class SolenoidWriter {
+ public:
+ SolenoidWriter(const ::std::unique_ptr<::frc971::wpilib::BufferedPcm> &pcm)
+ : pcm_(pcm),
+ drivetrain_(".frc971.control_loops.drivetrain_queue.output"),
+ intake_(".y2016_bot3.control_loops.intake_queue.output") {}
+
+ void set_compressor(::std::unique_ptr<Compressor> compressor) {
+ compressor_ = ::std::move(compressor);
+ }
+
+ void set_traverse(::std::unique_ptr<::frc971::wpilib::BufferedSolenoid> s) {
+ traverse_ = ::std::move(s);
+ }
+
+ void operator()() {
+ compressor_->Start();
+ ::aos::SetCurrentThreadName("Solenoids");
+ ::aos::SetCurrentThreadRealtimePriority(27);
+
+ ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(20),
+ ::std::chrono::milliseconds(1));
+
+ while (run_) {
+ {
+ const int iterations = phased_loop.SleepUntilNext();
+ if (iterations != 1) {
+ LOG(DEBUG, "Solenoids skipped %d iterations\n", iterations - 1);
+ }
+ }
+
+ {
+ intake_.FetchLatest();
+ if (intake_.get()) {
+ LOG_STRUCT(DEBUG, "solenoids", *intake_);
+ traverse_->Set(intake_->traverse_down);
+ }
+ }
+
+ {
+ ::frc971::wpilib::PneumaticsToLog to_log;
+ { to_log.compressor_on = compressor_->Enabled(); }
+
+ pcm_->Flush();
+ to_log.read_solenoids = pcm_->GetAll();
+ LOG_STRUCT(DEBUG, "pneumatics info", to_log);
+ }
+ }
+ }
+
+ void Quit() { run_ = false; }
+
+ private:
+ const ::std::unique_ptr<::frc971::wpilib::BufferedPcm> &pcm_;
+
+ ::std::unique_ptr<::frc971::wpilib::BufferedSolenoid> traverse_;
+ ::std::unique_ptr<Compressor> compressor_;
+
+ ::aos::Queue<::frc971::control_loops::DrivetrainQueue::Output> drivetrain_;
+ ::aos::Queue<::y2016_bot3::control_loops::IntakeQueue::Output> intake_;
+
+ ::std::atomic<bool> run_{true};
+};
+
+class DrivetrainWriter : public ::frc971::wpilib::LoopOutputHandler {
+ public:
+ void set_drivetrain_left_talon(::std::unique_ptr<Talon> t0,
+ ::std::unique_ptr<Talon> t1) {
+ drivetrain_left_talon_0_ = ::std::move(t0);
+ drivetrain_left_talon_1_ = ::std::move(t1);
+ }
+
+ void set_drivetrain_right_talon(::std::unique_ptr<Talon> t0,
+ ::std::unique_ptr<Talon> t1) {
+ drivetrain_right_talon_0_ = ::std::move(t0);
+ drivetrain_right_talon_1_ = ::std::move(t1);
+ }
+
+ private:
+ virtual void Read() override {
+ ::frc971::control_loops::drivetrain_queue.output.FetchAnother();
+ }
+
+ virtual void Write() override {
+ auto &queue = ::frc971::control_loops::drivetrain_queue.output;
+ LOG_STRUCT(DEBUG, "will output", *queue);
+ drivetrain_left_talon_0_->Set(queue->left_voltage / 12.0);
+ drivetrain_left_talon_1_->Set(queue->left_voltage / 12.0);
+ drivetrain_right_talon_0_->Set(-queue->right_voltage / 12.0);
+ drivetrain_right_talon_1_->Set(-queue->right_voltage / 12.0);
+ }
+
+ virtual void Stop() override {
+ LOG(WARNING, "drivetrain output too old\n");
+ drivetrain_left_talon_0_->Disable();
+ drivetrain_right_talon_0_->Disable();
+ drivetrain_left_talon_1_->Disable();
+ drivetrain_right_talon_1_->Disable();
+ }
+
+ ::std::unique_ptr<Talon> drivetrain_left_talon_0_, drivetrain_right_talon_0_,
+ drivetrain_right_talon_1_, drivetrain_left_talon_1_;
+};
+
+class IntakeWriter : public ::frc971::wpilib::LoopOutputHandler {
+ public:
+ void set_intake_talon(::std::unique_ptr<Talon> t) {
+ intake_talon_ = ::std::move(t);
+ }
+
+ void set_intake_rollers_talon(::std::unique_ptr<Talon> t) {
+ intake_rollers_talon_ = ::std::move(t);
+ }
+
+ void set_top_rollers_talon(::std::unique_ptr<Talon> t) {
+ top_rollers_talon_ = ::std::move(t);
+ }
+
+ void set_bottom_rollers_talon(::std::unique_ptr<Talon> t) {
+ bottom_rollers_talon_ = ::std::move(t);
+ }
+
+ private:
+ virtual void Read() override {
+ ::y2016_bot3::control_loops::intake_queue.output.FetchAnother();
+ }
+
+ virtual void Write() override {
+ auto &queue = ::y2016_bot3::control_loops::intake_queue.output;
+ LOG_STRUCT(DEBUG, "will output", *queue);
+ intake_talon_->Set(::aos::Clip(queue->voltage_intake, -kMaxBringupPower,
+ kMaxBringupPower) /
+ 12.0);
+ top_rollers_talon_->Set(-queue->voltage_top_rollers / 12.0);
+ intake_rollers_talon_->Set(-queue->voltage_intake_rollers / 12.0);
+ bottom_rollers_talon_->Set(-queue->voltage_bottom_rollers / 12.0);
+ }
+
+ virtual void Stop() override {
+ LOG(WARNING, "Intake output too old.\n");
+ intake_talon_->Disable();
+ }
+
+ ::std::unique_ptr<Talon> intake_talon_, top_rollers_talon_,
+ bottom_rollers_talon_, intake_rollers_talon_;
+};
+
+class WPILibRobot : public ::frc971::wpilib::WPILibRobotBase {
+ public:
+ ::std::unique_ptr<Encoder> make_encoder(int index) {
+ return make_unique<Encoder>(10 + index * 2, 11 + index * 2, false,
+ Encoder::k4X);
+ }
+
+ void Run() override {
+ ::aos::InitNRT();
+ ::aos::SetCurrentThreadName("StartCompetition");
+
+ ::frc971::wpilib::JoystickSender joystick_sender;
+ ::std::thread joystick_thread(::std::ref(joystick_sender));
+
+ ::frc971::wpilib::PDPFetcher pdp_fetcher;
+ ::std::thread pdp_fetcher_thread(::std::ref(pdp_fetcher));
+ SensorReader reader;
+
+ reader.set_drivetrain_left_encoder(make_encoder(0));
+ reader.set_drivetrain_right_encoder(make_encoder(1));
+
+ reader.set_intake_encoder(make_encoder(2));
+ reader.set_intake_index(make_unique<DigitalInput>(0));
+ reader.set_intake_potentiometer(make_unique<AnalogInput>(4));
+
+ reader.set_ball_detector(make_unique<AnalogInput>(5));
+
+ reader.set_dma(make_unique<DMA>());
+ ::std::thread reader_thread(::std::ref(reader));
+
+ ::frc971::wpilib::GyroSender gyro_sender;
+ ::std::thread gyro_thread(::std::ref(gyro_sender));
+
+ DrivetrainWriter drivetrain_writer;
+ // 2 and 3 are right. 0 and 1 are left
+ drivetrain_writer.set_drivetrain_left_talon(
+ ::std::unique_ptr<Talon>(new Talon(0)),
+ ::std::unique_ptr<Talon>(new Talon(1)));
+ drivetrain_writer.set_drivetrain_right_talon(
+ ::std::unique_ptr<Talon>(new Talon(2)),
+ ::std::unique_ptr<Talon>(new Talon(3)));
+ ::std::thread drivetrain_writer_thread(::std::ref(drivetrain_writer));
+
+ IntakeWriter intake_writer;
+ intake_writer.set_intake_talon(::std::unique_ptr<Talon>(new Talon(7)));
+ intake_writer.set_top_rollers_talon(::std::unique_ptr<Talon>(new Talon(6)));
+ intake_writer.set_intake_rollers_talon(
+ ::std::unique_ptr<Talon>(new Talon(5)));
+ intake_writer.set_bottom_rollers_talon(
+ ::std::unique_ptr<Talon>(new Talon(4)));
+ ::std::thread intake_writer_thread(::std::ref(intake_writer));
+
+ ::std::unique_ptr<::frc971::wpilib::BufferedPcm> pcm(
+ new ::frc971::wpilib::BufferedPcm());
+ SolenoidWriter solenoid_writer(pcm);
+ solenoid_writer.set_traverse(pcm->MakeSolenoid(3));
+
+ solenoid_writer.set_compressor(make_unique<Compressor>());
+
+ ::std::thread solenoid_thread(::std::ref(solenoid_writer));
+
+ // Wait forever. Not much else to do...
+ while (true) {
+ const int r = select(0, nullptr, nullptr, nullptr, nullptr);
+ if (r != 0) {
+ PLOG(WARNING, "infinite select failed");
+ } else {
+ PLOG(WARNING, "infinite select succeeded??\n");
+ }
+ }
+
+ LOG(ERROR, "Exiting WPILibRobot\n");
+
+ joystick_sender.Quit();
+ joystick_thread.join();
+ pdp_fetcher.Quit();
+ pdp_fetcher_thread.join();
+ reader.Quit();
+ reader_thread.join();
+ gyro_sender.Quit();
+ gyro_thread.join();
+
+ drivetrain_writer.Quit();
+ drivetrain_writer_thread.join();
+ intake_writer.Quit();
+ intake_writer_thread.join();
+ solenoid_writer.Quit();
+ solenoid_thread.join();
+
+ ::aos::Cleanup();
+ }
+};
+
+} // namespace wpilib
+} // namespace y2016_bot3
+
+AOS_ROBOT_CLASS(::y2016_bot3::wpilib::WPILibRobot);