Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Jan 9, 2013
  1. Stuff

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

    authored
    …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
  2. Global var updates

    authored
  3. Autonomous IR calibration

    authored
    Changed speed from 40 to 15.
  4. Updated header files

    authored
    to match the ones used by 6424.
  5. Added old versionn of driver file

    authored
    The autonomous code works only with the drivers that we had at the time
    of programming.
  6. Added autonomous code

    authored
    And fixed IR sensor config.
  7. Updated to match 6424's code

    authored
    Also adapted sensor/motor configs
Commits on Jan 7, 2013
  1. @shortenda

    Beginnings of Autonomous program

    shortenda authored
    Added code to initialize IR sensor
  2. @shortenda

    Sunday meeting 1/6/13

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

    authored
    Added code from 1/4/13
  2. @shortenda

    Added code from 1/4/13

    shortenda authored
    - 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.
  3. Merge pull request #47 from tarzandroid/master

    authored
    Minor updates (I think)
  4. Autonomous Calibration

    authored
Commits on Jan 4, 2013
  1. @tarzandroid

    Show different ways of controlling the motors. (1) LB,RB,LT,RT button…

    tarzandroid authored
    …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.
Commits on Dec 15, 2012
  1. Autonous Calibration 12/14/2012

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

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

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

    authored
    Development
  3. Added PID control code (preliminary, no looping)

    authored
    Isn't tuned yet either... Might not work at all. Shouldn't work.
  4. Updated to match IR-L

    authored
    The L/R isn't switched yet.
  5. Autonomous Claibration, Ramp Motor

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

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

    authored
    Do not end a line with a backslash!
  2. Added code for ramp motor

    authored
  3. Merge pull request #45 from Ernest314/development

    authored
    ASCII art by Kieran
  4. Merge pull request #44 from K-i-e-r-a-n/master

    authored
    Pull Request #1 (Test)
  5. @K-i-e-r-a-n

    Unfinished ASCII Art

    K-i-e-r-a-n authored
    Looks funny on the GitHub preview, but it looks fine on N++. Test
    Commit.
  6. @K-i-e-r-a-n

    Merge pull request #5 from Ernest314/development

    K-i-e-r-a-n authored
    Development
Something went wrong with that request. Please try again.