Skip to content

Commit

Permalink
Merge branch '2025-portsmouth' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodingMaster121
CodingMaster121 authored Mar 8, 2025
2 parents d51e29b + 8b82166 commit af0d12d
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 203 deletions.
141 changes: 1 addition & 140 deletions falconscoutcore/data/2025vapor_match_data.json
View file
Original file line number Diff line number Diff line change
@@ -1,142 +1,3 @@
[
{
"ScoutId": "Ryan",
"MatchKey": "qm1",
"Alliance": "blue",
"DriverStation": 3,
"TeamNumber": 4099,
"StartingPosition": "Far Coral Station",
"AutoLeave": true,
"ScoringSide": "Far Coral Station",
"AutoCoralL1": 0,
"AutoCoralL2": 0,
"AutoCoralL3": 0,
"AutoCoralL4": 4,
"AutoBarge": 0,
"AutoProcessor": 0,
"AutoNotes": "",
"TeleopCoralL1": 0,
"TeleopCoralL2": 0,
"TeleopCoralL3": 5,
"TeleopCoralL4": 5,
"TeleopAlgaeBarge": 0,
"TeleopAlgaeProcessor": 1,
"TeleopAlgaeRemoval": true,
"TeleopNotes": "",
"Parked": false,
"ClimbStatus": "Deep Climb",
"ClimbSpeed": "Fast (<5 seconds)",
"EndgameNotes": "",
"Disabled": false,
"StabilityRating": "Stable",
"RobotStyleType": "Offensive",
"DriverRating": "Very Fluid",
"IntakeDefenseRating": "",
"RatingNotes": ""
},
{
"ScoutId": "Ryan",
"MatchKey": "qm2",
"Alliance": "red",
"DriverStation": 1,
"TeamNumber": 4099,
"StartingPosition": "Middle",
"AutoLeave": true,
"ScoringSide": "Close Coral Station",
"AutoCoralL1": 1,
"AutoCoralL2": 0,
"AutoCoralL3": 0,
"AutoCoralL4": 3,
"AutoBarge": 0,
"AutoProcessor": 0,
"AutoNotes": "",
"TeleopCoralL1": 2,
"TeleopCoralL2": 3,
"TeleopCoralL3": 0,
"TeleopCoralL4": 5,
"TeleopAlgaeBarge": 0,
"TeleopAlgaeProcessor": 1,
"TeleopAlgaeRemoval": true,
"TeleopNotes": "",
"Parked": false,
"ClimbStatus": "Deep Climb",
"ClimbSpeed": "Average (5-10 seconds)",
"EndgameNotes": "",
"Disabled": false,
"StabilityRating": "Stable",
"RobotStyleType": "Offensive",
"DriverRating": "Fluid",
"IntakeDefenseRating": "Good",
"RatingNotes": ""
},
{
"ScoutId": "Ryan",
"MatchKey": "qm3",
"Alliance": "red",
"DriverStation": 1,
"TeamNumber": 4099,
"StartingPosition": "Middle",
"AutoLeave": false,
"ScoringSide": "Close Coral Station",
"AutoCoralL1": 1,
"AutoCoralL2": 0,
"AutoCoralL3": 0,
"AutoCoralL4": 2,
"AutoBarge": 0,
"AutoProcessor": 0,
"AutoNotes": "",
"TeleopCoralL1": 1,
"TeleopCoralL2": 0,
"TeleopCoralL3": 5,
"TeleopCoralL4": 5,
"TeleopAlgaeBarge": 0,
"TeleopAlgaeProcessor": 1,
"TeleopAlgaeRemoval": false,
"TeleopNotes": "",
"Parked": true,
"ClimbStatus": "No Climb",
"ClimbSpeed": "",
"EndgameNotes": "",
"Disabled": false,
"StabilityRating": "Stable",
"RobotStyleType": "Offensive",
"DriverRating": "Fluid",
"IntakeDefenseRating": "Very Good",
"RatingNotes": ""
},
{
"ScoutId": "Ryan",
"MatchKey": "qm4",
"Alliance": "blue",
"DriverStation": 3,
"TeamNumber": 4099,
"StartingPosition": "Middle",
"AutoLeave": true,
"ScoringSide": "Close Coral Station",
"AutoCoralL1": 1,
"AutoCoralL2": 0,
"AutoCoralL3": 0,
"AutoCoralL4": 2,
"AutoBarge": 0,
"AutoProcessor": 0,
"AutoNotes": "",
"TeleopCoralL1": 1,
"TeleopCoralL2": 0,
"TeleopCoralL3": 3,
"TeleopCoralL4": 5,
"TeleopAlgaeBarge": 0,
"TeleopAlgaeProcessor": 2,
"TeleopAlgaeRemoval": true,
"TeleopNotes": "",
"Parked": false,
"ClimbStatus": "Deep Climb",
"ClimbSpeed": "Slow (>10 seconds)",
"EndgameNotes": "",
"Disabled": false,
"StabilityRating": "Stable",
"RobotStyleType": "Offensive",
"DriverRating": "Very Fluid",
"IntakeDefenseRating": "Okay",
"RatingNotes": ""
}

]
Binary file removed scoutingapp/public/2024fieldMapBlue.png
View file
Binary file not shown.
Binary file added scoutingapp/public/3136.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed scoutingapp/public/coneSprite.png
View file
Binary file not shown.
25 changes: 0 additions & 25 deletions scoutingapp/public/coneSprite.svg
View file

