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

Release/v1.0.0 #60

Merged
merged 257 commits into from
Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
257 commits
Select commit Hold shift + click to select a range
ab87048
Prep for using competition robot.
PhyXTGears-1720 Feb 1, 2019
99fc1d2
Adjust driving.
PhyXTGears-1720 Feb 2, 2019
72f576d
Prevent PDP from being used on Protobot.
PhyXTGears-1720 Feb 2, 2019
fce7a90
Add Creeper Arm subsystem.
PhyXTGears-1720 Feb 2, 2019
dcb73ee
Properly add Creeper Arm to the robot.
PhyXTGears-1720 Feb 2, 2019
e9063d6
More Creeper Arm work.
PhyXTGears-1720 Feb 3, 2019
13d7384
Add cargo intake subsystem
PhyXTGears-1720 Feb 5, 2019
d473245
Add command for TakeCargo
PhyXTGears-1720 Feb 6, 2019
93e1114
Fix typo: CreeperArm::GetArmAngle()
PhyXTGears-1720 Feb 6, 2019
b617d2f
Reformat variable names.
PhyXTGears-1720 Feb 6, 2019
308dde6
Add macros to distinguish roborio port assignments in RobotMap
PhyXTGears-1720 Feb 6, 2019
b4b0e09
Add subsystem stubs
PhyXTGears-1720 Feb 8, 2019
e05cd84
Rename command TakeCargo -> TakeCargoFromDispenser
PhyXTGears-1720 Feb 8, 2019
c267859
Document goal and command sequence for TakeCargoFromDispenser
PhyXTGears-1720 Feb 8, 2019
73b0764
Add command TakeCargoFromFloor
PhyXTGears-1720 Feb 8, 2019
50e0e48
Add command RotateCargoForLevelOneRocket
PhyXTGears-1720 Feb 8, 2019
6d8e29e
Add command RotateCargoForLevelTwoRocket
PhyXTGears-1720 Feb 8, 2019
b83df5c
Add command RotateCargoForCargoShip
PhyXTGears-1720 Feb 8, 2019
290f9c1
Add command ShootCargoForCargoShip
PhyXTGears-1720 Feb 8, 2019
29b484c
Add command ShootCargoForLevelOneRocket
PhyXTGears-1720 Feb 8, 2019
05f2497
Add command ShootCargoForLevelTwoRocket
PhyXTGears-1720 Feb 8, 2019
7707e55
Fix text for in CODESTYLE.md
rsammelson Feb 8, 2019
92cc0ee
Add BSD license and PhyXTGears copyright
PhyXTGears-1720 Feb 9, 2019
0a10e16
Add class to compute running average
PhyXTGears-1720 Feb 9, 2019
cd0626d
Merge pull request #9 from PhyXTGears-programming/feature/fix-codestyle
PhyXTGears-1720 Feb 9, 2019
082b09a
Merge pull request #10 from PhyXTGears-programming/feature/running-av…
PhyXTGears-1720 Feb 9, 2019
5a205bc
Merge pull request #11 from PhyXTGears-programming/feature/license
PhyXTGears-1720 Feb 9, 2019
e416959
Fix indentation and remove copyright notice.
PhyXTGears-1720 Feb 9, 2019
5cbb51b
Add grabbing and releasing hatch panel.
PhyXTGears-1720 Feb 9, 2019
a3b7a22
Use full 180 degrees with Dispenser Hatch Grab.
PhyXTGears-1720 Feb 9, 2019
dfec2ea
Merge pull request #12 from PhyXTGears-programming/feature/cargo-inta…
PhyXTGears-1720 Feb 9, 2019
944e683
Merge branch 'feature/cargo-hatch-commands' into develop
PhyXTGears-1720 Feb 9, 2019
3bf4350
Update issue templates
PhyXTGears-1720 Feb 10, 2019
7cff5fc
Implement command RotateCargoForCargoShip
PhyXTGears-1720 Feb 9, 2019
f4bb85a
Merge pull request #14 from PhyXTGears-programming/feature/issue-temp…
rsammelson Feb 10, 2019
e8c4737
Merge pull request #15 from PhyXTGears-programming/feature/implement-…
PhyXTGears-1720 Feb 10, 2019
6754ae1
Start floor intake commands
PhyXTGears-1720 Feb 10, 2019
a4376f5
Consolidate reading config values into fewer functions
PhyXTGears-1720 Feb 10, 2019
24788d1
Cargo intake rotation is done when PID error is near zero
PhyXTGears-1720 Feb 10, 2019
7b1b90f
Update comments. Floor is -90deg to cargo-intake zero point.
PhyXTGears-1720 Feb 12, 2019
0c3d8fa
Add command GrabHatchFromFloor
PhyXTGears-1720 Feb 12, 2019
95b96ce
Add velocity source
PhyXTGears-1720 Feb 9, 2019
90ef6b9
Add initial driver PID code
PhyXTGears-1720 Feb 12, 2019
b2e1915
Add stubs to CargoIntake for hatch commands.
PhyXTGears-1720 Feb 13, 2019
a0b4ea6
Implement command RotateHatchForFloor.
PhyXTGears-1720 Feb 13, 2019
481b739
Implement command RotateHatchForDispenser.
PhyXTGears-1720 Feb 13, 2019
c8e1a85
JSON parsing and Cargo Intake subsystem
PhyXTGears-1720 Feb 13, 2019
443f224
Moved JSON code to Robot.cpp & reformatted things.
PhyXTGears-1720 Feb 14, 2019
dddb0a9
Simplify json decoding and name PID parameters.
PhyXTGears-1720 Feb 14, 2019
e2047c3
Switch direction of drive train encoders.
PhyXTGears-1720 Feb 14, 2019
09bd0e9
Test to achieve higher driver train speed.
PhyXTGears-1720 Feb 14, 2019
1df9267
Initializing the cargo intake subsystem with json config
PhyXTGears-1720 Feb 14, 2019
a0a3a9b
Add limits to json config and adjust intake rotation map
PhyXTGears-1720 Feb 14, 2019
5160d47
JSON parsing and Cargo Intake subsystem
PhyXTGears-1720 Feb 13, 2019
b0531ae
Moved JSON code to Robot.cpp & reformatted things.
PhyXTGears-1720 Feb 14, 2019
6446a94
Simplify json decoding and name PID parameters.
PhyXTGears-1720 Feb 14, 2019
6dea42b
Initializing the cargo intake subsystem with json config
PhyXTGears-1720 Feb 14, 2019
6554ae2
Fix typo in wpi::json include
PhyXTGears-1720 Feb 15, 2019
2f68286
Implement command RotateCargoForLevelOneRocket
PhyXTGears-1720 Feb 15, 2019
0142b14
Add sensor to shufflebard and adjust JSON
PhyXTGears-1720 Feb 15, 2019
0dca012
Add home to JSON and edit GoHome
PhyXTGears-1720 Feb 16, 2019
f725264
Fix formatting
PhyXTGears-1720 Feb 16, 2019
a52fe05
Remove voltage section from config.json.
PhyXTGears-1720 Feb 16, 2019
d504ac7
Refactor m_Oi to m_OI
PhyXTGears-1720 Feb 16, 2019
80a1404
Merge branch 'feature/intake-subsystem' of https://github.com/PhyXTGe…
PhyXTGears-1720 Feb 16, 2019
d145aac
Merge pull request #16 from PhyXTGears-programming/feature/intake-sub…
boxofrox Feb 16, 2019
60906d6
Rename CreeperArm to CreeperClimb
PhyXTGears-1720 Feb 15, 2019
c7895e4
Work on ClimbStep command.
PhyXTGears-1720 Feb 15, 2019
36025f8
Fix typo for method invocation.
PhyXTGears-1720 Feb 16, 2019
54a6751
Fix missing argument
PhyXTGears-1720 Feb 16, 2019
1d879c4
Rename m_Oi to m_OI
PhyXTGears-1720 Feb 16, 2019
979f6c2
Rename rotation PID to m_RotationPID
PhyXTGears-1720 Feb 16, 2019
b18c074
Add method to check if creeper arm rotation is done
PhyXTGears-1720 Feb 16, 2019
ee0ca71
Add method to stop creeper arm rotation.
PhyXTGears-1720 Feb 16, 2019
97f9ae2
Set creeper arm angle with json config name.
PhyXTGears-1720 Feb 16, 2019
db017ea
Initialize PID controller to safe values until json config loads
PhyXTGears-1720 Feb 16, 2019
5b283e8
Add command ClimbPrep
PhyXTGears-1720 Feb 16, 2019
a329792
Add climb commands to robot.
PhyXTGears-1720 Feb 16, 2019
9062dd6
Set creeper rotation Talon SRX to CAN 8
PhyXTGears-1720 Feb 16, 2019
7157701
Calibrate analog sensor for creeper rotation angle
PhyXTGears-1720 Feb 16, 2019
0381cfe
Enable creeper arm PID when setpoint assigned.
PhyXTGears-1720 Feb 16, 2019
59f53cb
Invert creeper arm motor
PhyXTGears-1720 Feb 16, 2019
409d553
Add creeper arm PID to live dashboard.
PhyXTGears-1720 Feb 16, 2019
dcae411
Switch climb solenoids to inputs 6 & 7
PhyXTGears-1720 Feb 16, 2019
492568e
Tune creeper arm PID.
PhyXTGears-1720 Feb 16, 2019
73b26e7
Add getter for creeper arm PID.
PhyXTGears-1720 Feb 16, 2019
9f31192
Reformat pointers.
PhyXTGears-1720 Feb 16, 2019
e95a831
Rename ClimbPrep command to ReadyCreeperArm.
PhyXTGears-1720 Feb 16, 2019
6fed707
Clean up files
PhyXTGears-1720 Feb 16, 2019
9d9c62a
Merge pull request #17 from PhyXTGears-programming/feature/creeper-su…
PhyXTGears-1720 Feb 16, 2019
6458966
Fix recursive include bugs
PhyXTGears-1720 Feb 16, 2019
625ba9a
Tune PID
PhyXTGears-1720 Feb 16, 2019
5816b21
Add exchange position
PhyXTGears-1720 Feb 17, 2019
a80f11c
Update src/main/cpp/subsystems/DriveTrain.cpp
rsammelson Feb 17, 2019
8ca4e5d
Enable PID after setting
PhyXTGears-1720 Feb 17, 2019
934afea
Merge branch 'develop' into feature/drive-PID
rsammelson Feb 17, 2019
6c788c4
Merge pull request #27 from PhyXTGears-programming/feature/drive-PID
rsammelson Feb 17, 2019
56f6904
Merge branch 'develop' into feature/cargo-commands
rsammelson Feb 17, 2019
d706cfd
Merge pull request #24 from PhyXTGears-programming/feature/cargo-comm…
rsammelson Feb 17, 2019
3c3e564
Merge branch 'feature/cargo-hatch-commands' into develop
PhyXTGears-1720 Feb 16, 2019
5154c64
Fix build errors.
PhyXTGears-1720 Feb 16, 2019
1152455
Reverse creeper arm limit switch.
PhyXTGears-1720 Feb 17, 2019
73d7b5c
Add macro to disable drivetrain during testing...
PhyXTGears-1720 Feb 18, 2019
5cbcfc0
Move cargo sensor to DIO_5.
PhyXTGears-1720 Feb 18, 2019
eeaf8f6
Invert digital input for HasCargo check.
PhyXTGears-1720 Feb 18, 2019
2ad9bea
Add inputs and outputs to subsystem livedashboard.
PhyXTGears-1720 Feb 18, 2019
93486ba
Remove CreeperArm subsystem.
PhyXTGears-1720 Feb 18, 2019
3258236
Add getter for drive train.
PhyXTGears-1720 Feb 18, 2019
bbed6da
Merge pull request #30 from PhyXTGears-programming/feature/house-keeping
boxofrox Feb 19, 2019
2330e42
Swap creeper arm and cargo-intake roller controllers.
PhyXTGears-1720 Feb 19, 2019
6bb432b
Refactor creeper names.
boxofrox Feb 19, 2019
4475eae
Refactor climb section of config.json
boxofrox Feb 19, 2019
25de64c
Add zero-point to creeper subsystem.
boxofrox Feb 19, 2019
f34e16d
Make sure creeper wheels stop when ClimbStep commands ends.
boxofrox Feb 19, 2019
8753fa6
Add StopWatch and Delay to make user of timers easier.
PhyXTGears-1720 Feb 19, 2019
7dc5afa
Merge pull request #31 from PhyXTGears-programming/hotfix/swap-motor-…
PhyXTGears-1720 Feb 19, 2019
fd4cefd
Add method to check if creeper arm is in the expected position.
boxofrox Feb 19, 2019
d6716c9
Rename arm-prep setpoint to arm-ready.
boxofrox Feb 19, 2019
1df019a
Prevent ClimbStep from running if arm is not ready.
boxofrox Feb 19, 2019
164438c
Add code to test climb
PhyXTGears-1720 Feb 19, 2019
c3a6676
Merge remote-tracking branch 'origin/develop' into feature/creeper-su…
PhyXTGears-1720 Feb 19, 2019
0224043
Finish climb command and fix drive
PhyXTGears-1720 Feb 20, 2019
438cf36
Fix cargo intake code
PhyXTGears-1720 Feb 21, 2019
726bb07
Merge pull request #34 from PhyXTGears-programming/feature/fix-cargo
PhyXTGears-1720 Feb 21, 2019
becd691
Start on operator interface (button board + joystick)
PhyXTGears-1720 Feb 22, 2019
a2f2168
Update FRC software to 2019.3.2
PhyXTGears-1720 Feb 23, 2019
9fe8c21
Merge pull request #36 from PhyXTGears-programming/hotfix/frc-update-…
NotQuiteApex Feb 23, 2019
81f7072
Add comments to clarify creeper solenoid methods.
boxofrox Feb 18, 2019
0d6cfb6
Implement button presses for button board.
PhyXTGears-1720 Feb 23, 2019
dc0b55f
Quit thrashing teleop periodic.
boxofrox Feb 23, 2019
217ffc6
Put smartdashboard data into RobotPeriodic
boxofrox Feb 23, 2019
b0f1a7b
Merge branch 'develop' into feature/creeper-subsystem
boxofrox Feb 23, 2019
e778b48
Merge pull request #35 from PhyXTGears-programming/feature/creeper-su…
boxofrox Feb 23, 2019
d6265eb
Fix typo.
boxofrox Feb 25, 2019
e244e78
Rename method GetSolenoidSwitch to IsPistonAtLimit.
boxofrox Feb 25, 2019
f7bcaee
Add getter method for ClimbStep.m_Segment.
boxofrox Feb 25, 2019
111d921
Add methods with explicit names to control piston.
boxofrox Feb 25, 2019
a804dbb
Add comments.
boxofrox Feb 25, 2019
83d75e7
Rename SetOutputRange to SetRotatePIDOutputRange.
boxofrox Feb 25, 2019
750beae
Add method to CargoIntake to set arm rotation speed.
boxofrox Feb 26, 2019
1b730da
Convert CreeperClimb helper functions to private methods.
boxofrox Feb 26, 2019
3f0dbf9
Add IsAtPosition method to CargoIntake.
boxofrox Feb 26, 2019
555ad36
Fix roller control methods in CargoIntake.
boxofrox Feb 26, 2019
23bb47e
Add cargo ejector to CargoIntake.
boxofrox Feb 26, 2019
bf97a3c
Implement ShootCargoForCargoShip.
boxofrox Feb 26, 2019
877d3c6
Add test controls for creeper climb sequence
boxofrox Feb 26, 2019
1ca8723
Finish implementing TakeCargoFromFloor.
boxofrox Feb 26, 2019
9e52e04
Add test controls for cargo intake.
boxofrox Feb 26, 2019
4f3eac0
Merge pull request #37 from PhyXTGears-programming/feature/house-keeping
PhyXTGears-1720 Feb 26, 2019
c449b70
Merge pull request #41 from PhyXTGears-programming/feature/subsystem-…
PhyXTGears-1720 Feb 26, 2019
f8e21d2
Reenable standard non-PID drivetrain.
PhyXTGears-1720 Feb 23, 2019
52e29da
Fix ClimbStep setpoints
PhyXTGears-1720 Feb 27, 2019
420d0aa
Remove test code function, fix arcade drive.
PhyXTGears-1720 Feb 27, 2019
4663398
Update for 2 boards, update button numbers.
PhyXTGears-1720 Feb 27, 2019
50155a5
Merge pull request #42 from PhyXTGears-programming/feature/remove-dri…
rsammelson Feb 27, 2019
6fd9e83
Merge branch 'develop' into feature/button-board
PhyXTGears-1720 Feb 27, 2019
bddfca6
Merge pull request #43 from PhyXTGears-programming/feature/button-board
rsammelson Feb 27, 2019
7e55257
Finish button board code, adjust test bot stuff.
PhyXTGears-1720 Feb 27, 2019
5690b58
Fix build errors from button-board merge.
boxofrox Feb 27, 2019
6ba3a8c
Merge pull request #44 from PhyXTGears-programming/hotfix/build-error…
boxofrox Feb 27, 2019
ce4cad7
Fix intake rotation direction in JoystickDemoCargo.
PhyXTGears-1720 Feb 28, 2019
8187116
Fix JoystickDemoCargo controls.
PhyXTGears-1720 Feb 28, 2019
31e0584
Fix: initialize all the commands.
PhyXTGears-1720 Feb 28, 2019
e4e327a
Add take, rotate, and shoot on cargo-ship to JoystickDemoCargo.
PhyXTGears-1720 Feb 28, 2019
2e46088
Tune CargoIntake setpoints.
PhyXTGears-1720 Feb 28, 2019
1d26ea0
Tune CargoIntake setpoints in config file for testbot.
PhyXTGears-1720 Feb 28, 2019
9a45bd8
Remove position prereq from ShootCargoForCargoShip.
PhyXTGears-1720 Feb 28, 2019
e0e7124
Add TakeCargo command. Include in JoystickDemoCargo.
PhyXTGears-1720 Feb 28, 2019
0b8b6fb
Merge pull request #45 from PhyXTGears-programming/feature/cargo-comm…
rsammelson Mar 1, 2019
c79a86e
Work on implementing button board
PhyXTGears-1720 Mar 1, 2019
60b24fc
Improve StopWatch.
PhyXTGears-1720 Feb 28, 2019
707ee4c
Add config file support to DriveTrain.
PhyXTGears-1720 Feb 28, 2019
4c3529e
Limit acceleration of drive train.
PhyXTGears-1720 Feb 28, 2019
004dc67
Stage code to offset the velocity step during turns.
PhyXTGears-1720 Feb 28, 2019
dd1c673
Add dashboard reporting for drive train acceleration limit.
PhyXTGears-1720 Mar 1, 2019
b54b92f
Add turn scaling factor and normal speed limit to config.
PhyXTGears-1720 Mar 1, 2019
efdef11
Copy missing config options from testbot to compbot.
PhyXTGears-1720 Mar 1, 2019
f262467
Merge pull request #47 from PhyXTGears-programming/feature/limit-acce…
boxofrox Mar 1, 2019
718f19f
Enable falling edge interrupt on piston limit sensor.
boxofrox Feb 27, 2019
cf719b9
Merge pull request #48 from PhyXTGears-programming/feature/digital-in…
boxofrox Mar 1, 2019
2cfa82d
Merge branch 'develop' into feature/implement-button-board
PhyXTGears-1720 Mar 1, 2019
52fe0f3
Add basic cheesecake controls to CargoIntake.
PhyXTGears-1720 Mar 1, 2019
4fe4513
Tune drive train settings.
PhyXTGears-1720 Mar 1, 2019
4c2a85c
Reverse hook setpoints to fix opposite behavior.
PhyXTGears-1720 Mar 1, 2019
d481d55
Tune PID for CreeperClimb.
PhyXTGears-1720 Mar 1, 2019
2874cfe
Merge pull request #49 from PhyXTGears-programming/feature/cheesecake…
boxofrox Mar 1, 2019
127a708
Merge pull request #50 from PhyXTGears-programming/feature/tuning
PhyXTGears-1720 Mar 1, 2019
a8c3b57
Add demo controls to manually move creeper arm.
PhyXTGears-1720 Mar 2, 2019
8eb3ca3
Merge pull request #51 from PhyXTGears-programming/feature/joystick-d…
PhyXTGears-1720 Mar 2, 2019
151f2b6
Add utility clamp function.
PhyXTGears-1720 Mar 2, 2019
4470c7c
Add joystick demo for intake hatch hooks.
PhyXTGears-1720 Mar 2, 2019
0d635b3
Tune hook positions for testbot and compbot.
PhyXTGears-1720 Mar 2, 2019
a3ba737
Merge pull request #52 from PhyXTGears-programming/feature/joystick-d…
boxofrox Mar 2, 2019
5d83b93
Update gradleRIO to 2019.4.1.
PhyXTGears-1720 Mar 2, 2019
171de2f
Merge pull request #53 from PhyXTGears-programming/feature/update-wpi
boxofrox Mar 2, 2019
0a87a54
Remove vim swp file.
PhyXTGears-1720 Mar 2, 2019
5faa1c3
Update hatch commands to use Mike's hook setpoints.
PhyXTGears-1720 Mar 2, 2019
dbd6e5e
Remove unused imports and clean up comments
PhyXTGears-1720 Mar 2, 2019
53d2837
Refactor GetCargoIntake into local var.
PhyXTGears-1720 Mar 2, 2019
92c5db7
Implement command ShootCargoForLevelOneRocket.
PhyXTGears-1720 Mar 2, 2019
b741a7d
Merge pull request #54 from PhyXTGears-programming/feature/update-com…
PhyXTGears-1720 Mar 2, 2019
81744d6
Merge branch 'develop' into feature/implement-button-board
PhyXTGears-1720 Mar 2, 2019
aca7841
Fix json null access fatal exception.
PhyXTGears-1720 Mar 2, 2019
40c23c6
Adjust intake home setpoint.
PhyXTGears-1720 Mar 2, 2019
4836e6d
Tune JSON variables for testbot
rsammelson Mar 3, 2019
7fe1d6d
Automate servo positions
rsammelson Mar 3, 2019
cdf169d
Add second camera
rsammelson Mar 3, 2019
89634d3
Reformat code.
PhyXTGears-1720 Mar 4, 2019
a2a15d5
Fix controls: take cargo from floor, not rotate hatch for floor.
PhyXTGears-1720 Mar 4, 2019
18ef382
Refactor getter calls into variable for operator console.
PhyXTGears-1720 Mar 4, 2019
01b9c57
Fix cargo shoot controls.
PhyXTGears-1720 Mar 4, 2019
984ee93
Separate console commands into related groups.
PhyXTGears-1720 Mar 4, 2019
fe07f7b
Add command StopCargoRoller.
PhyXTGears-1720 Mar 4, 2019
6a8d274
Add flighstick manual controls.
PhyXTGears-1720 Mar 4, 2019
1735d3a
Rename GetHatch-Pressed button commands to Is-Down.
PhyXTGears-1720 Mar 4, 2019
d821c26
Stage command TakeCargoFromDispenser.
PhyXTGears-1720 Mar 4, 2019
952dcb0
Use hatch console buttons to operator cheesecake hatch mechanism.
PhyXTGears-1720 Mar 4, 2019
e6f1f69
Update comments and remove debug prints.
PhyXTGears-1720 Mar 4, 2019
8668e03
Merge pull request #57 from PhyXTGears-programming/feature/implement-…
PhyXTGears-1720 Mar 4, 2019
b98829d
Merge pull request #56 from PhyXTGears-programming/feature/setup-testbot
boxofrox Mar 4, 2019
fff7e18
Fix ClimbStep
rsammelson Mar 3, 2019
afe931c
Fix manual controls
rsammelson Mar 3, 2019
baa1bd0
Add stubs for floor pickup
rsammelson Mar 3, 2019
dcc44bf
Make some formatting changes
rsammelson Mar 3, 2019
197a3e9
Add code to drive off step in sandstorm
rsammelson Mar 3, 2019
81b310a
Add speed controls for drive
rsammelson Mar 3, 2019
c019db7
Merge pull request #59 from PhyXTGears-programming/feature/other-fixes
boxofrox Mar 4, 2019
f1a8a98
Merge branch 'develop' into feature/drive-fixes
rsammelson Mar 4, 2019
c398ab0
Merge pull request #58 from PhyXTGears-programming/feature/drive-fixes
rsammelson Mar 4, 2019
4410a5c
Convert global variable into a member variable.
boxofrox Mar 4, 2019
3adb764
Remove useless code.
boxofrox Mar 4, 2019
bff86b2
Reset zero point for intake on testbot.
boxofrox Mar 5, 2019
cab9e75
Merge pull request #61 from PhyXTGears-programming/feature/house-keeping
boxofrox Mar 5, 2019
1325669
Clear commands out of scheduler when disabled.
boxofrox Mar 5, 2019
047abad
Require operator to hold buttons to move cheesecake hatch.
boxofrox Mar 5, 2019
477013f
Use std:: prefix for cout/endl print debugging.
boxofrox Mar 5, 2019
06ae765
Disable piston when resetting CreeperClimb.
boxofrox Mar 5, 2019
767f61b
Reduce cargo-ship roller speed to 80%.
boxofrox Mar 5, 2019
9149234
Increase creeper arm climb position.
boxofrox Mar 5, 2019
e8d0f2b
Refactor sandstorm command for hatch.
boxofrox Mar 5, 2019
ad08819
Add command DriveSandstormStepWithCargo.
boxofrox Mar 5, 2019
8615c0e
Add Makefile.
boxofrox Mar 5, 2019
593cc68
Merge pull request #62 from PhyXTGears-programming/feature/testing-20…
boxofrox Mar 5, 2019
e7d77a0
Implement command ShootCargoForLevelTwoRocket.
boxofrox Mar 6, 2019
288b865
Revert use of Scheduler.ResetAll.
boxofrox Mar 6, 2019
c201de6
Add camera switching to drive tream controls.
boxofrox Mar 6, 2019
af6e77c
Remove comments and consolidate copyrights.
boxofrox Mar 6, 2019
db03e54
Merge pull request #63 from PhyXTGears-programming/feature/testing-20…
boxofrox Mar 6, 2019
47d296d
Tune variable for compbot
PhyXTGears-1720 Mar 9, 2019
306ee11
Final Code for Friday Night
PhyXTGears-1720 Mar 9, 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
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Additional context**
Add any other context about the problem here.
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or screenshots about the feature request here.
50 changes: 50 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,55 @@
".classpath": true,
".project": true
},
"C_Cpp.intelliSenseEngineFallback": "Enabled",
"files.associations": {
"*.inc": "cpp",
"cmath": "cpp",
"cstdio": "cpp",
"array": "cpp",
"atomic": "cpp",
"*.tcc": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"condition_variable": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"exception": "cpp",
"fstream": "cpp",
"functional": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"ostream": "cpp",
"ratio": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"system_error": "cpp",
"thread": "cpp",
"type_traits": "cpp",
"tuple": "cpp",
"typeinfo": "cpp",
"utility": "cpp",
"hash_map": "cpp",
"hash_set": "cpp",
"unordered_set": "cpp"
},
"C_Cpp.default.configurationProvider": "vscode-wpilib"
}
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2019",
"teamNumber": 1721
"teamNumber": 1720
}
4 changes: 2 additions & 2 deletions CODESTYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Useful terms to understand while reading.
# C++
### General rules
* 4 Space indentation. Spaces, no tabs.
* Function declaration and definition has a space between the name and open parentheses.
* Example: `void Robot::RobotInit();` or
* Both the function declaration and definition do not have a space between the name and open parentheses.
* Example: `void Robot::RobotInit();` and
```cpp
void Robot::RobotInit() {
cout << "Hello World!" << endl;
Expand Down
30 changes: 30 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
The following copyright/license applies to any file that doesn't otherwise
contain its own copyright/license.

Copyright (c) 2019 Team 1720 PhyXTGears
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 changes: 29 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.PHONY: all build deploy
.ONESHELL:

TERM:=xterm-color

all: build


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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2019.2.1"
id "edu.wpi.first.GradleRIO" version "2019.4.1"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.
11 changes: 1 addition & 10 deletions src/main/cpp/OI.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/

#include "OI.h"

#include <frc/WPILib.h>

OI::OI() {
// Process operator interface input here.
}
OI::OI() {}
3 changes: 3 additions & 0 deletions src/main/cpp/OperatorHID.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "OperatorHID.h"

OperatorHID::OperatorHID() {}
Loading