diff --git a/README.md b/README.md
index 44bc08e..e3554b1 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,9 @@ Download the latest setup exe file from [github releases](https://github.com/FRC
2. Identify the path to the installed app. This path should be `C:\Users\[YOUR USERNAME HERE]\AppData\Local\Programs\Cougar-Dashboard\Cougar-Dashboard.exe`. If you can't find the app at that location, find the desktop shortcut to the dashboard app, right click and open properties, and you will find the path labelled **target**.
3. Edit the configuration file for the driver station app (this assumes the driver station app is already installed). See instructions here: [Official Instructions](https://docs.wpilib.org/en/stable/docs/software/driverstation/manually-setting-the-driver-station-to-start-custom-dashboard.html). When you replace the `DashboardCmdLine`, replace it with `""C:\Users\[YOUR USERNAME HERE]\AppData\Local\Programs\Cougar-Dashboard\Cougar-Dashboard.exe""`, or whichever path you identified in step 2.
-### Changing Team Number
+## Configuration
+
+#### Changing Team Number
To change the team number, you need to edit the configuration file (or create one).
@@ -29,6 +31,15 @@ To change the team number, you need to edit the configuration file (or create on
}
```
+#### Changing Camera Feeds
+
+```json
+{
+ "primary": "http://10.25.39.11:5800",
+ "secondary": "http://10.25.39.12:5800"
+}
+```
+
## Testing and Development
Development requires a local repo clone, [node.js](https://nodejs.org/en/), and `npm`.
diff --git a/package.json b/package.json
index 3441f58..c556c7b 100644
--- a/package.json
+++ b/package.json
@@ -1,38 +1,39 @@
{
- "name": "Cougar-Dashboard",
- "author": "FRC Team 2539",
- "version": "0.3.3",
- "main": "public/electron.js",
- "scripts": {
- "dev": "vite",
- "build": "vite build",
- "serve": "vite preview",
- "electron-dev": "concurrently \"npm run dev\" \"electron .\"",
- "electron-pack": "electron-builder",
- "release": "vite build && electron-builder"
- },
- "dependencies": {
- "@tailwindcss/forms": "^0.2.1",
- "electron-is-dev": "^2.0.0",
- "electron-store": "^8.0.1",
- "preact": "^10.5.13"
- },
- "devDependencies": {
- "@preact/preset-vite": "^2.0.0",
- "autoprefixer": "^10.2.5",
- "concurrently": "^6.2.0",
- "electron": "^13.0.1",
- "electron-builder": "^22.10.5",
- "postcss": "^8.2.8",
- "tailwindcss": "^2.0.3",
- "vite": "^2.1.0"
- },
- "build": {
- "files": [
- "./build/**/*",
- "./build/icon.*",
- "./public/electron.js",
- "./public/preload.js"
- ]
- }
+ "name": "Cougar-Dashboard",
+ "author": "FRC Team 2539",
+ "version": "0.3.4",
+ "main": "public/electron.js",
+ "scripts": {
+ "dev": "vite",
+ "build": "vite build",
+ "serve": "vite preview",
+ "electron-dev": "concurrently \"npm run dev\" \"electron .\"",
+ "electron-pack": "electron-builder",
+ "release": "vite build && electron-builder"
+ },
+ "dependencies": {
+ "@tailwindcss/forms": "^0.2.1",
+ "electron-is-dev": "^2.0.0",
+ "electron-store": "^8.0.1",
+ "preact": "^10.5.13"
+ },
+ "devDependencies": {
+ "@preact/preset-vite": "^2.0.0",
+ "autoprefixer": "^10.2.5",
+ "concurrently": "^6.2.0",
+ "electron": "^13.0.1",
+ "electron-builder": "^22.10.5",
+ "postcss": "^8.2.8",
+ "tailwindcss": "^2.0.3",
+ "vite": "^2.1.0"
+ },
+ "build": {
+ "files": [
+ "./build/**/*",
+ "./build/icon.*",
+ "./public/electron.js",
+ "./public/preload.js"
+ ]
+ }
}
+
diff --git a/public/electron.js b/public/electron.js
index fe6d4e4..91262bb 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -15,6 +15,12 @@ const Store = require("electron-store")
const schema = {
team: {
type: "string"
+ },
+ primary: {
+ type: "string"
+ },
+ secondary: {
+ type: "string"
}
}
@@ -71,6 +77,17 @@ function createWindow() {
win.setTitle(title)
})
+ ipcMain.handle("get-camera-ip", async (event, cameraKey) => {
+ switch (cameraKey) {
+ case "primary":
+ return await store.get("primary", "http://10.25.39.11:5800")
+ case "secondary":
+ return await store.get("secondary", "http://10.25.39.12:5800")
+ default:
+ return await store.get(cameraKey, "")
+ }
+ })
+
ipcMain.handle("get-team-number", async (event, args) => {
return await store.get("team", "2539")
})
diff --git a/public/preload.js b/public/preload.js
index cd84041..a155708 100644
--- a/public/preload.js
+++ b/public/preload.js
@@ -3,5 +3,6 @@ const { contextBridge, ipcRenderer } = require('electron')
contextBridge.exposeInMainWorld("api", {
getTeamNumber: () => ipcRenderer.invoke("get-team-number"),
setWindowTitle: (title) => ipcRenderer.send("set-title", title),
+ getCameraIP: (cameraKey) => ipcRenderer.invoke("get-camera-ip", cameraKey),
handleConnect: (callback) => ipcRenderer.on("connect", (_, mode) => callback(mode))
})
\ No newline at end of file
diff --git a/src/components/camerafeed.jsx b/src/components/camerafeed.jsx
index ed31030..380a4dd 100644
--- a/src/components/camerafeed.jsx
+++ b/src/components/camerafeed.jsx
@@ -1,21 +1,21 @@
import { Component } from "preact"
export default class CameraFeed extends Component {
- constructor(props) {
- super(props)
+ constructor(props) {
+ super(props)
- this.ip = this.props.cameraIP
+ this.isThumbnail = this.props.isThumbnail
+ }
- this.isThumbnail = this.props.isThumbnail
- }
+ render() {
+ let className =
+ "max-h-full m-auto " + (this.isThumbnail ? "" : "h-full")
- render() {
- let className = "max-h-full m-auto " + (this.isThumbnail ? "" : "h-full")
+ return (
+
+
+
-
-