Skip to content
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.

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

Dev #8

Open
wants to merge 84 commits into
base: Climber-Maaz
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
989df43
accounted for the other cansparks for drivetrain
jyin2 Feb 8, 2020
0dd433a
changed a drivetrian command and checked if ids for cansparkmaxs are …
jyin2 Feb 8, 2020
ad6ecfa
made a lot of changes
jyin2 Feb 11, 2020
5ef29a3
added alternate encoder methods
jyin2 Feb 11, 2020
51eb20e
added in alternate encoder
jyin2 Feb 11, 2020
4b87978
Changing and testing things in Drivetrain
fidgetspinnerkid Feb 11, 2020
4c68e64
changed cpr for the encoders
fidgetspinnerkid Feb 12, 2020
e1a9ced
changed test values
fidgetspinnerkid Feb 16, 2020
a3602d9
deleted unnecessary commands
fidgetspinnerkid Feb 18, 2020
16386eb
Uh oH
franciscotimoh Feb 18, 2020
a50ba83
made new changes for compressor
fidgetspinnerkid Feb 18, 2020
12f892a
Merge branch 'dev' into Drivetrain-test
fidgetspinnerkid Feb 18, 2020
21500e5
Merge pull request #5 from Team2791/Drivetrain-test
fidgetspinnerkid Feb 18, 2020
b5c2897
changed shooter command groups
fidgetspinnerkid Feb 19, 2020
78d9dcf
changed hopper to two outputs
fidgetspinnerkid Feb 19, 2020
e2b0bce
Saturday Changes
fidgetspinnerkid Feb 24, 2020
fd109b8
Panel Mech
fidgetspinnerkid Feb 24, 2020
52a3cc5
cleaned up code
jyin2 Feb 25, 2020
142f447
finished cleaning code
jyin2 Feb 25, 2020
0a3a015
added in contral panel constants and ids
jyin2 Feb 25, 2020
ea96ff8
Merge branch 'Climber-Maaz' into dev
Maaz-H Feb 25, 2020
d52d55b
Adds Shooter PID Subsystem
frcteam2791 Feb 25, 2020
fabf11a
Added Camera Switching
frcteam2791 Feb 25, 2020
75062f8
reorganized a couple things
jyin2 Feb 26, 2020
e95f6cd
reorganized stuff
jyin2 Feb 26, 2020
b31c896
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Feb 26, 2020
f249020
merged climb
frcteam2791 Feb 26, 2020
d51972a
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Feb 26, 2020
71bebe2
Climber code
frcteam2791 Feb 27, 2020
5faf552
Shooter PID & hopper tuning from the tech park with Justin (Friday ni…
frcteam2791 Feb 29, 2020
6d10d57
Close trench shot and wall shot tuned
frcteam2791 Feb 29, 2020
654fe91
End of saturday at tech park
frcteam2791 Feb 29, 2020
e9f92c8
Added Two Cameras
frcteam2791 Mar 1, 2020
7883ec6
Tuned intake/hopper speeds and PID for wall shot
frcteam2791 Mar 1, 2020
ae61597
Reduced buttons (added commands)
frcteam2791 Mar 1, 2020
311c915
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 1, 2020
e678663
added some extend methods and timer
allison-kunin Mar 1, 2020
b7bef51
changed setPanelMech so it works hopefully
allison-kunin Mar 1, 2020
8f1a354
changed set panel mech and put it in oi
allison-kunin Mar 1, 2020
f209104
cleaned up commands and folders a little
allison-kunin Mar 2, 2020
c639233
used timer for hopper pistons
allison-kunin Mar 2, 2020
2520d18
changed command groups
allison-kunin Mar 2, 2020
9da3d1d
Added Shooter Sequences
frcteam2791 Mar 2, 2020
fcbdb53
Added Merged Commands Tested at Tech Park Monday
frcteam2791 Mar 2, 2020
4bfb637
Test commands for driving
franciscotimoh Mar 2, 2020
ceb0c9f
Hopper Stoppers added to Intake/Hopper Button
franciscotimoh Mar 2, 2020
2b2b98f
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
franciscotimoh Mar 2, 2020
0e738cb
changed setpanelmech() to a toggle kind of
frcteam2791 Mar 2, 2020
d15f5ec
Tech Park Tuning
frcteam2791 Mar 3, 2020
253bd59
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 3, 2020
0e180eb
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 3, 2020
60751b5
changed panel mech button in oi
frcteam2791 Mar 3, 2020
62912b8
Added Hopper Counter and Jam commands
xprt656 Mar 3, 2020
42a7a95
changed set panel mech command and changed it in oi
frcteam2791 Mar 3, 2020
07cba74
Added Camera Switch to Pit Controller
frcteam2791 Mar 3, 2020
994781c
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 3, 2020
9c9330a
Changed Pit Camera Buttons to not Conflict
frcteam2791 Mar 3, 2020
2910c4a
added limit switch
frcteam2791 Mar 4, 2020
078f197
Fixed hooper/intake
frcteam2791 Mar 4, 2020
b179a69
laptop swap push
frcteam2791 Mar 4, 2020
7ee5482
Updated Constants
frcteam2791 Mar 5, 2020
1eb82a2
cleaned up some small stuff
chrisLane279 Mar 5, 2020
62fbea2
Updated shooter and hopper speeds.
frcteam2791 Mar 6, 2020
65e9b3e
Drivetrain Pid Controller
xprt656 Mar 6, 2020
5c81abd
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
xprt656 Mar 6, 2020
b47d6f5
Update CameraSwitch.java
chrisLane279 Mar 6, 2020
49f8822
Tech Park Update + Control Panel
frcteam2791 Mar 7, 2020
671b435
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 7, 2020
479439a
Added Reverse Intake and Hopper
frcteam2791 Mar 7, 2020
dbe19e5
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 7, 2020
8bd9bbf
Allisons changes
frcteam2791 Mar 8, 2020
c11244d
Limelight and SmartDashboard Layouts
frcteam2791 Mar 8, 2020
d05be2b
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 8, 2020
f9005d2
Second Beam Break Hopper
frcteam2791 Mar 8, 2020
556485f
Merge branch 'dev' of https://github.com/Team2791/Robot2020 into dev
frcteam2791 Mar 8, 2020
bdbb223
Messed With 2 beam and tempoprarily reverted to 1 beam
frcteam2791 Mar 8, 2020
f471dc8
Fixed PID
frcteam2791 Mar 8, 2020
0ce8b2c
made an auto method in drivetrain
frcteam2791 Mar 10, 2020
f33384e
Added Double Ir Hopper Code and Maybe the fifth ball
xprt656 Mar 10, 2020
011313c
Fixed Double Beam Break Hopper to use Two Sensors
xprt656 Mar 10, 2020
cf4f93b
Added another autonomus (I used math)
chrisLane279 Mar 11, 2020
b8fb482
Stopped auto timer in teleop init
chrisLane279 Mar 11, 2020
75c577c
Added comments for auto placement in pits
chrisLane279 Mar 11, 2020
526e028
removed a ton of unused imports
chrisLane279 Mar 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions Limelight Pipelines/GoodTPMORNINGMARCH7 (1).vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
area_max:0.5393580481000001
area_min:0.2097273616
area_similarity:66
aspect_max:20
aspect_min:0.0000010124999999999998
black_level:1
blue_balance:1536
calibration_type:0
contour_grouping:0
contour_sort_final:6
convexity_max:64.5
convexity_min:23.1
corner_approx:2
cross_a_a:1
cross_a_x:0
cross_a_y:0
cross_b_a:1
cross_b_x:0
cross_b_y:0
desc:GoodTPMORNINGMARCH7
desired_contour_region:0
dilation_steps:1
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:10
force_convex:1
hue_max:144
hue_min:58
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:500
roi_x:0
roi_y:0
sat_max:255
sat_min:100
send_corners:0
send_raw_contours:0
solve3d:0
solve3d_algo:0
solve3d_bindtarget:1
solve3d_conf:0.990000
solve3d_error:8
solve3d_guess:0
solve3d_iterations:50
solve3d_precies:1
solve3d_precise:0
solve3d_zoffset:0
val_max:254
val_min:132
y_max:1.000000
y_min:-1.000000
58 changes: 58 additions & 0 deletions Limelight Pipelines/GoodTPMORNINGMARCH7 (2).vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
area_max:0.5393580481000001
area_min:0.2097273616
area_similarity:66
aspect_max:20
aspect_min:0.0000010124999999999998
black_level:1
blue_balance:1536
calibration_type:0
contour_grouping:0
contour_sort_final:6
convexity_max:64.5
convexity_min:23.1
corner_approx:2
cross_a_a:1
cross_a_x:0
cross_a_y:0
cross_b_a:1
cross_b_x:0
cross_b_y:0
desc:GoodTPMORNINGMARCH7
desired_contour_region:0
dilation_steps:1
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:8
force_convex:1
hue_max:144
hue_min:58
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:500
roi_x:0
roi_y:0
sat_max:255
sat_min:100
send_corners:0
send_raw_contours:0
solve3d:0
solve3d_algo:0
solve3d_bindtarget:1
solve3d_conf:0.990000
solve3d_error:8
solve3d_guess:0
solve3d_iterations:50
solve3d_precies:1
solve3d_precise:0
solve3d_zoffset:0
val_max:254
val_min:132
y_max:1.000000
y_min:-1.000000
58 changes: 58 additions & 0 deletions Limelight Pipelines/GoodTPMORNINGMARCH7 (3).vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
area_max:0.5393580481000001
area_min:0.2097273616
area_similarity:66
aspect_max:20
aspect_min:0.0000010124999999999998
black_level:1
blue_balance:1536
calibration_type:0
contour_grouping:0
contour_sort_final:6
convexity_max:64.5
convexity_min:23.1
corner_approx:2
cross_a_a:1
cross_a_x:0
cross_a_y:0
cross_b_a:1
cross_b_x:0
cross_b_y:0
desc:GoodTPMORNINGMARCH7
desired_contour_region:0
dilation_steps:1
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:6
force_convex:1
hue_max:144
hue_min:58
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:500
roi_x:0
roi_y:0
sat_max:255
sat_min:100
send_corners:0
send_raw_contours:0
solve3d:0
solve3d_algo:0
solve3d_bindtarget:1
solve3d_conf:0.990000
solve3d_error:8
solve3d_guess:0
solve3d_iterations:50
solve3d_precies:1
solve3d_precise:0
solve3d_zoffset:0
val_max:254
val_min:132
y_max:1.000000
y_min:-1.000000
58 changes: 58 additions & 0 deletions Limelight Pipelines/GoodTPMORNINGMARCH7.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
area_max:0.5393580481000001
area_min:0.2097273616
area_similarity:66
aspect_max:20
aspect_min:0.0000010124999999999998
black_level:1
blue_balance:1536
calibration_type:0
contour_grouping:0
contour_sort_final:6
convexity_max:64.5
convexity_min:23.1
corner_approx:2
cross_a_a:1
cross_a_x:0
cross_a_y:0
cross_b_a:1
cross_b_x:0
cross_b_y:0
desc:GoodTPMORNINGMARCH7
desired_contour_region:0
dilation_steps:1
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:8
force_convex:1
hue_max:144
hue_min:58
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:500
roi_x:0
roi_y:0
sat_max:255
sat_min:100
send_corners:0
send_raw_contours:0
solve3d:0
solve3d_algo:0
solve3d_bindtarget:1
solve3d_conf:0.990000
solve3d_error:8
solve3d_guess:0
solve3d_iterations:50
solve3d_precies:1
solve3d_precise:0
solve3d_zoffset:0
val_max:254
val_min:132
y_max:1.000000
y_min:-1.000000
58 changes: 58 additions & 0 deletions Limelight Pipelines/Pipeline_Name (1).vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
area_max:100
area_min:0.0244140625
area_similarity:0
aspect_max:20
aspect_min:0.0000010124999999999998
black_level:0
blue_balance:1944
calibration_type:0
contour_grouping:0
contour_sort_final:6
convexity_max:43
convexity_min:10
corner_approx:2
cross_a_a:1
cross_a_x:0
cross_a_y:0
cross_b_a:1
cross_b_x:0
cross_b_y:0
desc:Pipeline_Name
desired_contour_region:0
dilation_steps:1
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:28
force_convex:1
hue_max:147
hue_min:60
image_flip:0
image_source:0
img_to_show:1
intersection_filter:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:1130
roi_x:0
roi_y:0
sat_max:255
sat_min:95
send_corners:0
send_raw_contours:0
solve3d:0
solve3d_algo:0
solve3d_bindtarget:1
solve3d_conf:0.990000
solve3d_error:8
solve3d_guess:0
solve3d_iterations:50
solve3d_precies:1
solve3d_precise:0
solve3d_zoffset:0
val_max:254
val_min:163
y_max:1.000000
y_min:-1.000000
58 changes: 58 additions & 0 deletions Limelight Pipelines/Pipeline_Name (10).vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
area_max:2.853430424100001
area_min:0.005996953600000002
area_similarity:0
aspect_max:20
aspect_min:0
black_level:24
blue_balance:1361
calibration_type:0
contour_grouping:0
contour_sort_final:0
convexity_max:100
convexity_min:10
corner_approx:2
cross_a_a:1
cross_a_x:-0.07
cross_a_y:0
cross_b_a:1
cross_b_x:0
cross_b_y:0
desc:Pipeline_Name
desired_contour_region:0
dilation_steps:1
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:41
force_convex:1
hue_max:65
hue_min:55
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:2104
roi_x:0
roi_y:0
sat_max:255
sat_min:240
send_corners:0
send_raw_contours:0
solve3d:0
solve3d_algo:0
solve3d_bindtarget:1
solve3d_conf:0.990000
solve3d_error:8
solve3d_guess:0
solve3d_iterations:50
solve3d_precies:1
solve3d_precise:0
solve3d_zoffset:0
val_max:58
val_min:28
y_max:1.000000
y_min:-1.000000
Loading