john sandstedt
|
fb8087f6f5
|
logging code might have been merged with master
|
2016-02-26 16:20:37 -05:00 |
|
john sandstedt
|
efbe261750
|
potato... also maybe fixed driverstation::GetInstance() again potentially
|
2016-02-22 19:13:09 -05:00 |
|
john sandstedt
|
420a5723a7
|
logging code... fixed the error initializing the DriverStation Object potentially, and fixed a few of the syntax errors
'
|
2016-02-22 19:04:27 -05:00 |
|
Jason Cox
|
d61fdffc3d
|
More Tweaking
|
2016-02-20 18:32:40 -05:00 |
|
Jason Cox
|
1e9af3ce6d
|
Tweaking pickup
|
2016-02-20 18:15:28 -05:00 |
|
dkbug
|
ae402ff1ce
|
invert the driving
|
2016-02-20 17:12:23 -05:00 |
|
dkbug
|
868f9f0a27
|
fixed some git conflicts
|
2016-02-20 17:01:51 -05:00 |
|
dkbug
|
2bb3baeb05
|
Merge branch 'arms'
# Conflicts:
# Robot2016/src/Robot.cpp
# Robot2016/src/Shooter.h
|
2016-02-20 16:56:51 -05:00 |
|
dkbug
|
6caf8c0965
|
make ramp more sensitive.
|
2016-02-20 16:53:38 -05:00 |
|
Jason Cox
|
d9142146dc
|
Merged
|
2016-02-20 16:48:00 -05:00 |
|
john sandstedt
|
4eb4ccb188
|
adam style csv logging code
|
2016-02-20 15:22:53 -05:00 |
|
Aidan Ferguson
|
a786907f72
|
-launch_spinny
+ramp
|
2016-02-20 15:14:51 -05:00 |
|
john sandstedt
|
4755bf7c46
|
added ramp status to the smartdashboard
|
2016-02-20 14:27:43 -05:00 |
|
Aidan Ferguson
|
a983987fa2
|
Spelling is the foundation upon which our society stands.
|
2016-02-20 13:30:42 -05:00 |
|
Aidan Ferguson
|
11d90f4557
|
debug code to tell what the H-E-double-hockey-sticks the int the encoder returns is doing.
|
2016-02-20 13:28:56 -05:00 |
|
Jason Cox
|
91e91369b8
|
Sane code for the Demo
|
2016-02-19 15:48:18 -05:00 |
|
Aidan Ferguson
|
deb31d3f0a
|
Merge branch 'shooter'
|
2016-02-15 20:15:07 -05:00 |
|
Aidan Ferguson
|
1b681a3610
|
fixed a typo
|
2016-02-15 20:14:48 -05:00 |
|
Aidan Ferguson
|
5bbbf1717e
|
Finished shooter switch.
|
2016-02-15 15:14:20 -05:00 |
|
Jason Cox
|
86e6a1b33c
|
Merge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms
|
2016-02-13 17:17:56 -05:00 |
|
Jason Cox
|
57fb961f22
|
Code for moving arms... boring
|
2016-02-13 16:47:57 -05:00 |
|
Aidan Ferguson
|
38eb49a964
|
removed a redundant if statement because I'm a doofus.
|
2016-02-13 16:46:09 -05:00 |
|
Jason Cox
|
bf184ca305
|
Initial Arm stuff
|
2016-02-13 16:44:57 -05:00 |
|
Aidan Ferguson
|
e6934c9117
|
enum ShooterState, starts of associated switch, etc.
|
2016-02-13 16:40:07 -05:00 |
|
Jason Cox
|
71e2ec4eba
|
removed old debug statements
|
2016-02-13 12:09:08 -05:00 |
|
Jason Cox
|
c3a621a5c4
|
some more bug fixes.
|
2016-02-13 12:00:28 -05:00 |
|
Jason Cox
|
eccd90ea8a
|
Now has Sane pickup logic~
|
2016-02-13 11:26:07 -05:00 |
|
Jason Cox
|
2ad0f975b3
|
Fixed some really bad logic in the shooter...
|
2016-02-13 11:12:20 -05:00 |
|
Jason Cox
|
99d2397f9b
|
Fixed a bunch of logic errors.
|
2016-02-12 21:17:45 -05:00 |
|
Jason Cox
|
deef7fcf20
|
ramp reinstated
|
2016-02-12 19:37:36 -05:00 |
|
Jason
|
3c3d14f01b
|
added SPINUP_TIME define for the shotClock Timer. Adjust the value of this define to wait longer before shooting the ball into the launch wheel.
:
|
2016-02-11 22:26:11 -05:00 |
|
Jason
|
5211275da5
|
Added comments and info for the shooter logic. I emailed you a flow chart also...
|
2016-02-11 21:24:32 -05:00 |
|
Jason
|
b4bbdf092b
|
Added a define for DEADZONE_RADIUS and implemented it in the shooter power setting within TeleopPeriodic.
|
2016-02-11 20:48:03 -05:00 |
|
Jason
|
a51cdfcb07
|
Added comments about the use of the boolean variables in the TeleopPeriodic method
|
2016-02-11 20:40:41 -05:00 |
|
Aidan Ferguson
|
7b6b6f3397
|
launch spinny does stuff
|
2016-02-11 17:17:42 -05:00 |
|
Aidan Ferguson
|
8c91ac34db
|
purged the concept of a ramp
|
2016-02-11 16:51:13 -05:00 |
|
Aidan Ferguson
|
0fdb206098
|
Swapped Talon objects for TalonSRX objects.
|
2016-02-11 16:35:41 -05:00 |
|
Aidan Ferguson
|
21f26a8907
|
Merge branch 'shooter' of code.dublinschool.org:repos/FRC/FRC2016 into shooter
|
2016-02-11 16:20:17 -05:00 |
|
Aidan Ferguson
|
eee7649da7
|
Made shooter_power private instead of global because that actually makes sense.
|
2016-02-11 16:18:58 -05:00 |
|
Dieter Brehm
|
99fb8c19e6
|
Changed todo to reflect lack of ramp.
|
2016-02-10 21:24:35 -05:00 |
|
Aidan Ferguson
|
35cd776a48
|
more of LogData(). still not done, but I'm tired.
|
2016-02-10 21:19:18 -05:00 |
|
Aidan Ferguson
|
3be566a2be
|
Lots of includes (for real this time) and a LogData() embryo
|
2016-02-10 20:43:45 -05:00 |
|
Aidan Ferguson
|
9ae56635ce
|
Lots of includes and a LogData() embryo
|
2016-02-10 20:43:09 -05:00 |
|
Aidan Ferguson
|
ffb9d1a637
|
fixed meaningless conflicts because I totally know how to manage my time.
|
2016-02-10 20:17:55 -05:00 |
|
Aidan Ferguson
|
2534f700f1
|
raised PICKUP_POWER to 0.8
|
2016-02-10 20:13:33 -05:00 |
|
Aidan Ferguson
|
c36024a86d
|
placeholder for encoder code in Shooter.h
|
2016-02-10 19:55:20 -05:00 |
|
Aidan Ferguson
|
fbae5efebf
|
Switched the shooter controller addresses to reflect reality.
|
2016-02-10 19:11:51 -05:00 |
|
Aidan Ferguson
|
a8642a87d9
|
Made sure shooter power from the throttle will only be used when the throttle is moved. Probably.
|
2016-02-10 18:56:38 -05:00 |
|
Aidan Ferguson
|
470a4b6f4b
|
impotent debug code!
|
2016-02-10 15:23:07 -05:00 |
|
Aidan Ferguson
|
b4d5ead23a
|
bugfix, debug code for encoder.
|
2016-02-10 14:56:58 -05:00 |
|