This file was deleted.

Binary file removed scoutingapp/public/cubeSprite.png
View file
Binary file not shown.
12 changes: 0 additions & 12 deletions scoutingapp/public/cubeSprite.svg
View file

This file was deleted.

Binary file removed scoutingapp/public/fieldMapBlue.png
View file
Binary file not shown.
0 scoutingapp/src/components/img/gray.png → scoutingapp/public/gray.png
View file
File renamed without changes
2 changes: 2 additions & 0 deletions scoutingapp/src/components/img/Index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import {RobotImage} from "./RobotImage";
export {RobotImage}
35 changes: 13 additions & 22 deletions scoutingapp/src/components/img/RobotImage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import React, {useEffect, useState} from "react"
import { ComponentSetup } from "../interface"

export const emptyImage = <img
style={{height: "0px", alignItems: 'center', justifyContent: 'center', margin: "auto"}}
src={`./src/components/img/gray.png`}
style={{width: "80%", height: "80%", alignItems: 'center', justifyContent: 'center'}}
src='../gray.png'
alt={`Picture of robot`}
/>

export function RobotImage(props: ComponentSetup) {
Expand All @@ -13,29 +14,19 @@ export function RobotImage(props: ComponentSetup) {
useEffect(() => {
const interval = setInterval(() => {
if (robotNumber) {
fileExists(`./src/components/img/${robotNumber}.jpeg`).then((exists) => {
console.log("Exists => ", exists)
if (exists) {
setComponentInside(
<img
style={{ height: "300px", alignItems: 'center', justifyContent: 'center', margin: "auto"}}
src={`./src/components/img/${robotNumber}.jpeg`}
/>
)
} else {
setComponentInside(
<img
style={{ height: "0px", alignItems: 'center', justifyContent: 'center', margin: "auto"}}
src={`./src/components/img/gray.png`}
/>
)
}
});
setComponentInside(
<img
style={{ height: "300px", alignItems: 'center', justifyContent: 'center', margin: "auto"}}
src={`../${robotNumber}.jpeg`}
alt={`Image of robot ${robotNumber} not found.`}
/>
)
} else {
setComponentInside(
<img
style={{ height: "0px", alignItems: 'center', justifyContent: 'center', margin: "auto"}}
src={`./src/components/img/gray.png`}
style={{ height: "300px", alignItems: 'center', justifyContent: 'center', margin: "auto"}}
src={`../gray.png`}
alt={'Insert robot number above'}
/>
)
}
Expand Down
4 changes: 2 additions & 2 deletions scoutingapp/src/config/structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
},
{
"type": "IncrementNumberInput",
"text": "Auto Barge Cycles",
"text": "Auto Net Cycles",
"placeholder": [
"0"
],
Expand Down Expand Up @@ -223,7 +223,7 @@
},
{
"type": "IncrementNumberInput",
"text": "Teleop Barge Cycles",
"text": "Teleop Net Cycles",
"placeholder": [
"0"
],
Expand Down
2 changes: 1 addition & 1 deletion scoutingapp/src/getImagesTBA.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
if not (TBA_API_KEY and IMGUR_CLIENT_ID and IMGUR_ETAG and EVENT_KEY):
raise PermissionError("Some keys are missing! Go into code and insert your keys.")

FOLDER_PATH = './components/img'
FOLDER_PATH = 'public'

# Headers for the API request
TBA_HEADERS = {
Expand Down
27 changes: 27 additions & 0 deletions scoutingapp/src/image_errors.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
(122, 'Image not found.')
(346, 'Image not found.')
(401, 'Image not found.')
(422, 'Image not found.')
(619, 'Image not found.')
(836, 'Image not found.')
(977, 'Image not found.')
(1086, 'Image not found.')
(1793, 'Image not found.')
(1908, 'Image not found.')
(2028, 'Image not found.')
(2068, 'Image not found.')
(2363, 'Image not found.')
(2534, 'Image not found.')
(2890, 'Image not found.')
(2998, 'Image not found.')
(3072, 'Image not found.')
(3359, 'Image not found.')
(3939, 'Image not found.')
(4099, 'Image not found.')
(4286, 'Image not found.')
(4575, 'Image not found.')
(6194, 'Image not found.')
(6882, 'Image not found.')
(9214, 'Image not found.')
(10004, 'Image not found.')
(10499, 'Image not found.')
Binary file added scoutingapp/src/public/robotimages/3136.jpeg
View file
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 scoutingapp/src/registerServiceWorker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function register() {
}

window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
const swUrl = 'service-worker.js';

if (isLocalhost) {
// This is running on localhost. Lets check if a service worker still exists or not.
Expand Down

0 comments on commit af0d12d

Please sign in to comment.