Skip to content

0.3 merging branch #43

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.

Sign up for GitHub

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

Jump to bottom
Open
jackhymowitz wants to merge 75 commits into
base: 0.3-merging-branch
Choose a base branch
from
Open

0.3 merging branch #43

jackhymowitz wants to merge 75 commits into from

Conversation

@jackhymowitz
Copy link
Collaborator

@jackhymowitz jackhymowitz commented May 11, 2017

No description provided.

jackhymowitz and others added 30 commits April 15, 2017 13:41
@jackhymowitz
Everyone dies alone.
6bde9b0
@jackhymowitz
If you are 17, 20% of your life is already gone.
1eb97f8
@jackhymowitz
Began removing WPI interactions into their own package
1f15585 
Music recordings have been invented closer to the civil war than today
@jackhymowitz
The commit which will make Rafi kill me. WIP; SprocketRobot next
034162f
@jackhymowitz
Began reimplementing FRC code in the right spot, and fiddling with th…
d368b85 
…e encoders
@jackhymowitz
States are now actions as well
26ab19c
@jackhymowitz
I like these names better, but it doesnt matter
1a99209
Not near done; need to work out inheritances and class/interfaces for…
f640d91 
… SprocketRobot and FRCRobot. Want to be able to define stuff in SprocketRobot and have FRCRobot extend it, yet FRCRobot has to extend IterativeRobot. Very tricky Robot.
Working on auto
052fcbc
Auto Betterer
d182761
Auto Tweak
dcde855
Time for a new feature!
f25b3df
@jackhymowitz
Merge remote-tracking branch 'origin/master' into 0.3
c3c82b4 
# Conflicts:
#	src/org/montclairrobotics/sprocket/control/FieldCentricDriveInput.java
@jackhymowitz
Move Action
098b143
@jackhymowitz
Sourcetree crashed so I lost a few commits, so this is big. It has mo…
09ea005 
…re moves of files, some new documentation, and (finally) an elegant way of auto mode selection has been started.
@jackhymowitz
Bye
8e9ce6d
@jackhymowitz
Hi
0d2b087
@jackhymowitz
NO!
5f2e6fc
@jackhymowitz
More actions
abb4376
@jackhymowitz
SprocketRobot Renames
53fd05d
@jackhymowitz
This might just be the best class I have made yet.
ff390aa
@jackhymowitz
Get and Set
6fb9d6c
@jackhymowitz
Added api.getMyZRState(Array[12])
20b28fd
@jackhymowitz
I forgot what I did but here is a commit I think
b678639
@jackhymowitz
I don't know, I think I did something I guess. Maybe.
6bb7645
@jackhymowitz
Imports!
78b7269
@jackhymowitz
We dont even have to do this stupid thing anymore!
101f794
@jackhymowitz
Revert "We dont even have to do this stupid thing anymore!"
455eb2c 
This reverts commit 101f794.
@jackhymowitz
Now we use it.
b507854
@jackhymowitz
And consolidating some classes to make less things on the left
181a483
jackhymowitz and others added 30 commits September 15, 2017 17:27
@jackhymowitz
Java 7 compliant for Android Studio
9b113d9
@jackhymowitz
UniversalMapper created; should work for symmetric drivetrains, inclu…
1526b21 
…ding mecanum,
@jackhymowitz
Power (translation and turn) now a double from -1 to 1, for consisten…
f9e4c91 
…cy, usability, and performance
@jackhymowitz
Implement another method of registering modes, where auto modes exten…
89d979c 
…d the teleop mode.
@jackhymowitz
Added @OverRide annotations to FTCRobot
c14cb74
@jackhymowitz
Little cleanup to remove all of FRC from Sprocket
78a9616
@jackhymowitz
Added a Test package to complement the FRC and FTC packages, to enabl…
d3b4289 
…e testing of basic functionality on a computer rather than on a robot. This can be expanded in the future, eventually simulating part or all of the robot's functions.
@jackhymowitz
Added a test bot, and actually used it to fix a bug (!!!wow!!11!!)
822f175
@jackhymowitz
Fixing some inheritance
75ef950
@jackhymowitz
Small bugfix; a variable was being overwritten when it shouldn't have…
0d4b100 
… been. Also; SPROCKET RUNS ON FTC!!!
@jackhymowitz
One small infinite loop actually when it is disabled; now it should b…
8024eb3 
…e good.
@jackhymowitz
Added run to position methods to FTCMotor
026fecc
@GarrettBurroughs
Fixed NPE in FTCMotor
80d0911
@jackhymowitz
Auto modes will not work the way they were coded; this idea should wo…
3e88e4a 
…rk. I am using the online editor, so this might not be the exact syntax.
@rafibaum
Fixed a typo with the robot mode
042e47c
@GarrettBurroughs
Added 'isCloseTo' methods for FTCMotor
c7cf37a
@rafibaum
Updated DriveTrainBuilder for 0.3
329f219
@GarrettBurroughs
Merge branch '0.3' of https://github.com/MontclairRobotics/Sprocket i…
c7b056b 
…nto 0.3

Did stuff
@rafibaum
Created my own generic mapper for fun!
aa0038d
@rafibaum
Added code to handle motors of different powers
396f1d9
@rafibaum
Motor force needed to be normalised for previous commit.
0c8b8fe
@rafibaum
Added a torque correction for wheels with different offsets
b26cc9c
@rafibaum
Mecanum mapper that should work
7c16e38
@rafibaum
Added scaling
3bf4c81
@rafibaum
Added comments and fixed a bug with scaling
8b54079
@jackhymowitz
Redid input system, and simplified UniversalMapper. Right now, turnin…
171d50f 
…g is acting weird.
@jackhymowitz
Mecanum Driving! Using Universal Drivetrain.
8dbf1e5
@jackhymowitz
Added some easier init methods
ad3daf0
@GarrettBurroughs
bad commit
3c3c0c9
@GarrettBurroughs
Merge pull request #46 from rafibaum/rafi-mapper
3c0e1bc 
Generic Mapper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jackhymowitz @GarrettBurroughs @rafibaum