Skip to content

Commit

Permalink
Final changes before CHCMP (#66)
Browse files Browse the repository at this point in the history 
* 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 <joshuanichols@Joshuas-MacBook-Pro.local>
Co-authored-by: JoshuaAN <joshuanichols@joshuas-mbp.mynetworksettings.com>
  • Loading branch information
@jlbabilino
3 people committed Apr 5, 2023
1 parent 816e9b0 commit ee5d063
Show file tree
Hide file tree
Showing 115 changed files with 22,399 additions and 25,316 deletions.
72 changes: 0 additions & 72 deletions autos/blue-mid-1cone-chgstat/blue-mid-1cone-chgstat_0_place6.json
View file

This file was deleted.

90 changes: 0 additions & 90 deletions autos/blue-mid-1cone-chgstat/blue-mid-1cone-chgstat_1_chgstat.json
View file

This file was deleted.

6 changes: 3 additions & 3 deletions ...at/blue-north-2cone-chgstat_0_place9.json → ...ue-north-2cone-high-chgstat_0_place9.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"waypoint_type": "custom",
"x": 2.811748984000001,
"x_constrained": true,
"y": 4.9238,
"y": 5.0,
"y_constrained": true
},
{
Expand All @@ -37,9 +37,9 @@
"velocity_y": 0.0,
"velocity_y_constrained": true,
"waypoint_type": "custom",
"x": 1.8917489840000012,
"x": 1.9425489840000019,
"x_constrained": true,
"y": 4.9238,
"y": 5.0,
"y_constrained": true
}
]
Expand Down
18 changes: 9 additions & 9 deletions ...tat/blue-north-2cone-chgstat_1_pick4.json → ...lue-north-2cone-high-chgstat_1_pick4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"control_interval_count": 0,
"heading": 3.141592653589793,
"heading_constrained": true,
"name": "place",
"name": "start",
"velocity_magnitude_constrained": true,
"velocity_x": 0.0,
"velocity_x_constrained": true,
"velocity_y": 0.0,
"velocity_y_constrained": true,
"waypoint_type": "custom",
"x": 1.8917489840000012,
"x": 1.9171489840000007,
"x_constrained": true,
"y": 4.9238,
"y": 5.0,
"y_constrained": true
},
{
Expand Down Expand Up @@ -55,16 +55,16 @@
"velocity_y": 0.0,
"velocity_y_constrained": false,
"waypoint_type": "custom",
"x": 4.33395589315079,
"x": 4.4554105586734725,
"x_constrained": true,
"y": 4.708252399690394,
"y": 4.776149488444492,
"y_constrained": true
},
{
"angular_velocity": 0.0,
"angular_velocity_constrained": true,
"control_interval_count": 30,
"heading": 6.283185307179586,
"heading": 0.0,
"heading_constrained": true,
"name": "orient",
"velocity_magnitude_constrained": false,
Expand All @@ -75,14 +75,14 @@
"waypoint_type": "custom",
"x": 6.019548984000004,
"x_constrained": true,
"y": 4.7032,
"y": 4.7056,
"y_constrained": true
},
{
"angular_velocity": 0.0,
"angular_velocity_constrained": true,
"control_interval_count": 20,
"heading": 6.283185307179586,
"heading": 0.0,
"heading_constrained": true,
"name": "pick",
"velocity_magnitude_constrained": true,
Expand All @@ -93,7 +93,7 @@
"waypoint_type": "custom",
"x": 7.105535650412877,
"x_constrained": true,
"y": 4.7032,
"y": 4.7056,
"y_constrained": true
}
]
Expand Down
24 changes: 12 additions & 12 deletions ...at/blue-north-2cone-chgstat_2_align7.json → ...ue-north-2cone-high-chgstat_2_align6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"default": "Charged Up"
},
"paths": {
"align7": {
"align6": {
"obstacles": [],
"waypoints": [
{
Expand All @@ -21,7 +21,7 @@
"waypoint_type": "custom",
"x": 7.105535650412877,
"x_constrained": true,
"y": 4.7032,
"y": 4.7056,
"y_constrained": true
},
{
Expand All @@ -37,9 +37,9 @@
"velocity_y": 0.0,
"velocity_y_constrained": false,
"waypoint_type": "custom",
"x": 5.643370724503396,
"x": 5.661408067175657,
"x_constrained": true,
"y": 4.621649867354779,
"y": 4.7032,
"y_constrained": true
},
{
Expand All @@ -48,16 +48,16 @@
"control_interval_count": 30,
"heading": 3.141592653589793,
"heading_constrained": false,
"name": "orient",
"name": "stay low",
"velocity_magnitude_constrained": false,
"velocity_x": 0.0,
"velocity_x_constrained": false,
"velocity_y": 0.0,
"velocity_y_constrained": false,
"waypoint_type": "custom",
"x": 4.459066323903978,
"x": 4.293719540471052,
"x_constrained": true,
"y": 4.634384323275203,
"y": 4.730856173304924,
"y_constrained": true
},
{
Expand All @@ -66,16 +66,16 @@
"control_interval_count": 30,
"heading": 3.141592653589793,
"heading_constrained": false,
"name": "Custom Waypoint 4",
"name": "avoid chgstat",
"velocity_magnitude_constrained": false,
"velocity_x": 0.0,
"velocity_x_constrained": false,
"velocity_y": 0.0,
"velocity_y_constrained": false,
"waypoint_type": "custom",
"x": 2.4281000616930646,
"x": 2.4426389918474793,
"x_constrained": true,
"y": 4.4202289454166275,
"y": 4.337353043474685,
"y_constrained": true
},
{
Expand All @@ -84,7 +84,7 @@
"control_interval_count": 40,
"heading": 3.141592653589793,
"heading_constrained": true,
"name": "avoid chgstat",
"name": "align 6",
"velocity_magnitude_constrained": true,
"velocity_x": 0.0,
"velocity_x_constrained": true,
Expand All @@ -93,7 +93,7 @@
"waypoint_type": "custom",
"x": 2.3420569759996432,
"x_constrained": true,
"y": 3.3210839492485613,
"y": 3.2829839492485617,
"y_constrained": true
}
]
Expand Down
12 changes: 6 additions & 6 deletions ...at/blue-north-2cone-chgstat_3_place7.json → ...ue-north-2cone-high-chgstat_3_place6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"default": "Charged Up"
},
"paths": {
"place7": {
"place6": {
"obstacles": [],
"waypoints": [
{
Expand All @@ -19,7 +19,7 @@
"velocity_y": 0.0,
"velocity_y_constrained": true,
"waypoint_type": "custom",
"x": 2.3420569759996432,
"x": 2.3166569759996434,
"x_constrained": true,
"y": 3.3210839492485613,
"y_constrained": true
Expand All @@ -30,7 +30,7 @@
"control_interval_count": 30,
"heading": 3.141592653589793,
"heading_constrained": true,
"name": "Custom Waypoint 2",
"name": "view apriltags",
"velocity_magnitude_constrained": false,
"velocity_x": 0.0,
"velocity_x_constrained": false,
Expand All @@ -48,14 +48,14 @@
"control_interval_count": 40,
"heading": 3.141592653589793,
"heading_constrained": true,
"name": "place 7",
"name": "place 6",
"velocity_magnitude_constrained": true,
"velocity_x": 0.0,
"velocity_x_constrained": true,
"velocity_y": 0.0,
"velocity_y_constrained": true,
"waypoint_type": "custom",
"x": 1.8917489840000012,
"x": 1.955248984000002,
"x_constrained": true,
"y": 3.3210839492485613,
"y_constrained": true
Expand All @@ -68,7 +68,7 @@
"bumper_width": 0.903,
"mass": 46.7,
"moment_of_inertia": 5.6,
"motor_max_angular_speed": 52.35987755982988,
"motor_max_angular_speed": 62.83185307179586,
"motor_max_torque": 0.75,
"team_number": 2363,
"wheel_horizontal_distance": 0.622,
Expand Down
Loading

0 comments on commit ee5d063

Please sign in to comment.