Skip to content

Commit

Permalink
Merge pull request #35 from FRC2713/treemapshooting
Browse files Browse the repository at this point in the history
Treemapshooting
  • Loading branch information
RHR2713 authored Mar 12, 2024
2 parents f6d898d + ec58468 commit deddaee
Show file tree
Hide file tree
Showing 106 changed files with 15,224 additions and 4,814 deletions.
11 changes: 8 additions & 3 deletions .OutlineViewer/outlineviewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@
"serverTeam": "2713"
},
"Server": {
"Subscribers": {
"open": true
},
"open": true
},
"retained": {
"limelight-a": {
"double[]##v_/limelight-a/botpose_wpiblue": {
"open": true
},
"open": true
}
}
}
5,098 changes: 4,254 additions & 844 deletions auto.chor

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.text.SimpleDateFormat

plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.2.1"
id "edu.wpi.first.GradleRIO" version "2024.3.1"
id 'com.diffplug.spotless' version '6.12.0'
id "io.freefair.lombok" version "8.4"
id "com.peterabeles.gversion" version "1.10.2"
Expand Down Expand Up @@ -199,7 +199,7 @@ project.compileJava.dependsOn(createVersionFile)
task commitOnDeploy {
description = 'Commits when deployed.'
doLast {
if (false) {
if (true) {
def date = new Date()
def sdf = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
grgit.add(patterns: [
Expand All @@ -210,7 +210,7 @@ task commitOnDeploy {
'gradle',
'.wpilib'
])
grgit.commit(message: "Automated commit at " + sdf.format(date), all: true)
grgit.commit(message: "Automated deploy commit at " + sdf.format(date), all: true)
}
}
}
Expand Down
1 change: 1 addition & 0 deletions elastic-layout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":1.0,"grid_size":128,"tabs":[{"name":"Teleoperated","grid_layout":{"layouts":[{"title":"States","x":256.0,"y":128.0,"width":256.0,"height":512.0,"type":"List Layout","properties":{"label_position":"TOP"},"children":[{"title":"Elevator","x":0.0,"y":0.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/States/Elevator","period":0.06,"data_type":"string","show_submit_button":false}},{"title":"Intake","x":0.0,"y":0.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/States/Intake","period":0.06,"data_type":"string","show_submit_button":false}},{"title":"Pivot","x":0.0,"y":0.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/States/Pivot","period":0.06,"data_type":"string","show_submit_button":false}},{"title":"Shooter","x":0.0,"y":0.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/States/Shooter","period":0.06,"data_type":"string","show_submit_button":false}},{"title":"Swerve","x":0.0,"y":0.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/States/Swerve","period":0.06,"data_type":"string","show_submit_button":false}}]}],"containers":[{"title":"Autonomous Routine","x":128.0,"y":0.0,"width":256.0,"height":128.0,"type":"ComboBox Chooser","properties":{"topic":"/SmartDashboard/Autonomous Routine","period":0.06,"sort_options":false}},{"title":"Battery Voltage","x":512.0,"y":384.0,"width":512.0,"height":128.0,"type":"Voltage View","properties":{"topic":"/SmartDashboard/Dashboard/Battery Voltage","period":0.06,"data_type":"double","min_value":4.0,"max_value":13.0,"divisions":5,"inverted":false,"orientation":"horizontal"}},{"title":"Gyro Yaw","x":0.0,"y":128.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/Gyro Yaw","period":0.06,"data_type":"double","show_submit_button":false}},{"title":"limelight-a","x":512.0,"y":0.0,"width":512.0,"height":384.0,"type":"Camera Stream","properties":{"topic":"/CameraPublisher/limelight-a","period":0.06}},{"title":"Elevator Left","x":0.0,"y":512.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/Elevator Left","period":0.06,"data_type":"double","show_submit_button":false}},{"title":"Elevator Right","x":128.0,"y":512.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/Elevator Right","period":0.06,"data_type":"double","show_submit_button":false}},{"title":"Pivot Left","x":0.0,"y":640.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/Pivot Left","period":0.06,"data_type":"double","show_submit_button":false}},{"title":"Pivot Right","x":128.0,"y":640.0,"width":128.0,"height":128.0,"type":"Text Display","properties":{"topic":"/SmartDashboard/Dashboard/Pivot Right","period":0.06,"data_type":"double","show_submit_button":false}},{"title":"Back Left Encoder Good","x":0.0,"y":384.0,"width":128.0,"height":128.0,"type":"Boolean Box","properties":{"topic":"/SmartDashboard/Dashboard/Back Left Encoder Good","period":0.06,"data_type":"boolean","true_color":4283215696,"false_color":4294198070}},{"title":"Back Right Encoder Good","x":128.0,"y":384.0,"width":128.0,"height":128.0,"type":"Boolean Box","properties":{"topic":"/SmartDashboard/Dashboard/Back Right Encoder Good","period":0.06,"data_type":"boolean","true_color":4283215696,"false_color":4294198070}},{"title":"Front Left Encoder Good","x":0.0,"y":256.0,"width":128.0,"height":128.0,"type":"Boolean Box","properties":{"topic":"/SmartDashboard/Dashboard/Front Left Encoder Good","period":0.06,"data_type":"boolean","true_color":4283215696,"false_color":4294198070}},{"title":"Front Right Encoder Good","x":128.0,"y":256.0,"width":128.0,"height":128.0,"type":"Boolean Box","properties":{"topic":"/SmartDashboard/Dashboard/Front Right Encoder Good","period":0.06,"data_type":"boolean","true_color":4283215696,"false_color":4294198070}},{"title":"Has Alliance Color","x":0.0,"y":0.0,"width":128.0,"height":128.0,"type":"Boolean Box","properties":{"topic":"/SmartDashboard/Dashboard/Has Alliance Color","period":0.06,"data_type":"boolean","true_color":4283215696,"false_color":4294198070}},{"title":"fun mode","x":1024.0,"y":0.0,"width":896.0,"height":896.0,"type":"Camera Stream","properties":{"topic":"/CameraPublisher/limelight-b","period":0.06}}]}}]}
97 changes: 97 additions & 0 deletions pipelines/AprilTagDefault.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
area_max:100
area_min:0.0017850625000000004
area_similarity:0
aspect_max:20.000000
aspect_min:0.000000
black_level:0
blue_balance:1975
botfloorsnap:0
botlength:0.7112
botwidth:0.7112
calibration_type:0
classifier_conf:0.100000
contour_grouping:0
contour_sort_final:0
convexity_max:100
convexity_min:10
corner_approx:5.000000
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
debugpipe:0
desc:AprilTagDefault
desired_contour_region:0
detector_conf:0.800000
detector_idfilters:
dilation_steps:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:200
fiducial_backend:umich
fiducial_decoder_strictness:strict
fiducial_denoise:0.000000
fiducial_idfilters:
fiducial_locfilters:
fiducial_method:sqpnp
fiducial_qualitythreshold:2.0
fiducial_refine:1
fiducial_resdiv:2
fiducial_size:165.1
fiducial_skip3d:0
fiducial_type:aprilClassic36h11
fiducial_vis_mode:3dtargposebotspace
flicker_correction:0
force_convex:1
hue_max:85
hue_min:60
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
invert_hue:0
lcgain:15
multigroup_max:7
multigroup_min:1
multigroup_rejector:0
pipeline_led_enabled:0
pipeline_led_power:100
pipeline_res:2
pipeline_type:4
python_snapscript_name:
red_balance:1200
roi_x:0.000000
roi_y:0.000000
rsf:0
rspitch:0
rsroll:0
rss:0
rsu:0
rsyaw:0
sat_max:255
sat_min:70
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_precise:0
solve3d_zoffset:0.000000
tsf:0
tss:0
tsu:0
val_max:255
val_min:70
x_outlier_miqr:1.5
y_outlier_miqr:1.5
98 changes: 98 additions & 0 deletions pipelines/LL1.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
area_max:100
area_min:0.0017850625000000004
area_similarity:0
aspect_max:20.000000
aspect_min:0.000000
black_level:0
blue_balance:1975
botfloorsnap:1
botlength:0.8
bottype:swerve
botwidth:0.4
calibration_type:0
classifier_conf:0.100000
contour_grouping:0
contour_sort_final:0
convexity_max:100
convexity_min:10
corner_approx:5.000000
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
debugpipe:0
desc:AprilTagDefault
desired_contour_region:0
detector_conf:0.800000
detector_idfilters:
dilation_steps:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:200
fiducial_backend:umich
fiducial_decoder_strictness:strict
fiducial_denoise:0.000000
fiducial_idfilters:
fiducial_locfilters:
fiducial_method:sqpnp
fiducial_qualitythreshold:2.0
fiducial_refine:1
fiducial_resdiv:2
fiducial_size:165.1
fiducial_skip3d:0
fiducial_type:aprilClassic36h11
fiducial_vis_mode:3dbotposetargspace
flicker_correction:0
force_convex:1
hue_max:85
hue_min:60
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
invert_hue:0
lcgain:15
multigroup_max:7
multigroup_min:1
multigroup_rejector:0
pipeline_led_enabled:0
pipeline_led_power:100
pipeline_res:2
pipeline_type:4
python_snapscript_name:
red_balance:1200
roi_x:0.000000
roi_y:0.000000
rsf:0.150023
rspitch:5
rsroll:0
rss:-0.290829
rsu:0.642158
rsyaw:0
sat_max:255
sat_min:70
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_precise:0
solve3d_zoffset:0.000000
tsf:0
tss:0
tsu:0
val_max:255
val_min:70
x_outlier_miqr:1.5
y_outlier_miqr:1.5
98 changes: 98 additions & 0 deletions pipelines/LL2.vpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
area_max:100
area_min:0.0017850625000000004
area_similarity:0
aspect_max:20.000000
aspect_min:0.000000
black_level:0
blue_balance:1975
botfloorsnap:1
botlength:0.8
bottype:swerve
botwidth:0.4
calibration_type:0
classifier_conf:0.100000
contour_grouping:0
contour_sort_final:0
convexity_max:100
convexity_min:10
corner_approx:5.000000
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
debugpipe:0
desc:AprilTagDefault
desired_contour_region:0
detector_conf:0.800000
detector_idfilters:
dilation_steps:0
direction_filter:0
dual_close_sort_origin:0
erosion_steps:0
exposure:200
fiducial_backend:umich
fiducial_decoder_strictness:strict
fiducial_denoise:0.000000
fiducial_idfilters:
fiducial_locfilters:
fiducial_method:sqpnp
fiducial_qualitythreshold:2.0
fiducial_refine:1
fiducial_resdiv:2
fiducial_size:165.1
fiducial_skip3d:0
fiducial_type:aprilClassic36h11
fiducial_vis_mode:3dbotposetargspace
flicker_correction:0
force_convex:1
hue_max:85
hue_min:60
image_flip:0
image_source:0
img_to_show:0
intersection_filter:0
invert_hue:0
lcgain:15
multigroup_max:7
multigroup_min:1
multigroup_rejector:0
pipeline_led_enabled:0
pipeline_led_power:100
pipeline_res:2
pipeline_type:4
python_snapscript_name:
red_balance:1200
roi_x:0.000000
roi_y:0.000000
rsf:0.027309
rspitch:5
rsroll:0
rss:-0.290851
rsu:0.642147
rsyaw:180
sat_max:255
sat_min:70
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_precise:0
solve3d_zoffset:0.000000
tsf:0
tss:0
tsu:0
val_max:255
val_min:70
x_outlier_miqr:1.5
y_outlier_miqr:1.5
Loading

0 comments on commit deddaee

Please sign in to comment.