Skip to content

Commit ee5d063

Browse files
jlbabilinoJoshuaANJoshuaAN
authored
Final changes before CHCMP (#66)
* implement-cadmia-rebased * Add unmodeled latency * 4/1/23 code * yesterday dev * Rename autos and delete unused * Fix naming for 2cone-high-chgstat * 2.5 cone high cleanup * Regenerate all autos * Fixing robot code, about to test in sim * Created blue autos * Actually use blue auto for low * DCMP code * wpiformat * wpiformat --------- Co-authored-by: JoshuaAN <[email protected]> Co-authored-by: JoshuaAN <[email protected]>
1 parent 816e9b0 commit ee5d063

File tree

115 files changed

+22399
-25316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+22399
-25316
lines changed

‎autos/blue-mid-1cone-chgstat/blue-mid-1cone-chgstat_0_place6.json

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎autos/blue-mid-1cone-chgstat/blue-mid-1cone-chgstat_1_chgstat.json

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎autos/blue-north-2cone-chgstat/blue-north-2cone-chgstat_0_place9.json renamed to ‎autos/blue-north-2cone-high-chgstat/blue-north-2cone-high-chgstat_0_place9.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"waypoint_type": "custom",
2222
"x": 2.811748984000001,
2323
"x_constrained": true,
24-
"y": 4.9238,
24+
"y": 5.0,
2525
"y_constrained": true
2626
},
2727
{
@@ -37,9 +37,9 @@
3737
"velocity_y": 0.0,
3838
"velocity_y_constrained": true,
3939
"waypoint_type": "custom",
40-
"x": 1.8917489840000012,
40+
"x": 1.9425489840000019,
4141
"x_constrained": true,
42-
"y": 4.9238,
42+
"y": 5.0,
4343
"y_constrained": true
4444
}
4545
]

‎autos/blue-north-2cone-chgstat/blue-north-2cone-chgstat_1_pick4.json renamed to ‎autos/blue-north-2cone-high-chgstat/blue-north-2cone-high-chgstat_1_pick4.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
"control_interval_count": 0,
1313
"heading": 3.141592653589793,
1414
"heading_constrained": true,
15-
"name": "place",
15+
"name": "start",
1616
"velocity_magnitude_constrained": true,
1717
"velocity_x": 0.0,
1818
"velocity_x_constrained": true,
1919
"velocity_y": 0.0,
2020
"velocity_y_constrained": true,
2121
"waypoint_type": "custom",
22-
"x": 1.8917489840000012,
22+
"x": 1.9171489840000007,
2323
"x_constrained": true,
24-
"y": 4.9238,
24+
"y": 5.0,
2525
"y_constrained": true
2626
},
2727
{
@@ -55,16 +55,16 @@
5555
"velocity_y": 0.0,
5656
"velocity_y_constrained": false,
5757
"waypoint_type": "custom",
58-
"x": 4.33395589315079,
58+
"x": 4.4554105586734725,
5959
"x_constrained": true,
60-
"y": 4.708252399690394,
60+
"y": 4.776149488444492,
6161
"y_constrained": true
6262
},
6363
{
6464
"angular_velocity": 0.0,
6565
"angular_velocity_constrained": true,
6666
"control_interval_count": 30,
67-
"heading": 6.283185307179586,
67+
"heading": 0.0,
6868
"heading_constrained": true,
6969
"name": "orient",
7070
"velocity_magnitude_constrained": false,
@@ -75,14 +75,14 @@
7575
"waypoint_type": "custom",
7676
"x": 6.019548984000004,
7777
"x_constrained": true,
78-
"y": 4.7032,
78+
"y": 4.7056,
7979
"y_constrained": true
8080
},
8181
{
8282
"angular_velocity": 0.0,
8383
"angular_velocity_constrained": true,
8484
"control_interval_count": 20,
85-
"heading": 6.283185307179586,
85+
"heading": 0.0,
8686
"heading_constrained": true,
8787
"name": "pick",
8888
"velocity_magnitude_constrained": true,
@@ -93,7 +93,7 @@
9393
"waypoint_type": "custom",
9494
"x": 7.105535650412877,
9595
"x_constrained": true,
96-
"y": 4.7032,
96+
"y": 4.7056,
9797
"y_constrained": true
9898
}
9999
]

