Permalink
Switch branches/tags
Nothing to show
Commits on Jan 9, 2013
  1. Merge pull request #50 from Ernest314/development

    Development
    committed Jan 9, 2013
  2. Stuff

    committed Jan 9, 2013
Commits on Jan 8, 2013
  1. Merge branch 'development' of https://github.com/shortenda/ftc-ohs in…

    …to shortenda-development
    
    Conflicts:
    	RobotC/6212/Autonomous Programs/Autonomous General.c
    	RobotC/6212/Header Files/global vars-6121.h
    	RobotC/6212/Tele-op Programs/Tele-op General.c
    committed Jan 8, 2013
  2. Global var updates

    committed Jan 8, 2013
  3. Added tele-op ramp down code

    committed Jan 8, 2013
  4. Autonomous IR calibration

    Changed speed from 40 to 15.
    committed Jan 8, 2013
  5. Updated header files

    to match the ones used by 6424.
    committed Jan 8, 2013
  6. Added old versionn of driver file

    The autonomous code works only with the drivers that we had at the time
    of programming.
    committed Jan 8, 2013
  7. Added autonomous code

    And fixed IR sensor config.
    committed Jan 8, 2013
  8. Updated to match 6424's code

    Also adapted sensor/motor configs
    committed Jan 8, 2013
Commits on Jan 7, 2013
  1. Beginnings of Autonomous program

    Added code to initialize IR sensor
    shortenda committed Jan 7, 2013
  2. Sunday meeting 1/6/13

    - Added refined movement and lifting
    - Included header files for autonomous IR sensor.
    shortenda committed Jan 7, 2013
Commits on Jan 5, 2013
  1. Merge pull request #48 from shortenda/development

    Added code from 1/4/13
    committed Jan 5, 2013
  2. Added code from 1/4/13

    - I suck at github
    -This is my third (err fourth) time writing this description T.T
    - Switched motor configuration
    - Added lift code
    - Changed some constant Ernest told me to.
    shortenda committed Jan 5, 2013
  3. Merge pull request #47 from tarzandroid/master

    Minor updates (I think)
    committed Jan 5, 2013
  4. Autonomous Calibration

    committed Jan 5, 2013
Commits on Jan 4, 2013
  1. Show different ways of controlling the motors. (1) LB,RB,LT,RT button…

    …s on the forefinger (2) tophat (3) left & right joysticks with logarithmic control.
    
    Using the joysticks seems the best since log control can be coded. Plus RB/LB button can be added for fine-tuning the speed.
    
    tophat can be used for the arm, to raise up & lower down. Tophat has no speed control.
    tarzandroid committed Jan 4, 2013
Commits on Dec 15, 2012
  1. Autonous Calibration 12/14/2012

    FINAL VALUES... ERNEST DO NOT CHANGE CODE
    committed Dec 15, 2012
Commits on Dec 14, 2012
  1. Autonomous Calibration

    Yeah.
    committed Dec 14, 2012
Commits on Dec 13, 2012
  1. Commented out unifinished PID Control

    Sorry Ernest, but your arrays in the subroutine LiftToHeight are causing
    compiler errors.
    committed Dec 13, 2012
  2. Merge pull request #46 from Ernest314/development

    Development
    committed Dec 13, 2012
  3. Added PID control code (preliminary, no looping)

    Isn't tuned yet either... Might not work at all. Shouldn't work.
    committed Dec 13, 2012
  4. Updated to match IR-L

    The L/R isn't switched yet.
    committed Dec 13, 2012
  5. Autonomous Claibration, Ramp Motor

    Auto now backs up to avoid the black wooden platform.
    START + START turns ramp motor and pulls pin.
    committed Dec 13, 2012
Commits on Dec 12, 2012
  1. Modified Autonomous

    It sort of works...
    committed Dec 12, 2012
Commits on Dec 11, 2012
  1. Fixed line continuation issues

    Do not end a line with a backslash!
    committed Dec 11, 2012
  2. Added code for ramp motor

    committed Dec 11, 2012
  3. Merge pull request #45 from Ernest314/development

    ASCII art by Kieran
    committed Dec 11, 2012
  4. Merge pull request #44 from K-i-e-r-a-n/master

    Pull Request #1 (Test)
    committed Dec 11, 2012
  5. Unfinished ASCII Art

    Looks funny on the GitHub preview, but it looks fine on N++. Test
    Commit.
    Renoh47 committed Dec 11, 2012
  6. Merge pull request #5 from Ernest314/development

    Development
    Renoh47 committed Dec 11, 2012