Skip to content
This repository has been archived by the owner on Sep 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #26 from Team2470/fix-climber
Browse files Browse the repository at this point in the history
Integration of improved Climber, Shooter, and Auto code
  • Loading branch information
nowireless authored Apr 10, 2022
2 parents 19869fd + 0c935d9 commit e319d27
Show file tree
Hide file tree
Showing 38 changed files with 406,251 additions and 168 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,5 @@ bin/
*-window.json

# IntelliJ
.idea/
.idea/
notes/~$shooting-data.xlsx
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2022.3.1"
id "edu.wpi.first.GradleRIO" version "2022.4.1"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand Down
68 changes: 68 additions & 0 deletions limelight/OldPipelines/LimelightThreshold2022-03-23.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
area_max:100
area_min:0.0017850625000000004
area_similarity:32
aspect_max:20
aspect_min:0.5120000000000001
black_level:0
blue_balance:1975
calibration_type:0
contour_grouping:3
contour_sort_final:6
convexity_max:99.9
convexity_min:61.5
corner_approx:5.000000
crop_x_max:1
crop_x_min:-0.99
crop_y_max:0.62
crop_y_min:-1
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:Primary
desired_contour_region:0
dilation_steps:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:2
force_convex:1
hue_max:107
hue_min:60
image_flip:0
image_source:0
img_to_show:1
intersection_filter:0
invert_hue:0
multigroup_max:4
multigroup_min:2
multigroup_rejector:0
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:988
roi_x:0.000000
roi_y:0.000000
sat_max:239
sat_min:64
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.000000
val_max:255
val_min:176
x_outlier_miqr:3
y_max:1.000000
y_min:-1.000000
y_outlier_miqr:2.8
68 changes: 68 additions & 0 deletions limelight/OldPipelines/Pipeline_Name (1).vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
area_max:12.5333700625
area_min:0.0011316495999999998
area_similarity:0
aspect_max:20
aspect_min:0
black_level:28
blue_balance:1920
calibration_type:0
contour_grouping:3
contour_sort_final:2
convexity_max:100
convexity_min:40
corner_approx:2
crop_x_max:1.000000
crop_x_min:-1.000000
crop_y_max:1.000000
crop_y_min:-1.000000
cross_a_a:1
cross_a_x:0.1
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:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:2
force_convex:1
hue_max:86
hue_min:38
image_flip:0
image_source:0
img_to_show:1
intersection_filter:0
invert_hue:0
multigroup_max:4
multigroup_min:2
multigroup_rejector:1
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:2
pipeline_type:0
red_balance:1500
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:192
val_min:65
x_outlier_miqr:0.5
y_max:1.000000
y_min:-1.000000
y_outlier_miqr:0.5
63 changes: 63 additions & 0 deletions limelight/OldPipelines/drippingSprings.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
area_max:12.5333700625
area_min:0.0011316495999999998
area_similarity:0
aspect_max:20
aspect_min:0
black_level:5
blue_balance:1920
calibration_type:0
contour_grouping:3
contour_sort_final:0
convexity_max:100
convexity_min:40
corner_approx:2
cross_a_a:1
cross_a_x:0.1
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:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:2
force_convex:1
hue_max:103
hue_min:0
image_flip:1
image_source:0
img_to_show:1
intersection_filter:0
multigroup_max:4
multigroup_min:2
multigroup_rejector:1
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:0
pipeline_type:0
red_balance:1500
roi_x:0
roi_y:0
sat_max:255
sat_min:87
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:255
val_min:118
x_outlier_miqr:0.5
y_max:1.000000
y_min:-1.000000
y_outlier_miqr:0.5
68 changes: 68 additions & 0 deletions limelight/Pipeline_Name_10k.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
area_max:12.5333700625
area_min:0.0011316495999999998
area_similarity:0
aspect_max:20
aspect_min:0
black_level:28
blue_balance:1920
calibration_type:0
contour_grouping:3
contour_sort_final:2
convexity_max:100
convexity_min:40
corner_approx:2
crop_x_max:1.000000
crop_x_min:-1.000000
crop_y_max:1.000000
crop_y_min:-1.000000
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:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:2
force_convex:1
hue_max:86
hue_min:38
image_flip:0
image_source:0
img_to_show:1
intersection_filter:0
invert_hue:0
multigroup_max:4
multigroup_min:2
multigroup_rejector:1
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:2
pipeline_type:0
red_balance:1500
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:192
val_min:65
x_outlier_miqr:0.5
y_max:1.000000
y_min:-1.000000
y_outlier_miqr:0.5
68 changes: 68 additions & 0 deletions limelight/Pipeline_Name_autoshop.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
area_max:12.5333700625
area_min:0.0011316495999999998
area_similarity:0
aspect_max:20
aspect_min:0
black_level:28
blue_balance:1920
calibration_type:0
contour_grouping:3
contour_sort_final:2
convexity_max:100
convexity_min:40
corner_approx:2
crop_x_max:1.000000
crop_x_min:-1.000000
crop_y_max:1.000000
crop_y_min:-1.000000
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:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:2
force_convex:1
hue_max:86
hue_min:38
image_flip:0
image_source:0
img_to_show:1
intersection_filter:0
invert_hue:0
multigroup_max:4
multigroup_min:2
multigroup_rejector:1
pipeline_led_enabled:1
pipeline_led_power:100
pipeline_res:2
pipeline_type:0
red_balance:1500
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:192
val_min:65
x_outlier_miqr:0.5
y_max:1.000000
y_min:-1.000000
y_outlier_miqr:0.5
18 changes: 18 additions & 0 deletions notes/intake-steps.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Intake steps

(Start with 0 balls)

1. Drive intake and conveyor until bottom sensor
2. Drive intake whenver drive want

Shoot (Start with 2 balls)
1. Spin up
2. Drive conveyor up until error spike
3. Detect second ball with middle sensor
4. Drive conveyor down until middle sensor not detecting and bottom sensor detects

Shoot (Start with 1 ball)
1. Spin up
2. Drive conveyor up until error spike
3. Don't detect second ball with middle sensor
4. Stop
4 changes: 4 additions & 0 deletions notes/shooting-data.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Shooting Data

Center offset = 34in.

Binary file added notes/shooting-data.xlsx
Binary file not shown.
Loading

0 comments on commit e319d27

Please sign in to comment.