Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.0.0 #80

Merged
merged 79 commits into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
575ed16
Increase climb speed and angle
PhyXTGears-1720 Mar 9, 2019
a3464b4
Fixed climb issues
PhyXTGears-1720 Mar 9, 2019
d4513f5
Increase cargo ship shoot power
PhyXTGears-1720 Mar 9, 2019
5627267
Add operator control for creeper crawl
PhyXTGears-1720 Mar 9, 2019
1d89226
Use rocket level 2 as slower backup shot
PhyXTGears-1720 Mar 9, 2019
d87ad3c
Increase cargo intake speed
PhyXTGears-1720 Mar 10, 2019
2724ebb
Add mid-power shot
PhyXTGears-1720 Mar 10, 2019
096cdb2
Add operator control to switch camera
PhyXTGears-1720 Mar 10, 2019
e740487
Continue running Intake PID
PhyXTGears-1720 Mar 10, 2019
6cec061
Fixes for last qual match
PhyXTGears-1720 Mar 10, 2019
bde4f48
Lower P for intake to reduce overshoot
PhyXTGears-1720 Mar 10, 2019
5db32c7
Print button events to cout.
PhyXTGears-1720 Mar 10, 2019
40252d4
Merge pull request #65 from PhyXTGears-programming/competition/adjust…
rsammelson Mar 13, 2019
7cd39a9
Merge branch 'master' into develop
boxofrox Mar 13, 2019
a2a2428
Add NavX Reader Code
PhyXTGears-1720 Mar 15, 2019
f2ace4b
Add AngleSource
PhyXTGears-1720 Mar 16, 2019
5eca2df
Begin switch to use NavX PID.
PhyXTGears-1720 Mar 16, 2019
191ccac
Remove aggressive cout's.
boxofrox Mar 19, 2019
650056f
Merge pull request #69 from PhyXTGears-programming/feature/NavX
boxofrox Mar 20, 2019
a4bf4d3
Add getters for all the stuff in OperatorHID.
boxofrox Mar 20, 2019
816127b
Add method to clear button buffers.
PhyXTGears-1720 Mar 16, 2019
d187915
Add ClearButtonBuffer to every init.
boxofrox Mar 20, 2019
03d21f8
Merge pull request #70 from PhyXTGears-programming/feature/fix-button…
boxofrox Mar 20, 2019
1ceceb1
Build, deploy, and print a version file.
boxofrox Mar 6, 2019
db6345e
Force versionFile build task always out of date.
boxofrox Mar 6, 2019
ad25f93
Merge pull request #71 from PhyXTGears-programming/feature/version-ba…
boxofrox Mar 21, 2019
c78bdb1
Cleanup.
PhyXTGears-1720 Mar 21, 2019
ce2d3f6
Merge pull request #72 from PhyXTGears-programming/feature/wednesday-…
boxofrox Mar 21, 2019
d63aaf2
Move util class to util folder
PhyXTGears-1720 Mar 16, 2019
dbfb361
Merge pull request #73 from PhyXTGears-programming/feature/move-util
boxofrox Mar 21, 2019
8d26296
Add dual roller functionality.
PhyXTGears-1720 Mar 21, 2019
55c79da
Merge pull request #74 from PhyXTGears-programming/feature/dual-rollers
boxofrox Mar 21, 2019
23102d4
Refactor Button Board code, add new constants.
PhyXTGears-1720 Mar 20, 2019
5a3c418
Calibrate button panel.
PhyXTGears-1720 Mar 22, 2019
43c732d
Fix build errors.
PhyXTGears-1720 Mar 22, 2019
3c82217
Reverse manual joystick for cargo intake.
PhyXTGears-1720 Mar 22, 2019
4a60ade
Fix comments.
PhyXTGears-1720 Mar 22, 2019
8b51308
Stop intake/creeper arms when flightstick is released.
PhyXTGears-1720 Mar 22, 2019
4eebccc
Reverse hatch controls.
PhyXTGears-1720 Mar 22, 2019
8eb0aed
fixup! Calibrate button panel.
PhyXTGears-1720 Mar 22, 2019
20fa11e
Remove stowed button.
PhyXTGears-1720 Mar 22, 2019
ced683c
Remove cout spam.
PhyXTGears-1720 Mar 22, 2019
cd8e4fa
Merge pull request #75 from PhyXTGears-programming/feature/button-boa…
PhyXTGears-1720 Mar 22, 2019
46f6b44
Add JoystickDemoCargoKick and SetEjector.
PhyXTGears-1720 Mar 21, 2019
5f8e71b
Calibrate cargo ejector and add to config.
PhyXTGears-1720 Mar 21, 2019
831a4cc
Update testbot config with dual roller settings.
PhyXTGears-1720 Mar 21, 2019
5c5d2e5
Use double for angles, not int.
PhyXTGears-1720 Mar 21, 2019
0bda724
Recalibrate creeper arm and cargo-intake.
PhyXTGears-1720 Mar 21, 2019
53c419f
Remove piston limit switch.
PhyXTGears-1720 Mar 21, 2019
601f8d3
Add solenoid outputs for left and right pistons.
PhyXTGears-1720 Mar 21, 2019
7fcc223
Calibrate compbot setpoints for intake and climb.
PhyXTGears-1720 Mar 22, 2019
abaf919
Merge pull request #76 from PhyXTGears-programming/feature/calibrate
PhyXTGears-1720 Mar 22, 2019
f17dd4a
Format config file
PhyXTGears-1720 Mar 22, 2019
1d0825d
Fix intake bugs
PhyXTGears-1720 Mar 23, 2019
0e6e0a8
Revert "Begin switch to use NavX PID."
PhyXTGears-1720 Mar 23, 2019
4f6cf25
Remove NavX Code
PhyXTGears-1720 Mar 23, 2019
c21362d
Merge pull request #77 from PhyXTGears-programming/competition/tuning
rsammelson Mar 23, 2019
05ce369
Add operator camera control
PhyXTGears-1720 Mar 24, 2019
1b6be04
Tune variables for practice match
PhyXTGears-1720 Mar 24, 2019
c6fd265
Adjust kicker location
PhyXTGears-1720 Mar 23, 2019
75da1d6
Speed up intake movement
PhyXTGears-1720 Mar 23, 2019
371d786
Speed up turning in slow mode
PhyXTGears-1720 Mar 23, 2019
cd04bfa
Adjust creeper rotation zero point
PhyXTGears-1720 Mar 23, 2019
cb8dc7e
Add air pressure to dashboard
PhyXTGears-1720 Mar 23, 2019
fa3befb
Fix air pressure values
PhyXTGears-1720 Mar 23, 2019
a553d61
Add manual piston controls
PhyXTGears-1720 Mar 23, 2019
e2babf5
Add cargo level 2 shot
PhyXTGears-1720 Mar 23, 2019
9e848fa
Merge pull request #78 from PhyXTGears-programming/competition/tuning
PhyXTGears-1720 Mar 24, 2019
e8a4ae0
Add blinkin
PhyXTGears-1720 Mar 24, 2019
e618462
Blinkin separate auto and teleop
PhyXTGears-1720 Mar 24, 2019
d2e12f9
Change blinkin naming and patterns
PhyXTGears-1720 Mar 24, 2019
e823797
Add Bling Code to Buttons
PhyXTGears-1720 Mar 24, 2019
4bc1e17
Adjust creeper rotation zero point
PhyXTGears-1720 Mar 24, 2019
9f28a8d
Bling - add individual sequence delay
PhyXTGears-1720 Mar 24, 2019
86601c7
Fix manual control bug
PhyXTGears-1720 Mar 24, 2019
0cc137d
Lengthen climb bling pattern
PhyXTGears-1720 Mar 24, 2019
9aaee0c
Fix manual control bug
PhyXTGears-1720 Mar 24, 2019
ce994f4
Change bling patterns
PhyXTGears-1720 Mar 24, 2019
4b09da4
Merge pull request #79 from PhyXTGears-programming/competition/develop
rsammelson Mar 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,4 @@ bin/


# End of https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode
src/main/deploy/version.txt
16 changes: 0 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 17 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
19 changes: 19 additions & 0 deletions src/main/cpp/Bling.cpp
Original file line number Diff line number Diff line change
@@ -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();
}
28 changes: 28 additions & 0 deletions src/main/cpp/OI.cpp
Original file line number Diff line number Diff line change
@@ -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);
}
}
3 changes: 0 additions & 3 deletions src/main/cpp/OperatorHID.cpp

This file was deleted.

Loading