Merge branch 'main' into automations

Talon540Programming · Mar 16, 2024 · 7978037 · 7978037
2 parents 9838c87 + 0197c87
commit 7978037
Show file tree

Hide file tree

Showing 13 changed files with 128,662 additions and 40 deletions.
diff --git a/ascope_assets/Robot_TALON2024/config.json b/ascope_assets/Robot_TALON2024/config.json
@@ -16,21 +16,130 @@
     0,
     0
   ],
-  "cameras": [],
+  "cameras": [
+    {
+      "name": "UNDER_SHOOTER",
+      "position": [
+        -0.330312,
+        0.138773,
+        0.157061
+      ],
+      "rotations": [
+        {
+          "axis": "x",
+          "degrees": 0
+        },
+        {
+          "axis": "y",
+          "degrees": -30
+        },
+        {
+          "axis": "z",
+          "degrees": 180
+        }
+      ],
+      "resolution": [
+        1280,
+        720
+      ],
+      "fov": 75
+    },
+    {
+      "name": "BACK_LEFT",
+      "position": [
+        -0.285206,
+        0.283806,
+        0.272624
+      ],
+      "rotations": [
+        {
+          "axis": "x",
+          "degrees": 0
+        },
+        {
+          "axis": "y",
+          "degrees": -20
+        },
+        {
+          "axis": "z",
+          "degrees": 135
+        }
+      ],
+      "resolution": [
+        1280,
+        720
+      ],
+      "fov": 75
+    },
+    {
+      "name": "FRONT_LEFT",
+      "position": [
+        0.278740,
+        0.280968,
+        0.272098
+      ],
+      "rotations": [
+        {
+          "axis": "x",
+          "degrees": 0
+        },
+        {
+          "axis": "y",
+          "degrees": -45
+        },
+        {
+          "axis": "z",
+          "degrees": -22.5
+        }
+      ],
+      "resolution": [
+        1280,
+        720
+      ],
+      "fov": 75
+    },
+    {
+      "name": "FRONT_RIGHT",
+      "position": [
+        0.281034,
+        -0.278751,
+        0.272098
+      ],
+      "rotations": [
+        {
+          "axis": "x",
+          "degrees": 0
+        },
+        {
+          "axis": "y",
+          "degrees": -45
+        },
+        {
+          "axis": "z",
+          "degrees": 67.5
+        }
+      ],
+      "resolution": [
+        1280,
+        720
+      ],
+      "fov": 75
+    }
+  ],
   "components": [
     {
       "zeroedRotations": [
         {
           "axis": "z",
-          "degrees": 90
+          "degrees": 0
         },
         {
           "axis": "x",
           "degrees": 0
         },
         {
           "axis": "y",
-          "degrees": 90
+          "degrees": -90
         }
       ],
       "zeroedPosition": [
@@ -47,17 +156,17 @@
         },
         {
           "axis": "x",
-          "degrees": 180
+          "degrees": -90
         },
         {
           "axis": "y",
-          "degrees": 55
+          "degrees": 26
         }
       ],
       "zeroedPosition": [
-        0.1512,
         0,
-        0.0365
+        0,
+        0
       ]
     }
   ]

diff --git a/ascope_assets/Robot_TALON2024/model.glb b/ascope_assets/Robot_TALON2024/model.glb
diff --git a/ascope_assets/Robot_TALON2024/model_0.glb b/ascope_assets/Robot_TALON2024/model_0.glb
diff --git a/ascope_assets/Robot_TALON2024/model_1.glb b/ascope_assets/Robot_TALON2024/model_1.glb