{"action":"created","comment":{"url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/comments/50783279","id":50783279,"diff_hunk":"@@ -8,26 +8,36 @@\n #ifndef SRC_ROBOTCONTROLLER_H_\n #define SRC_ROBOTCONTROLLER_H_\n \n-#include \"DriveStation.h\"\n #include \"BaseController.h\"\n+#include \"DriveStation.h\"\n+#include \"DriveTrainController.h\"\n+#include \"ShooterController.h\"\n+#include \"LoaderController.h\"\n+#include \"Action.h\"\n \n-class AutoController;\n-\n-class RobotController : public BaseController{\n-public:\n-   enum STATE{\n-      AUTO,\n-      MANUAL\n+class RobotController : public BaseController\n+{\n+ public:\n+   enum STATE {\n+      ROBOT_AUTO,\n+      ROBOT_MANUAL\n    };\n \n-   RobotController(DriveStation*, AutoController*);\n+   RobotController(DriveStation*, DriveTrainController*, ShooterController*, LoaderController*);\n    virtual ~RobotController();\n+\n    void run();\n-   DriveStation* getDriveStation(void);\n+   void addAction(ActionType, float = 0.0f, int = 0, float = 0.0f);\n+   void performAction(void);\n+ private:\n+   STATE m_state;","path":"src/RobotController.h","position":36,"original_position":36,"commit_id":"8244bc8ea45de67267d9ca80ca2bc8b9b463c931","original_commit_id":"8244bc8ea45de67267d9ca80ca2bc8b9b463c931","user":{"login":"willgebhardt","id":8922557,"avatar_url":"https://avatars.githubusercontent.com/u/8922557?v=3","gravatar_id":"","url":"https://api.github.com/users/willgebhardt","html_url":"https://github.com/willgebhardt","followers_url":"https://api.github.com/users/willgebhardt/followers","following_url":"https://api.github.com/users/willgebhardt/following{/other_user}","gists_url":"https://api.github.com/users/willgebhardt/gists{/gist_id}","starred_url":"https://api.github.com/users/willgebhardt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/willgebhardt/subscriptions","organizations_url":"https://api.github.com/users/willgebhardt/orgs","repos_url":"https://api.github.com/users/willgebhardt/repos","events_url":"https://api.github.com/users/willgebhardt/events{/privacy}","received_events_url":"https://api.github.com/users/willgebhardt/received_events","type":"User","site_admin":false},"body":"`STATE m_currentState`","created_at":"2016-01-26T01:05:20Z","updated_at":"2016-01-26T01:05:20Z","html_url":"https://github.com/FRCTeamPhoenix/Phoenix2016/pull/13#discussion_r50783279","pull_request_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13","_links":{"self":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/comments/50783279"},"html":{"href":"https://github.com/FRCTeamPhoenix/Phoenix2016/pull/13#discussion_r50783279"},"pull_request":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13"}}},"pull_request":{"url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13","id":57017543,"html_url":"https://github.com/FRCTeamPhoenix/Phoenix2016/pull/13","diff_url":"https://github.com/FRCTeamPhoenix/Phoenix2016/pull/13.diff","patch_url":"https://github.com/FRCTeamPhoenix/Phoenix2016/pull/13.patch","issue_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/13","number":13,"state":"open","locked":false,"title":"Consolidated AutoController and ManualController into the main RobotController.","user":{"login":"fvla","id":12602852,"avatar_url":"https://avatars.githubusercontent.com/u/12602852?v=3","gravatar_id":"","url":"https://api.github.com/users/fvla","html_url":"https://github.com/fvla","followers_url":"https://api.github.com/users/fvla/followers","following_url":"https://api.github.com/users/fvla/following{/other_user}","gists_url":"https://api.github.com/users/fvla/gists{/gist_id}","starred_url":"https://api.github.com/users/fvla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fvla/subscriptions","organizations_url":"https://api.github.com/users/fvla/orgs","repos_url":"https://api.github.com/users/fvla/repos","events_url":"https://api.github.com/users/fvla/events{/privacy}","received_events_url":"https://api.github.com/users/fvla/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-01-24T23:27:07Z","updated_at":"2016-01-26T01:05:20Z","closed_at":null,"merged_at":null,"merge_commit_sha":"940bec7510f39899ea3719fe8d16465059ad1174","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13/commits","review_comments_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13/comments","review_comment_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/comments{/number}","comments_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/13/comments","statuses_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/statuses/8244bc8ea45de67267d9ca80ca2bc8b9b463c931","head":{"label":"FRCTeamPhoenix:consolidate","ref":"consolidate","sha":"8244bc8ea45de67267d9ca80ca2bc8b9b463c931","user":{"login":"FRCTeamPhoenix","id":15622256,"avatar_url":"https://avatars.githubusercontent.com/u/15622256?v=3","gravatar_id":"","url":"https://api.github.com/users/FRCTeamPhoenix","html_url":"https://github.com/FRCTeamPhoenix","followers_url":"https://api.github.com/users/FRCTeamPhoenix/followers","following_url":"https://api.github.com/users/FRCTeamPhoenix/following{/other_user}","gists_url":"https://api.github.com/users/FRCTeamPhoenix/gists{/gist_id}","starred_url":"https://api.github.com/users/FRCTeamPhoenix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FRCTeamPhoenix/subscriptions","organizations_url":"https://api.github.com/users/FRCTeamPhoenix/orgs","repos_url":"https://api.github.com/users/FRCTeamPhoenix/repos","events_url":"https://api.github.com/users/FRCTeamPhoenix/events{/privacy}","received_events_url":"https://api.github.com/users/FRCTeamPhoenix/received_events","type":"Organization","site_admin":false},"repo":{"id":49537222,"name":"Phoenix2016","full_name":"FRCTeamPhoenix/Phoenix2016","owner":{"login":"FRCTeamPhoenix","id":15622256,"avatar_url":"https://avatars.githubusercontent.com/u/15622256?v=3","gravatar_id":"","url":"https://api.github.com/users/FRCTeamPhoenix","html_url":"https://github.com/FRCTeamPhoenix","followers_url":"https://api.github.com/users/FRCTeamPhoenix/followers","following_url":"https://api.github.com/users/FRCTeamPhoenix/following{/other_user}","gists_url":"https://api.github.com/users/FRCTeamPhoenix/gists{/gist_id}","starred_url":"https://api.github.com/users/FRCTeamPhoenix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FRCTeamPhoenix/subscriptions","organizations_url":"https://api.github.com/users/FRCTeamPhoenix/orgs","repos_url":"https://api.github.com/users/FRCTeamPhoenix/repos","events_url":"https://api.github.com/users/FRCTeamPhoenix/events{/privacy}","received_events_url":"https://api.github.com/users/FRCTeamPhoenix/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/FRCTeamPhoenix/Phoenix2016","description":"","fork":false,"url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016","forks_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/forks","keys_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/keys{/key_id}","collaborators_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/teams","hooks_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/hooks","issue_events_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/events{/number}","events_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/events","assignees_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/assignees{/user}","branches_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/branches{/branch}","tags_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/tags","blobs_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/refs{/sha}","trees_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/trees{/sha}","statuses_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/statuses/{sha}","languages_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/languages","stargazers_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/stargazers","contributors_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/contributors","subscribers_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/subscribers","subscription_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/subscription","commits_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/commits{/sha}","git_commits_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/commits{/sha}","comments_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/comments{/number}","issue_comment_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/comments{/number}","contents_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/contents/{+path}","compare_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/compare/{base}...{head}","merges_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/merges","archive_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/downloads","issues_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues{/number}","pulls_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls{/number}","milestones_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/milestones{/number}","notifications_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/labels{/name}","releases_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/releases{/id}","deployments_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/deployments","created_at":"2016-01-13T00:06:00Z","updated_at":"2016-01-23T00:22:30Z","pushed_at":"2016-01-26T00:22:10Z","git_url":"git://github.com/FRCTeamPhoenix/Phoenix2016.git","ssh_url":"git@github.com:FRCTeamPhoenix/Phoenix2016.git","clone_url":"https://github.com/FRCTeamPhoenix/Phoenix2016.git","svn_url":"https://github.com/FRCTeamPhoenix/Phoenix2016","homepage":null,"size":111,"stargazers_count":1,"watchers_count":1,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":2,"forks":0,"open_issues":2,"watchers":1,"default_branch":"master"}},"base":{"label":"FRCTeamPhoenix:master","ref":"master","sha":"f9684e1715816a513e712a69f2f8db4d939ca156","user":{"login":"FRCTeamPhoenix","id":15622256,"avatar_url":"https://avatars.githubusercontent.com/u/15622256?v=3","gravatar_id":"","url":"https://api.github.com/users/FRCTeamPhoenix","html_url":"https://github.com/FRCTeamPhoenix","followers_url":"https://api.github.com/users/FRCTeamPhoenix/followers","following_url":"https://api.github.com/users/FRCTeamPhoenix/following{/other_user}","gists_url":"https://api.github.com/users/FRCTeamPhoenix/gists{/gist_id}","starred_url":"https://api.github.com/users/FRCTeamPhoenix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FRCTeamPhoenix/subscriptions","organizations_url":"https://api.github.com/users/FRCTeamPhoenix/orgs","repos_url":"https://api.github.com/users/FRCTeamPhoenix/repos","events_url":"https://api.github.com/users/FRCTeamPhoenix/events{/privacy}","received_events_url":"https://api.github.com/users/FRCTeamPhoenix/received_events","type":"Organization","site_admin":false},"repo":{"id":49537222,"name":"Phoenix2016","full_name":"FRCTeamPhoenix/Phoenix2016","owner":{"login":"FRCTeamPhoenix","id":15622256,"avatar_url":"https://avatars.githubusercontent.com/u/15622256?v=3","gravatar_id":"","url":"https://api.github.com/users/FRCTeamPhoenix","html_url":"https://github.com/FRCTeamPhoenix","followers_url":"https://api.github.com/users/FRCTeamPhoenix/followers","following_url":"https://api.github.com/users/FRCTeamPhoenix/following{/other_user}","gists_url":"https://api.github.com/users/FRCTeamPhoenix/gists{/gist_id}","starred_url":"https://api.github.com/users/FRCTeamPhoenix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/FRCTeamPhoenix/subscriptions","organizations_url":"https://api.github.com/users/FRCTeamPhoenix/orgs","repos_url":"https://api.github.com/users/FRCTeamPhoenix/repos","events_url":"https://api.github.com/users/FRCTeamPhoenix/events{/privacy}","received_events_url":"https://api.github.com/users/FRCTeamPhoenix/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/FRCTeamPhoenix/Phoenix2016","description":"","fork":false,"url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016","forks_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/forks","keys_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/keys{/key_id}","collaborators_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/teams","hooks_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/hooks","issue_events_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/events{/number}","events_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/events","assignees_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/assignees{/user}","branches_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/branches{/branch}","tags_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/tags","blobs_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/refs{/sha}","trees_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/trees{/sha}","statuses_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/statuses/{sha}","languages_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/languages","stargazers_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/stargazers","contributors_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/contributors","subscribers_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/subscribers","subscription_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/subscription","commits_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/commits{/sha}","git_commits_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/git/commits{/sha}","comments_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/comments{/number}","issue_comment_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/comments{/number}","contents_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/contents/{+path}","compare_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/compare/{base}...{head}","merges_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/merges","archive_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/downloads","issues_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues{/number}","pulls_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls{/number}","milestones_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/milestones{/number}","notifications_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/labels{/name}","releases_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/releases{/id}","deployments_url":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/deployments","created_at":"2016-01-13T00:06:00Z","updated_at":"2016-01-23T00:22:30Z","pushed_at":"2016-01-26T00:22:10Z","git_url":"git://github.com/FRCTeamPhoenix/Phoenix2016.git","ssh_url":"git@github.com:FRCTeamPhoenix/Phoenix2016.git","clone_url":"https://github.com/FRCTeamPhoenix/Phoenix2016.git","svn_url":"https://github.com/FRCTeamPhoenix/Phoenix2016","homepage":null,"size":111,"stargazers_count":1,"watchers_count":1,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":2,"forks":0,"open_issues":2,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13"},"html":{"href":"https://github.com/FRCTeamPhoenix/Phoenix2016/pull/13"},"issue":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/13"},"comments":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/issues/13/comments"},"review_comments":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13/comments"},"review_comment":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/pulls/13/commits"},"statuses":{"href":"https://api.github.com/repos/FRCTeamPhoenix/Phoenix2016/statuses/8244bc8ea45de67267d9ca80ca2bc8b9b463c931"}}}}