Test/swerve 2023

.github/workflows/ci.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '*' ]
+    branches: [ '**' ]
 jobs:
    # This workflow contains a single job called "build"
   build:

.vscode/settings.json

@@ -91,6 +91,20 @@
     "hash_set": "cpp",
     "filesystem": "cpp",
     "*.inc": "cpp",
-    "charconv": "cpp"
+    "charconv": "cpp",
+    "ios": "cpp",
+    "xfacet": "cpp",
+    "xiosbase": "cpp",
+    "xlocale": "cpp",
+    "xlocinfo": "cpp",
+    "xlocmon": "cpp",
+    "xlocnum": "cpp",
+    "xloctime": "cpp",
+    "xmemory": "cpp",
+    "xstddef": "cpp",
+    "xstring": "cpp",
+    "xtr1common": "cpp",
+    "xtree": "cpp",
+    "xutility": "cpp"
   }
 }

.wpilib/wpilib_preferences.json

@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2023Beta",
+    "projectYear": "2023",
     "teamNumber": 2718
 }

build.gradle

@@ -1,9 +1,7 @@
-import org.gradle.internal.os.OperatingSystem
-
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7"
+    id "edu.wpi.first.GradleRIO" version "2023.1.1"
 }
 
 // Define my targets (RoboRIO) and artifacts (deployable files)
@@ -38,7 +36,7 @@ deploy {
 def deployArtifact = deploy.targets.roborio.artifacts.frcCpp
 
 // Set this to true to enable desktop support.
-def includeDesktopSupport = true
+def includeDesktopSupport = false
 
 // Set to true to run simulation in debug mode
 wpi.cpp.debugSimulation = false
@@ -99,80 +97,3 @@ model {
         }
     }
 }
-
-task copyDeployDir {
-    String prefix = 'test-results/frcUserProgramTest/'
-    String suffix = 'src/main/deploy'
-
-    // println prefix + "platform/version/" + suffix
-    // println OperatingSystem.current()
-
-    if(OperatingSystem.current().isWindows()){
-        // println "COPYING DEPLOY FOR WINDOWS"
-        // println "SRC: " + project.fileTree('src/main/deploy')
-        // println "TO"
-        // Copy debug
-        copy {
-            from project.fileTree('src/main/deploy')
-            into layout.buildDirectory.dir(prefix + "windowsx86-64/debug/" + suffix)
-        }
-        // Copy release
-        copy {
-            from project.fileTree('src/main/deploy')
-            into layout.buildDirectory.dir(prefix + "windowsx86-64/release/" + suffix)
-        }
-        // println layout.buildDirectory.dir("")
-        // println prefix + "windowsx86-64/debug/" + suffix
-        // println prefix + "windowsx86-64/release/" + suffix
-        // println 'Copied Windows configuration'
-
-    } else {
-        // println "COPYING DEPLOY FOR LINUX"
-        // println "SRC: " + project.fileTree('src/main/deploy')
-        // println "TO"
-        // Linux Athena
-        // Copy debug
-        copy {
-            from project.fileTree('src/main/deploy')
-            into layout.buildDirectory.dir(prefix + "linuxathena/debug/" + suffix)
-        }
-        // Copy release
-        copy {
-            from project.fileTree('src/main/deploy')
-            into layout.buildDirectory.dir(prefix + "linuxathena/release/" + suffix)
-        }
-        // println layout.buildDirectory.dir("")
-        // println prefix + "linuxathena/debug/" + suffix
-        // println prefix + "linuxathena/release/" + suffix
-
-        // Linux x86-64
-        // Copy debug
-        copy {
-            from project.fileTree('src/main/deploy')
-            into layout.buildDirectory.dir(prefix + "linuxx86-64/debug/" + suffix)
-        }
-        // Copy release
-        copy {
-            from project.fileTree('src/main/deploy')
-            into layout.buildDirectory.dir(prefix + "linuxx86-64/release/" + suffix)
-        }
-
-        // println prefix + "linuxx86-64/release/" + suffix
-        // println prefix + "linuxx86-64/debug/" + suffix
-        // println 'Copied Linux configuration'
-    } 
-
-}
-
-// Copy the deploy/ folder when doing unit tests (check) in order to load things like parameters.
-check.dependsOn {
-    tasks.findAll {
-        task -> task.name.startsWith('copyDeployDir')
-    }
-}
-
-build.dependsOn {
-    tasks.findAll {
-        task -> task.name.startsWith('copyDeployDir')
-    }
-}

shuffleboard.json

@@ -0,0 +1,245 @@
+{
+  "tabPane": [
+    {
+      "title": "swerve",
+      "autoPopulate": false,
+      "autoPopulatePrefix": "",
+      "widgetPane": {
+        "gridSize": 128.0,
+        "showGrid": true,
+        "hgap": 16.0,
+        "vgap": 16.0,
+        "titleType": 0,
+        "tiles": {
+          "6,1": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Distance kD",
+              "_title": "Shuffleboard/SwerveDrive/Distance kD",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "5,1": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Distance kI",
+              "_title": "Shuffleboard/SwerveDrive/Distance kI",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "4,1": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Distance kP",
+              "_title": "Shuffleboard/SwerveDrive/Distance kP",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "10,1": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Heading",
+              "_title": "Shuffleboard/SwerveDrive/Heading",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "11,1": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Toggle Button",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Reset Gyro",
+              "_title": "Shuffleboard/SwerveDrive/Reset Gyro",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "7,1": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Toggle Button",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Save",
+              "_title": "Shuffleboard/SwerveDrive/Save",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "6,2": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Steer kD",
+              "_title": "Shuffleboard/SwerveDrive/Steer kD",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "5,2": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Steer kI",
+              "_title": "Shuffleboard/SwerveDrive/Steer kI",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "4,2": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Steer kP",
+              "_title": "Shuffleboard/SwerveDrive/Steer kP",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "7,2": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Toggle Button",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/Write Mode",
+              "_title": "Shuffleboard/SwerveDrive/Write Mode",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "4,4": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/avg dist",
+              "_title": "Shuffleboard/SwerveDrive/avg dist",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "5,4": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/left avg dist",
+              "_title": "Shuffleboard/SwerveDrive/left avg dist",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "9,4": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/left back steer",
+              "_title": "Shuffleboard/SwerveDrive/left back steer",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "9,3": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/left front steer",
+              "_title": "Shuffleboard/SwerveDrive/left front steer",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "6,4": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/right avg dist",
+              "_title": "Shuffleboard/SwerveDrive/right avg dist",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "10,3": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/right front steer",
+              "_title": "Shuffleboard/SwerveDrive/right front steer",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          },
+          "10,4": {
+            "size": [
+              1,
+              1
+            ],
+            "content": {
+              "_type": "Text View",
+              "_source0": "network_table:///Shuffleboard/SwerveDrive/right back steer",
+              "_title": "Shuffleboard/SwerveDrive/right back steer",
+              "_glyph": 148,
+              "_showGlyph": false
+            }
+          }
+        }
+      }
+    }
+  ],
+  "windowGeometry": {
+    "x": -8.0,
+    "y": -8.0,
+    "width": 1936.0,
+    "height": 1048.0
+  }
+}