add time widget

Bearbots6964 · Mar 28, 2023 · c27ba97 · c27ba97
1 parent eee0e1b
commit c27ba97
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 60 deletions.
diff --git a/final-final-final.json b/final-final-final.json
@@ -9,7 +9,7 @@
         "showGrid": true,
         "hgap": 16.0,
         "vgap": 16.0,
-        "titleType": 2,
+        "titleType": 1,
         "tiles": {
           "0,0": {
             "size": [
@@ -38,7 +38,7 @@
               "Visuals/Show voltage and current values": true
             }
           },
-          "26,0": {
+          "27,0": {
             "size": [
               5,
               8
@@ -88,14 +88,27 @@
                   "Visuals/Num tick marks": 5,
                   "Visuals/Show text": true,
                   "Visuals/Orientation": "HORIZONTAL"
+                },
+                {
+                  "_type": "Number Bar",
+                  "_source0": "network_table:///Shuffleboard/Config/Tank/Max Speed",
+                  "_title": "Max Speed",
+                  "_glyph": 148,
+                  "_showGlyph": false,
+                  "Range/Min": 0.0,
+                  "Range/Max": 1.0,
+                  "Range/Center": 0.0,
+                  "Visuals/Num tick marks": 5,
+                  "Visuals/Show text": true,
+                  "Visuals/Orientation": "HORIZONTAL"
                 }
               ]
             }
           },
           "8,0": {
             "size": [
-              9,
-              8
+              16,
+              14
             ],
             "content": {
               "_type": "Camera Stream",
@@ -106,37 +119,16 @@
               "Crosshair/Show crosshair": true,
               "Crosshair/Crosshair color": "#FFFFFFFF",
               "Controls/Show controls": true,
-              "Controls/Rotation": "HALF",
+              "Controls/Rotation": "NONE",
               "compression": 35.0,
               "fps": 15,
               "imageWidth": 640,
               "imageHeight": 480
             }
           },
-          "17,0": {
-            "size": [
-              9,
-              8
-            ],
-            "content": {
-              "_type": "Camera Stream",
-              "_source0": "camera_server://limelight",
-              "_title": "limelight",
-              "_glyph": 148,
-              "_showGlyph": false,
-              "Crosshair/Show crosshair": true,
-              "Crosshair/Crosshair color": "#FFFFFFFF",
-              "Controls/Show controls": true,
-              "Controls/Rotation": "HALF",
-              "compression": 27.0,
-              "fps": -1,
-              "imageWidth": -1,
-              "imageHeight": -1
-            }
-          },
-          "12,8": {
+          "25,8": {
             "size": [
-              19,
+              7,
               7
             ],
             "content": {
@@ -155,38 +147,6 @@
               "Visible data/FMSInfo/FMSControlData": true,
               "Visible data/Shuffleboard/PDP/PDP/Voltage": true
             }
-          },
-          "9,10": {
-            "size": [
-              3,
-              3
-            ],
-            "content": {
-              "_type": "Number Bar",
-              "_source0": "network_table:///Shuffleboard/Config/Tank/Max Speed",
-              "_title": "Shuffleboard/Config/Tank/Max Speed",
-              "_glyph": 148,
-              "_showGlyph": false,
-              "Range/Min": 0.0,
-              "Range/Max": 1.0,
-              "Range/Center": 0.0,
-              "Visuals/Num tick marks": 5,
-              "Visuals/Show text": true,
-              "Visuals/Orientation": "HORIZONTAL"
-            }
-          },
-          "9,8": {
-            "size": [
-              2,
-              1
-            ],
-            "content": {
-              "_type": "Text View",
-              "_source0": "network_table:///FMSInfo/FMSControlData",
-              "_title": "/FMSInfo/FMSControlData",
-              "_glyph": 148,
-              "_showGlyph": false
-            }
           }
         }
       }
@@ -458,6 +418,35 @@
               "_glyph": 148,
               "_showGlyph": false
             }
+          },
+          "42,2": {
+            "size": [
+              5,
+              1
+            ],
+            "content": {
+              "_type": "Field",
+              "_source0": "network_table:///SmartDashboard/Field",
+              "_title": "Field",
+              "_glyph": 148,
+              "_showGlyph": false,
+              "Game/Game": "A2023_Charged_Up",
+              "Visuals/Robot Icon Size": 50.0,
+              "Visuals/Show Outside Circles": false
+            }
+          },
+          "34,2": {
+            "size": [
+              2,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///SmartDashboard/rightTrigger",
+              "_title": "rightTrigger",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
           }
         }
       }

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -4,6 +4,8 @@
 
 package frc.robot;
 
+import edu.wpi.first.networktables.GenericEntry;
+import edu.wpi.first.wpilibj.DriverStation;
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.XboxController;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
@@ -51,6 +53,7 @@ public class RobotContainer {
       new DecreaseMaxSpeedCommand(m_Tank);
   private final FineDriveCommand m_FineDriveCommand = new FineDriveCommand(m_Tank);
 
+  private GenericEntry timeWidget = Shuffleboard.getTab("stuff").add("time", 0).withWidget("Match Time").getEntry();  
 
 
   /** The container for the robot. Contains subsystems, OI devices, and commands. */
@@ -220,5 +223,6 @@ public void initTest() {
 
   public void robotPeriodic() {
     Logger.updateEntries();
+    timeWidget.setDouble(DriverStation.getMatchTime());
   }
 }