Merge pull request #1 from Team-4795/pivot

Off-season code
Team-4795 · Nov 22, 2024 · 9cdb516 · 9cdb516
2 parents 97cfb9e + 9d74ee9
commit 9cdb516
Show file tree

Hide file tree

Showing 44 changed files with 1,007 additions and 633 deletions.
diff --git a/.DataLogTool/datalogtool-window.json b/.DataLogTool/datalogtool-window.json
@@ -0,0 +1,41 @@
+{
+  "MainWindow": {
+    "GLOBAL": {
+      "fps": "120",
+      "height": "510",
+      "maximized": "0",
+      "style": "0",
+      "userScale": "2",
+      "width": "925",
+      "xpos": "-1",
+      "ypos": "-1"
+    }
+  },
+  "Window": {
+    "Debug##Default": {
+      "Collapsed": "0",
+      "Pos": "60,60",
+      "Size": "400,400"
+    },
+    "Download": {
+      "Collapsed": "0",
+      "Pos": "0,250",
+      "Size": "375,260"
+    },
+    "Entries": {
+      "Collapsed": "0",
+      "Pos": "380,20",
+      "Size": "540,365"
+    },
+    "Input Files": {
+      "Collapsed": "0",
+      "Pos": "0,20",
+      "Size": "375,230"
+    },
+    "Output": {
+      "Collapsed": "0",
+      "Pos": "380,390",
+      "Size": "540,120"
+    }
+  }
+}
diff --git a/.DataLogTool/datalogtool.json b/.DataLogTool/datalogtool.json
@@ -0,0 +1 @@
+{}
diff --git a/.SysId/sysid-window.json b/.SysId/sysid-window.json
@@ -0,0 +1,56 @@
+{
+  "MainWindow": {
+    "GLOBAL": {
+      "fps": "120",
+      "height": "720",
+      "maximized": "0",
+      "style": "0",
+      "userScale": "2",
+      "width": "1280",
+      "xpos": "115",
+      "ypos": "138"
+    }
+  },
+  "Window": {
+    "###Analyzer": {
+      "Collapsed": "0",
+      "Pos": "320,25",
+      "Size": "360,550"
+    },
+    "###Data Selector": {
+      "Collapsed": "0",
+      "Pos": "5,480",
+      "Size": "310,235"
+    },
+    "###Log Loader": {
+      "Collapsed": "0",
+      "Pos": "5,25",
+      "Size": "310,450"
+    },
+    "###Program Log": {
+      "Collapsed": "0",
+      "Pos": "323,581",
+      "Size": "360,135"
+    },
+    "Debug##Default": {
+      "Collapsed": "0",
+      "Pos": "60,60",
+      "Size": "400,400"
+    },
+    "Diagnostic Plots": {
+      "Collapsed": "0",
+      "Pos": "685,25",
+      "Size": "590,690"
+    },
+    "Exception Caught!": {
+      "Collapsed": "0",
+      "Pos": "285,310",
+      "Size": "480,97"
+    },
+    "Override Units": {
+      "Collapsed": "0",
+      "Pos": "480,288",
+      "Size": "320,144"
+    }
+  }
+}
diff --git a/.SysId/sysid.json b/.SysId/sysid.json
@@ -0,0 +1 @@
+{}
diff --git a/build.gradle b/build.gradle
@@ -133,16 +133,17 @@ tasks.withType(JavaCompile) {
 }
 
 // Create version file
-project.compileJava.dependsOn(createVersionFile)
-gversion {
-    srcDir       = "src/main/java/"
-    classPackage = "frc.robot"
-    className    = "BuildConstants"
-    dateFormat   = "yyyy-MM-dd HH:mm:ss z"
-    timeZone     = "America/New_York"
-    indent       = "  "
-}
-
+/*
+ project.compileJava.dependsOn(createVersionFile)
+ gversion {
+ srcDir       = "src/main/java/"
+ classPackage = "frc.robot"
+ className    = "BuildConstants"
+ dateFormat   = "yyyy-MM-dd HH:mm:ss z"
+ timeZone     = "America/New_York"
+ indent       = "  "
+ }
+ */
 // Spotless formatting
 project.compileJava.dependsOn(spotlessApply)
 spotless {

diff --git a/ctre_sim/Pigeon 2 - 020 - 0 - ext.dat b/ctre_sim/Pigeon 2 - 020 - 0 - ext.dat
diff --git a/gradlew b/gradlew
@@ -246,4 +246,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega
diff --git a/logs/Log_24-10-09_12-26-37.wpilog b/logs/Log_24-10-09_12-26-37.wpilog
diff --git a/logs/Log_24-10-10_16-16-33.wpilog b/logs/Log_24-10-10_16-16-33.wpilog
diff --git a/logs/Log_453809fd5c0e7d60.wpilog b/logs/Log_453809fd5c0e7d60.wpilog
diff --git a/logs/Log_5fc0f61a818611e2.wpilog b/logs/Log_5fc0f61a818611e2.wpilog
diff --git a/logs/Log_7ef8dfb8c7d4b407.wpilog b/logs/Log_7ef8dfb8c7d4b407.wpilog
diff --git a/networktables.json b/networktables.json
@@ -0,0 +1 @@
+[]
diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
@@ -38,24 +38,6 @@ public class Robot extends LoggedRobot {
    */
   @Override
   public void robotInit() {
-    // Record metadata
-    Logger.recordMetadata("ProjectName", BuildConstants.MAVEN_NAME);
-    Logger.recordMetadata("BuildDate", BuildConstants.BUILD_DATE);
-    Logger.recordMetadata("GitSHA", BuildConstants.GIT_SHA);
-    Logger.recordMetadata("GitDate", BuildConstants.GIT_DATE);
-    Logger.recordMetadata("GitBranch", BuildConstants.GIT_BRANCH);
-    switch (BuildConstants.DIRTY) {
-      case 0:
-        Logger.recordMetadata("GitDirty", "All changes committed");
-        break;
-      case 1:
-        Logger.recordMetadata("GitDirty", "Uncomitted changes");
-        break;
-      default:
-        Logger.recordMetadata("GitDirty", "Unknown");
-        break;
-    }
-
     // Set up data receivers & replay source
     switch (Constants.currentMode) {
       case REAL:
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,4 +89,4 @@ exit /b %EXIT_CODE% @@
     :mainEnd
     if "%OS%"=="Windows_NT" endlocal
-    :omega
+    :omega