Merge pull request #80 from PhyXTGears-programming/develop

v2.0.0

Author: PhyXTGears-1720

.gitignore

@@ -158,3 +158,4 @@ bin/
 
 
 # End of https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode
+src/main/deploy/version.txt

Makefile

@@ -10,20 +10,4 @@ build:
 	@./gradlew build
 
 deploy: build
-	@$(make-version-file)
 	@./gradlew deploy
-	@$(clean-version-file)
-
-define make-version-file
-	cat > src/main/deploy/version.txt <<'EOF'
-	========================================
-	FRC Team 1720 - PhyXTGears
-
-	Software version: $(shell git describe --tags)
-	========================================
-	EOF
-endef
-
-define clean-version-file
-	@rm src/main/deploy/version.txt
-endef

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id "cpp"
     id "google-test-test-suite"
     id "edu.wpi.first.GradleRIO" version "2019.4.1"
+    id "org.ajoberstar.grgit" version "2.3.0"
 }
 
 // Define my targets (RoboRIO) and artifacts (deployable files)
@@ -85,3 +86,19 @@ model {
         }
     }
 }
+
+task versionFile {
+    outputs.upToDateWhen { false }
+    doFirst {
+        new File('src/main/deploy/version.txt').text = """
+========================================
+FRC Team 1720 - PhyXTGears
+Robot: Space Walrus
+Season: 2019
+Software version: ${grgit.describe()}
+========================================
+        """
+    }
+}
+
+tasks.getByName('deploy').dependsOn(versionFile)

src/main/cpp/Bling.cpp

@@ -0,0 +1,19 @@
+#include "Bling.h"
+
+Bling::Bling () {
+    // TODO
+}
+
+void Bling::RunBling () {
+    if (m_SeqDelay.IsDone()) {
+        m_Pattern = Default;
+        m_SeqDelay.Stop();
+    }
+    m_Blinkin.Set(m_PwmMap[m_Pattern]);
+}
+
+void Bling::SetBling (BlingPattern p) {
+    m_Pattern = p;
+    m_SeqDelay.setPeriod(m_DelayMap[p]);
+    m_SeqDelay.Start();
+}

src/main/cpp/OI.cpp

@@ -1,5 +1,33 @@
 #include "OI.h"
 
+#include "OperatorHID.h"
 #include <frc/WPILib.h>
 
 OI::OI() {}
+
+// Pressing buttons in Disabled sends the presses when re-enabling.
+// That's bad, so we clear the presses when enabling.
+void OI::ClearButtonBuffer() {
+    for (int i = 1; i <= m_HidDriver.GetButtonCount(); i++) {
+        m_HidDriver.GetRawButtonPressed(i);
+        m_HidDriver.GetRawButtonReleased(i);
+    }
+
+    ButtonBoard& board1 = m_HidOperator.GetBoard1();
+    for (int i = 1; i <= board1.GetButtonCount(); i++) {
+        board1.GetRawButtonPressed(i);
+        board1.GetRawButtonReleased(i);
+    }
+
+    ButtonBoard& board2 = m_HidOperator.GetBoard2();
+    for (int i = 1; i <= board2.GetButtonCount(); i++) {
+        board2.GetRawButtonPressed(i);
+        board2.GetRawButtonReleased(i);
+    }
+
+    frc::Joystick& flightstick = m_HidOperator.GetFlightStick();
+    for (int i = 1; i <= flightstick.GetButtonCount(); i++) {
+        flightstick.GetRawButtonPressed(i);
+        flightstick.GetRawButtonReleased(i);
+    }
+}