Skip to content

Commit

Permalink
Sync with GRRBase
Browse files Browse the repository at this point in the history
  • Loading branch information
bryceroethel committed Jan 31, 2024
1 parent efb1666 commit 16c830c
Show file tree
Hide file tree
Showing 29 changed files with 1,038 additions and 1,049 deletions.
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"streetsidesoftware.code-spell-checker",
"vscjava.vscode-java-debug",
"vscjava.vscode-java-pack",
"github.vscode-github-actions",
"visualstudioexptteam.vscodeintellicode",
"visualstudioexptteam.intellicode-api-usage-examples",
"visualstudioexptteam.vscodeintellicode-completions",
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Lily
FRC 340's code for our standalone drive base, Lily.

FRC 340's code for our standalone drive base, Lily.
2 changes: 1 addition & 1 deletion WPILib-License.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2009-2023 FIRST and other WPILib contributors
Copyright (c) 2009-2024 FIRST and other WPILib contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1"
id "edu.wpi.first.GradleRIO" version "2024.2.1"
id "com.diffplug.spotless" version "6.23.3"
}

Expand Down
6 changes: 3 additions & 3 deletions dashboard/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
--good: #28cd41;
--bad: #ff453a;

--auto-spline: #ffffffc9;
--auto-cp-red: #a20010;
--auto-cp-blue: #0048a7;
--auto-line: #ffffffc9;
--auto-waypoint-red: #a20010;
--auto-waypoint-blue: #0048a7;

--graph-grid: #ffffff5b;
--graph-red: #ff453a;
Expand Down
24 changes: 12 additions & 12 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
"check": "svelte-check --tsconfig ./tsconfig.json",
"dev": "vite",
"dev:tauri": "tauri dev",
"format": "prettier --write --plugin prettier-plugin-svelte .",
"format:check": "prettier --check --plugin prettier-plugin-svelte .",
"format": "prettier --write --plugin prettier-plugin-svelte ./src/",
"format:check": "prettier --check --plugin prettier-plugin-svelte ./src/",
"preview": "vite preview",
"tauri": "tauri"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^2.4.6",
"@tauri-apps/cli": "^1.5.6",
"@sveltejs/vite-plugin-svelte": "^3.0.1",
"@tauri-apps/cli": "^1.5.9",
"@tsconfig/svelte": "^5.0.2",
"chart.js": "^4.4.0",
"chart.js": "^4.4.1",
"chartjs-plugin-zoom": "^2.0.1",
"prettier": "^3.0.3",
"prettier-plugin-svelte": "^3.0.3",
"svelte": "^4.2.2",
"svelte-check": "^3.5.2",
"tslib": "^2.6.1",
"typescript": "^5.2.2",
"vite": "^4.5.0"
"prettier": "^3.2.4",
"prettier-plugin-svelte": "^3.1.2",
"svelte": "^4.2.9",
"svelte-check": "^3.6.3",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^5.0.12"
},
"private": true
}
11 changes: 4 additions & 7 deletions dashboard/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import ConnectingDialog from "./components/ConnectingDialog.svelte";
import NavBar from "./components/NavBar.svelte";
import Analysis from "./tabs/Analysis.svelte";
import AutoSelection from "./tabs/AutoSelection.svelte";
import DriverView from "./tabs/DriverView.svelte";
import { NTConnected, RobotEnabled } from "./ntStores";
import { NTConnected } from "./ntStores";
import { NTSvelteClientState } from "./lib/NTSvelte";
// Define your tabs here.
// The navbar will be automatically populated using this object, and tabs will be dynamically displayed when selected.
Expand All @@ -17,7 +17,6 @@
const tabs = {
"Driver View": DriverView,
"Auto Selection": AutoSelection,
Analysis: Analysis,
};
// Helpers for tab selection.
Expand All @@ -28,10 +27,8 @@
</script>

<main>
{#if $NTConnected || IGNORE_CONNECTION}
<!-- If connected, show the current tab and the navbar. -->
<p>{$RobotEnabled}</p>

<!-- If connected, show the current tab and the navbar. -->
{#if $NTConnected === NTSvelteClientState.CONNECTED || IGNORE_CONNECTION}
<!-- The selected tab. -->
<div class="tab">
<svelte:component this="{tabs[currentTab]}" />
Expand Down
Binary file modified dashboard/src/assets/field22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dashboard/src/assets/field23.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dashboard/src/assets/field24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dashboard/src/components/NavBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<code class="nav-bar-connection-address" contenteditable on:blur="{onURIBlur}">{$NTURI}</code>

<!-- NT Connection Stats. -->
<code>{$NTBitrate}kb/s | {$NTLatency}ms</code>
<code>{($NTBitrate / 1000).toFixed(2)}kb/s | {$NTLatency.toFixed(2)}ms</code>
</div>
</div>
</div>
Expand Down
65 changes: 0 additions & 65 deletions dashboard/src/components/analysis/Field.svelte

This file was deleted.

166 changes: 0 additions & 166 deletions dashboard/src/components/analysis/LineGraph.svelte

This file was deleted.

Loading

0 comments on commit 16c830c

Please sign in to comment.