2
0
mirror of https://github.com/team2059/Zaphod synced 2024-12-18 20:12:28 -05:00
Commit Graph

93 Commits

Author SHA1 Message Date
02862ff099 Added the most recent version of the code. Also split the code into two folders, one of which has the .out 2014-05-04 10:15:42 -04:00
19c4b2a45d Removed python folder from master 2014-04-08 17:15:31 -04:00
b72e5261cf updated the main.py and started work on a drive.py with a drive class that will take the joystick input and power the motors 2014-04-06 16:57:09 -04:00
5a002751f5 Added the main python libraries needed for robotpy (they're submodules) 2014-04-06 12:47:18 -07:00
3668bf318d Fixed half speed in auto and in teleop (Untested) 2014-04-04 20:29:38 -04:00
087604037e Merge branch 'master' of 76.182.74.61:hitchhikers/MyRobot
it's mergin for no reason!
2014-04-04 20:26:14 -04:00
15f7871295 updateJoystick should return an int, not a bool 2014-04-04 15:07:15 -07:00
46865ab478 Merge branch 'master' of 76.182.74.61:hitchhikers/MyRobot 2014-04-03 22:01:36 -04:00
aae3cecd1f Formatted potToDegrees 2014-04-03 22:00:28 -04:00
11d08a0b26 Changed the updateJoystick function to work without an if statement by passing the joystick itself. Also, two arrays are created. array[x] where 'x' is the number of the button. 2014-04-03 16:33:22 -07:00
b4cdfa8c5f Changed the fold formatting on line 266 2014-04-03 16:03:28 -07:00
a5a4891649 Added a joystick update function for later use when implementing multiple joystick support (different models of joysticks) 2014-04-03 14:17:28 -07:00
7d276da7a9 Added a safety check for collecting the ball. Checks that the shooter arm is down before allowing the motor to be spun forwards. 2014-04-03 13:58:02 -07:00
69ded3ddad Merge branch 'master' of 76.182.74.61:hitchhikers/MyRobot 2014-04-03 15:25:01 -04:00
4ff23a17d9 Updated the save.xml (removed some unused keys and the second connection indicator 2014-04-03 15:24:45 -04:00
eef71313f0 Made runCompressor clearer 2014-04-03 15:13:42 -04:00
5653ed54eb fixed another missed brace 2014-04-02 17:00:46 -07:00
8303b79850 Reverted to the old pot conversion code that worked (may or may not be the issue currently) 2014-04-02 16:42:21 -07:00
396e18c1c4 Removed the old pot code 2014-04-02 16:39:19 -07:00
6e7f2435ab Preparing for merge to use old pot code 2014-04-02 16:37:26 -07:00
2bcb00fc74 changed runCompressor to 'void' 2014-04-02 15:17:28 -07:00
42f6e9e4e4 Forgot to make the compressor actually RUN 2014-04-02 14:45:42 -07:00
f046de3f93 Fixed the almost broken spike 2014-04-02 14:44:42 -07:00
0e7d44531b Added a function to check the compressor state and value at a given time interval (allows for a input timer so it works in both auto and tele(kinda the point of it)) 2014-04-02 10:55:12 -07:00
5184252863 Fixed shooting 2014-03-31 22:41:42 -04:00
ab224b71f5 Formatted code and started work on Test function 2014-03-31 22:40:15 -04:00
554d8f7c9f Merged the old code and the new to test the features 2014-03-31 17:28:08 -07:00
a461330371 Removed the switch for a small period of time 2014-03-31 17:21:18 -07:00
c1babe139a Added a half power switch that disables auto and moves robot at half power 2014-03-31 15:06:14 -04:00
13a1d2d6c6 Formatted code 2014-03-27 22:55:34 -04:00
4fe2261a99 Tried to clean up potToDegrees. Untested. 2014-03-27 19:28:57 -04:00
31f938a8fb Removed autoSeq and replaced it with the raw dashboard value 2014-03-24 21:37:00 -04:00
5030b06c38 Changed the auto sequencing to a switch-case instead of a bunch of if statements 2014-03-22 20:00:36 -04:00
3fa5c4bcc0 Removed unused variables (multiplier) and cleaned up the variable-declaration area of the code 2014-03-19 18:39:15 -04:00
88a51913b7 Changed the inital value of throttle to be the value of axis 4(the physical pot) 2014-03-16 19:13:54 -04:00
1dabf27c02 Changed .45 to .46 in master rather than autoValues 2014-03-15 15:43:47 -04:00
83af1ea555 Removed consoleapplication2.cpp (unused) 2014-03-15 08:02:20 -04:00
8e343c7840 Changed AutoPower to .45 from .46 2014-03-15 07:57:38 -04:00
fa6fa5684f Merged the AutoValues branch and the master branch together and fixed the conflicts 2014-03-15 07:56:01 -04:00
51896fc1e3 Updated values again 2014-03-14 16:28:20 -04:00
7afb0a99fb Removed dan's joystick, added auto speed 2014-03-14 14:53:48 -04:00
f447ab6ee3 Changed values from tag stable. 2014-03-14 14:47:10 -04:00
26881dc386 Changed the autodistance BACK to 65, the change was not correct 2014-03-14 08:14:45 -04:00
3a07331e5b Stable, working code as of 3/14 at 8:07am 2014-03-14 08:09:06 -04:00
d258a8b6f8 Changed default autodistance from 65 to 67 for keegan 2014-03-14 08:05:54 -04:00
b530b243a1 Working code finally 2014-03-13 13:14:46 -07:00
bf8c4b7e37 Merge branch 'AutoJoystick' 2014-03-13 18:32:30 -07:00
7f3687aafa Robot has working master code 2014-03-13 18:31:51 -07:00
bf44c95b23 Revert "Committed after first practice match. We now have a working Auto sequence 2"
This reverts commit 30dfdd0f22a7207baffade6f124fbeefc8bd58e6.
2014-03-13 18:24:42 -07:00
232cb67950 Changed shooting code 2014-03-13 18:19:42 -07:00