‎autos/blue-north-2cone-chgstat/blue-north-2cone-chgstat_2_align7.json renamed to ‎autos/blue-north-2cone-high-chgstat/blue-north-2cone-high-chgstat_2_align6.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"default": "Charged Up"
44
},
55
"paths": {
6-
"align7": {
6+
"align6": {
77
"obstacles": [],
88
"waypoints": [
99
{
@@ -21,7 +21,7 @@
2121
"waypoint_type": "custom",
2222
"x": 7.105535650412877,
2323
"x_constrained": true,
24-
"y": 4.7032,
24+
"y": 4.7056,
2525
"y_constrained": true
2626
},
2727
{
@@ -37,9 +37,9 @@
3737
"velocity_y": 0.0,
3838
"velocity_y_constrained": false,
3939
"waypoint_type": "custom",
40-
"x": 5.643370724503396,
40+
"x": 5.661408067175657,
4141
"x_constrained": true,
42-
"y": 4.621649867354779,
42+
"y": 4.7032,
4343
"y_constrained": true
4444
},
4545
{
@@ -48,16 +48,16 @@
4848
"control_interval_count": 30,
4949
"heading": 3.141592653589793,
5050
"heading_constrained": false,
51-
"name": "orient",
51+
"name": "stay low",
5252
"velocity_magnitude_constrained": false,
5353
"velocity_x": 0.0,
5454
"velocity_x_constrained": false,
5555
"velocity_y": 0.0,
5656
"velocity_y_constrained": false,
5757
"waypoint_type": "custom",
58-
"x": 4.459066323903978,
58+
"x": 4.293719540471052,
5959
"x_constrained": true,
60-
"y": 4.634384323275203,
60+
"y": 4.730856173304924,
6161
"y_constrained": true
6262
},
6363
{
@@ -66,16 +66,16 @@
6666
"control_interval_count": 30,
6767
"heading": 3.141592653589793,
6868
"heading_constrained": false,
69-
"name": "Custom Waypoint 4",
69+
"name": "avoid chgstat",
7070
"velocity_magnitude_constrained": false,
7171
"velocity_x": 0.0,
7272
"velocity_x_constrained": false,
7373
"velocity_y": 0.0,
7474
"velocity_y_constrained": false,
7575
"waypoint_type": "custom",
76-
"x": 2.4281000616930646,
76+
"x": 2.4426389918474793,
7777
"x_constrained": true,
78-
"y": 4.4202289454166275,
78+
"y": 4.337353043474685,
7979
"y_constrained": true
8080
},
8181
{
@@ -84,7 +84,7 @@
8484
"control_interval_count": 40,
8585
"heading": 3.141592653589793,
8686
"heading_constrained": true,
87-
"name": "avoid chgstat",
87+
"name": "align 6",
8888
"velocity_magnitude_constrained": true,
8989
"velocity_x": 0.0,
9090
"velocity_x_constrained": true,
@@ -93,7 +93,7 @@
9393
"waypoint_type": "custom",
9494
"x": 2.3420569759996432,
9595
"x_constrained": true,
96-
"y": 3.3210839492485613,
96+
"y": 3.2829839492485617,
9797
"y_constrained": true
9898
}
9999
]

‎autos/blue-north-2cone-chgstat/blue-north-2cone-chgstat_3_place7.json renamed to ‎autos/blue-north-2cone-high-chgstat/blue-north-2cone-high-chgstat_3_place6.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"default": "Charged Up"
44
},
55
"paths": {
6-
"place7": {
6+
"place6": {
77
"obstacles": [],
88
"waypoints": [
99
{
@@ -19,7 +19,7 @@
1919
"velocity_y": 0.0,
2020
"velocity_y_constrained": true,
2121
"waypoint_type": "custom",
22-
"x": 2.3420569759996432,
22+
"x": 2.3166569759996434,
2323
"x_constrained": true,
2424
"y": 3.3210839492485613,
2525
"y_constrained": true
@@ -30,7 +30,7 @@
3030
"control_interval_count": 30,
3131
"heading": 3.141592653589793,
3232
"heading_constrained": true,
33-
"name": "Custom Waypoint 2",
33+
"name": "view apriltags",
3434
"velocity_magnitude_constrained": false,
3535
"velocity_x": 0.0,
3636
"velocity_x_constrained": false,
@@ -48,14 +48,14 @@
4848
"control_interval_count": 40,
4949
"heading": 3.141592653589793,
5050
"heading_constrained": true,
51-
"name": "place 7",
51+
"name": "place 6",
5252
"velocity_magnitude_constrained": true,
5353
"velocity_x": 0.0,
5454
"velocity_x_constrained": true,
5555
"velocity_y": 0.0,
5656
"velocity_y_constrained": true,
5757
"waypoint_type": "custom",
58-
"x": 1.8917489840000012,
58+
"x": 1.955248984000002,
5959
"x_constrained": true,
6060
"y": 3.3210839492485613,
6161
"y_constrained": true
@@ -68,7 +68,7 @@
6868
"bumper_width": 0.903,
6969
"mass": 46.7,
7070
"moment_of_inertia": 5.6,
71-
"motor_max_angular_speed": 52.35987755982988,
71+
"motor_max_angular_speed": 62.83185307179586,
7272
"motor_max_torque": 0.75,
7373
"team_number": 2363,
7474
"wheel_horizontal_distance": 0.622,

0 commit comments

Comments
 (0)