diff --git a/2023/CU_Pit_config.js b/2023/CU_Pit_config.js index daddca160..c205742d7 100644 --- a/2023/CU_Pit_config.js +++ b/2023/CU_Pit_config.js @@ -8,7 +8,7 @@ var config_data = ` "code": "t", "type": "number" }, - { "name": "Width", + { "name": "Width (bumpers included)", "code": "wid", "type": "number", "defaultValue": "0" @@ -24,7 +24,6 @@ var config_data = ` "choices": { "s": "Swerve
", "w": "West Coast/Tank
", - "b": "Butterfly/Grashopper
", "m": "Mechanum
", "o": "Other" }, @@ -36,14 +35,13 @@ var config_data = ` "size": 20, "maxSize": 50 }, - { "name": "Swerve Ratio", + { "name": "Swerve Ratio (speed)", "code": "sr", "type": "radio", "choices": { - "1": "L1
", - "2": "L2
", - "3": "L3
", - "4": "L4
", + "1": "L1 (8.14:1 or 12-13 ft/sec)
", + "2": "L2 (6.75:1 or 14-16 ft/sec)
", + "3": "L3 (6.12:1 or 16-18 ft/sec)
", "x": "Not Swerve" }, "defaultValue":"x" @@ -59,20 +57,82 @@ var config_data = ` }, "defaultValue":"x" }, - { "name": "Floor pickup Cones", - "code": "fco", - "type": "bool" + { "name": "Game piece pick up location", + "code": "pul", + "type":"radio", + "choices": { + "d": "Double Substation only
", + "s": "Single Substation
", + "f": "Floor pick-up only
", + "b": "All locations
", + "x": "Can not manipulate game pieces" + }, + "defaultValue": "x" + }, + { "name": "Floor pick up", + "code": "fpu", + "type":"radio", + "choices": { + "u": "Cubes only
", + "o": "Cones only
", + "b": "Both
", + "x": "Can not manipulate game pieces" + }, + "defaultValue": "x" }, - { "name": "Floor pickup Cubes", - "code": "fcu", - "type": "bool" + { "name": "Cone pick up orientation
from floor", + "code": "coo", + "type": "radio", + "choices": { + "u": "Upright only
", + "s": "On side only
", + "a": "All orientation
", + "x": "Cannot pick up
cones off the floor" + }, + "defaultValue":"x" }, - { "name": "Cross Charging Station", - "code": "ccs", - "type": "bool" + { "name": "Auton Start Positions
(include all options)
(if can start from anywhere, leave blank)", + "code": "asp", + "type": "clickable_image", + "filename": "2023/field_image.png", + "shape": "circle 5 black red true" + }, + { "name": "Auton Scoring
(highest scoring option)", + "code": "as", + "type": "clickable_image", + "filename": "2023/grid_image.png", + "dimensions": "9 4", + "clickRestriction": "onePerBox", + "toggleClick": "true", + "showFlip": "false", + "showUndo": "false", + "shape": "circle 12 black red true" + }, + { "name": "Confidence engaging in auton", + "code": "aec", + "type":"radio", + "choices": { + "1": "1 (not tested at all, no confidence)
", + "2": "2
", + "3": "3
", + "4": "4
", + "5": "5 (highly tested, repeatable)
", + "x": "Cannot engage in auton" + }, + "defaultValue": "x" + }, + { "name": "Teleop scoring ability
(bottom, middle, top, or all rows)", + "code": "ts", + "type": "text", + "size": 20, + "maxSize": 250 + }, + { "name": "# of cycles on teleop", + "code": "tc", + "type": "counter" }, - { "name": "Autos", - "code": "aut", + { "name": "Comments", + "code": "co", "type": "text", "size": 20, "maxSize": 250 diff --git a/2023/CU_config.js b/2023/CU_config.js index 81fcdc2aa..103cc7b02 100644 --- a/2023/CU_config.js +++ b/2023/CU_config.js @@ -1,30 +1,27 @@ var config_data = ` { - "title": "Scouting PASS 2023", - "page_title": "Charged Up", + "title": "Scouting PASS 2023-24 FTC edition", + "page_title": "Centerstage", "checkboxAs": "10", "prematch": [ - { "name": "Scouter Initials", + { "name": "Scouter Name", "code": "s", "type": "scouter", "size": 5, - "maxSize": 5, + "maxSize": 15, "required": "true" }, { "name": "Event", "code": "e", "type": "event", - "defaultValue": "2022carv", - "required": "true", - "disabled": "true" + "required": "true" }, { "name": "Match Level", "code": "l", "type": "level", "choices": { - "qm": "Quals
", - "de": "Double Elimination
", - "f": "Finals" + "qm": "Qualifications
", + "de": "Eliminations" }, "defaultValue": "qm", "required": "true" @@ -36,18 +33,18 @@ var config_data = ` "max": 100, "required": "true" }, - { "name": "Robot", + { "name": "Robot Position", "code": "r", "type": "robot", "choices": { - "r1": "Red-1", - "b1": "Blue-1
", - "r2": "Red-2", - "b2": "Blue-2
", - "r3": "Red-3", - "b3": "Blue-3" - }, - "required":"true" + "r1": "Red backdrop", + "b1": "Blue backdrop
", + "r2": "Red landing zone", + "b2": "Blue landing zone
", + "r3": " ", + "b3": " " + }, + "required": "true" }, { "name": "Team #", "code": "t", @@ -55,166 +52,88 @@ var config_data = ` "min": 1, "max": 99999 }, - { "name": "Auto Start Position", + { "name": "Are they using
a pixel or team prop?", + "code": "spi", + "type": "radio", + "choices": { + "px": "Pixel", + "tp": "Team Prop" + }, + "defaultValue": "px" + }, + { "name": "Is their robot
on the field?", "code": "as", - "type": "clickable_image", - "filename": "2023/field_image.png", - "clickRestriction": "one", - "shape": "circle 5 black red true" - } + "type": "bool" + } ], "auton": [ - { "name": "Auto Scoring", - "code": "asg", - "type": "clickable_image", - "filename": "2023/grid_image.png", - "dimensions": "9 4", - "clickRestriction": "onePerBox", - "toggleClick": "true", - "showFlip": "false", - "showUndo": "false", - "shape": "circle 12 black red true" - }, - { "name": "Crossed Cable", - "code": "acc", - "type": "bool" - }, - { "name": "Crossed Charging Station", - "code": "acs", - "type": "bool" - }, - { "name": "Mobility?", - "code": "am", - "type": "bool" - }, - { "name": "Docked", - "code": "ad", - "type":"radio", - "choices": { - "d": "Docked (not Engaged)
", - "e": "Engaged
", - "a": "Attempted but failed
", - "x": "Not attempted" - }, - "defaultValue": "x" - } + { "name": "Did the robot park
in the Backstage?", + "code": "prk", + "type": "bool" + }, + { "name": "Purple pixel on
randomized line", + "code": "plr", + "type": "bool" + }, + { "name": "Yellow pixel on
correct Backdrop position", + "code": "ybr", + "type": "bool" + }, + { "name": "All pixels they placed
in the Backdrop", + "code": "abd", + "type": "counter" + }, + { "name": "All pixels they placed
in the Backstage", + "code": "abs", + "type": "counter" + } ], "teleop": [ - { "name": "Cycle Timer", - "code": "tct", - "type": "cycle" - }, - { "name": "Grid Scoring", - "code": "tsg", - "type": "clickable_image", - "filename": "2023/grid_image.png", - "dimensions": "9 4", - "clickRestriction": "onePerBox", - "toggleClick": "true", - "showFlip": "false", - "showUndo": "false", - "shape": "circle 12 black red true", - "cycleTimer": "tct" - }, - { "name": "Feeder Count
(Fed another bot)", - "code": "tfc", - "type": "counter", - "cycleTimer": "tct" - }, - { "name": "Was Fed
Game Pieces", - "code": "wf", - "type": "bool" + { "name": "Pixel's placed on
Backdrop in teleop", + "code": "tbd", + "type": "counter" }, - { "name": "Was Defended", - "code": "wd", - "type": "bool" - }, - { "name": "Who Defended this bot", - "code": "who", - "type": "text" - }, - { "name": "Smart Placement
(creates Links)", - "code": "lnk", - "type": "bool" + { "name": "Pixels placed in
Backstage in teleop", + "code": "tbs", + "type": "counter" }, - { "name": "Floor Pickup", - "code": "fpu", + { "name": "Lines crossed on
the backdrop", + "code": "bdl", "type": "radio", - "choices": { - "o": "Cones
", - "u": "Cubes
", - "b": "Both
", - "x": "Not Attempted" - }, - "defaultValue": "x" + "choices": { + "l0": "No lines
", + "l1": "First line
", + "l2": "Second line
", + "l3": "Third line" + }, + "defaultValue": 0 } ], "endgame": [ - { "name": "Docking Timer", - "code": "dt", - "type": "timer" - }, - { "name": "Final Status", - "code": "fs", + { "name": "Final Position", + "code": "fp", "type":"radio", "choices": { - "p": "Parked
", - "d": "Docked (Not Engaged)
", - "e": "Engaged
", - "a": "Attempted but failed
", - "x": "Not attempted" + "p": "Parked in the Backstage
", + "s": "Suspended from the rigging
", + "a": "Attempted suspension
", + "x": "No special position" }, "defaultValue": "x" }, - { "name": "Total # of alliance
robots docked/engaged", - "code": "dn", - "type": "counter" + { "name": "Drone launch zone", + "code": "dlz", + "type": "radio", + "choices": { + "z0": "No drone launch
", + "z1": "Zone 1
", + "z2": "Zone 2
", + "z3": "Zone 3" + }, + "defaultValue": "z0" } ], "postmatch": [ - { "name": "Driver Skill", - "code": "ds", - "type": "radio", - "choices": { - "n": "Not Effective
", - "a": "Average
", - "v": "Very Effective
", - "x": "Not Observed" - }, - "defaultValue": "x" - }, - { "name": "Links Scored", - "code": "ls", - "type": "counter" - }, - { "name": "Defense Rating", - "code": "dr", - "type": "radio", - "choices": { - "b": "Below Average
", - "a": "Average
", - "g": "Good
", - "e": "Excellent
", - "x": "Did not play defense" - }, - "defaultValue": "x" - }, - { "name": "Swerve drive?", - "code": "sd", - "type": "bool" - }, - { "name": "Speed Rating", - "code": "sr", - "type": "radio", - "choices": { - "1": "1 (slow)
", - "2": "2
", - "3": "3
", - "4": "4
", - "5": "5 (fast)" - }, - "defaultValue":"3" - }, { "name": "Died/Immobilized", "code": "die", "type": "bool" @@ -223,20 +142,19 @@ var config_data = ` "code": "tip", "type": "bool" }, - { "name": "Dropped Cones (>2)", - "code": "dc", - "type": "bool" - }, - { "name": "Make good
alliance partner?", - "tooltip": "Would you want this robot on your alliance in eliminations?", - "code": "all", + { "name": "Dropped Pixels (>4)", + "code": "dp", "type": "bool" }, + { "name": "Many penalties? (noticable)", + "code": "p", + "type": "bool" + }, { "name": "Comments", "code": "co", "type": "text", "size": 15, - "maxSize": 50 + "maxSize": 100000 } ] }`; diff --git a/resources/js/TBAInterface.js b/resources/js/TBAInterface.js index 8887e1e4b..25640bd5b 100644 --- a/resources/js/TBAInterface.js +++ b/resources/js/TBAInterface.js @@ -32,7 +32,7 @@ function getTeams(eventCode) { function getSchedule(eventCode) { if (authKey) { var xmlhttp = new XMLHttpRequest(); - var url = "https://www.thebluealliance.com/api/v3/event/" + eventCode + "/matches/simple"; + var url = "https://www.thebluealliance.com/api/v3/event/" + eventCode + "/teams/simple"; xmlhttp.open("GET", url, true); xmlhttp.setRequestHeader("X-TBA-Auth-Key", authKey); xmlhttp.onreadystatechange = function() {