Scouting: Add supercharged nodes
Team update 21 added super charged nodes to
the game.
Signed-off-by: Filip Kujawa <filip.j.kujawa@gmail.com>
Change-Id: Ia9abf45891061144981c5d720bceb8aecc5a50d5
diff --git a/scouting/db/db.go b/scouting/db/db.go
index ca1af9e..9bd37b1 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -37,6 +37,7 @@
LowConesAuto, MiddleConesAuto, HighConesAuto, ConesDroppedAuto int32
LowCubes, MiddleCubes, HighCubes, CubesDropped int32
LowCones, MiddleCones, HighCones, ConesDropped int32
+ SuperchargedPieces int32
AvgCycle int64
DockedAuto, EngagedAuto, BalanceAttemptAuto bool
Docked, Engaged, BalanceAttempt bool
diff --git a/scouting/db/db_test.go b/scouting/db/db_test.go
index b0d34d8..269c28d 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -150,7 +150,7 @@
LowConesAuto: 1, MiddleConesAuto: 0, HighConesAuto: 2,
ConesDroppedAuto: 0, LowCubes: 1, MiddleCubes: 2,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 0, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "emma",
@@ -162,7 +162,7 @@
LowConesAuto: 2, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 1, MiddleCubes: 0,
HighCubes: 0, CubesDropped: 1, LowCones: 0,
- MiddleCones: 0, HighCones: 1, ConesDropped: 0,
+ MiddleCones: 0, HighCones: 1, ConesDropped: 0, SuperchargedPieces: 1,
AvgCycle: 0, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: true, Engaged: true,
BalanceAttempt: false, CollectedBy: "tyler",
@@ -174,7 +174,7 @@
LowConesAuto: 0, MiddleConesAuto: 2, HighConesAuto: 1,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 0,
HighCubes: 2, CubesDropped: 1, LowCones: 1,
- MiddleCones: 1, HighCones: 0, ConesDropped: 1,
+ MiddleCones: 1, HighCones: 0, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 0, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "isaac",
@@ -186,7 +186,7 @@
LowConesAuto: 1, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 0, LowCubes: 0, MiddleCubes: 1,
HighCubes: 2, CubesDropped: 1, LowCones: 0,
- MiddleCones: 1, HighCones: 0, ConesDropped: 0,
+ MiddleCones: 1, HighCones: 0, ConesDropped: 0, SuperchargedPieces: 0,
AvgCycle: 0, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "will",
@@ -198,7 +198,7 @@
LowConesAuto: 0, MiddleConesAuto: 1, HighConesAuto: 1,
ConesDroppedAuto: 1, LowCubes: 1, MiddleCubes: 0,
HighCubes: 0, CubesDropped: 2, LowCones: 1,
- MiddleCones: 1, HighCones: 0, ConesDropped: 1,
+ MiddleCones: 1, HighCones: 0, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 0, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: true, Engaged: false,
BalanceAttempt: false, CollectedBy: "unkown",
@@ -248,7 +248,7 @@
LowConesAuto: 1, MiddleConesAuto: 0, HighConesAuto: 2,
ConesDroppedAuto: 0, LowCubes: 1, MiddleCubes: 2,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 0, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "emma",
@@ -260,7 +260,7 @@
LowConesAuto: 2, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 1, MiddleCubes: 0,
HighCubes: 0, CubesDropped: 1, LowCones: 0,
- MiddleCones: 0, HighCones: 1, ConesDropped: 0,
+ MiddleCones: 0, HighCones: 1, ConesDropped: 0, SuperchargedPieces: 1,
AvgCycle: 0, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "tyler",
@@ -272,7 +272,7 @@
LowConesAuto: 1, MiddleConesAuto: 0, HighConesAuto: 2,
ConesDroppedAuto: 0, LowCubes: 1, MiddleCubes: 2,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 0, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: true, Engaged: false,
BalanceAttempt: true, CollectedBy: "emma",
@@ -329,7 +329,7 @@
LowConesAuto: 0, MiddleConesAuto: 2, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 1,
HighCubes: 2, CubesDropped: 1, LowCones: 1,
- MiddleCones: 0, HighCones: 1, ConesDropped: 2,
+ MiddleCones: 0, HighCones: 1, ConesDropped: 2, SuperchargedPieces: 0,
AvgCycle: 58, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: true, Engaged: true,
BalanceAttempt: false, CollectedBy: "unknown",
@@ -341,7 +341,7 @@
LowConesAuto: 0, MiddleConesAuto: 1, HighConesAuto: 0,
ConesDroppedAuto: 0, LowCubes: 2, MiddleCubes: 0,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 0,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 0, SuperchargedPieces: 1,
AvgCycle: 34, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: false, Docked: true, Engaged: false,
BalanceAttempt: false, CollectedBy: "simon",
@@ -353,7 +353,7 @@
LowConesAuto: 1, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 2,
HighCubes: 0, CubesDropped: 0, LowCones: 2,
- MiddleCones: 0, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 0, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 50, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "eliza",
@@ -365,7 +365,7 @@
LowConesAuto: 0, MiddleConesAuto: 2, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 1,
HighCubes: 2, CubesDropped: 1, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 49, DockedAuto: true, EngagedAuto: false,
Docked: false, Engaged: false, CollectedBy: "isaac",
},
@@ -376,7 +376,7 @@
LowConesAuto: 1, MiddleConesAuto: 1, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 1, MiddleCubes: 2,
HighCubes: 0, CubesDropped: 0, LowCones: 1,
- MiddleCones: 1, HighCones: 1, ConesDropped: 0,
+ MiddleCones: 1, HighCones: 1, ConesDropped: 0, SuperchargedPieces: 0,
AvgCycle: 70, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "sam",
@@ -391,7 +391,7 @@
LowConesAuto: 1, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 2,
HighCubes: 0, CubesDropped: 0, LowCones: 2,
- MiddleCones: 0, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 0, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 50, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "eliza",
@@ -403,7 +403,7 @@
LowConesAuto: 1, MiddleConesAuto: 1, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 1, MiddleCubes: 2,
HighCubes: 0, CubesDropped: 0, LowCones: 1,
- MiddleCones: 1, HighCones: 1, ConesDropped: 0,
+ MiddleCones: 1, HighCones: 1, ConesDropped: 0, SuperchargedPieces: 0,
AvgCycle: 70, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "sam",
@@ -683,7 +683,7 @@
LowConesAuto: 0, MiddleConesAuto: 0, HighConesAuto: 2,
ConesDroppedAuto: 1, LowCubes: 1, MiddleCubes: 2,
HighCubes: 1, CubesDropped: 0, LowCones: 2,
- MiddleCones: 0, HighCones: 2, ConesDropped: 1,
+ MiddleCones: 0, HighCones: 2, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 51, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "isaac",
@@ -695,7 +695,7 @@
LowConesAuto: 1, MiddleConesAuto: 1, HighConesAuto: 0,
ConesDroppedAuto: 0, LowCubes: 2, MiddleCubes: 2,
HighCubes: 1, CubesDropped: 0, LowCones: 1,
- MiddleCones: 0, HighCones: 2, ConesDropped: 1,
+ MiddleCones: 0, HighCones: 2, ConesDropped: 1, SuperchargedPieces: 1,
AvgCycle: 39, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "jack",
@@ -707,7 +707,7 @@
LowConesAuto: 2, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 2, MiddleCubes: 2,
HighCubes: 0, CubesDropped: 0, LowCones: 1,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 45, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "martin",
@@ -719,7 +719,7 @@
LowConesAuto: 2, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 2, MiddleCubes: 2,
HighCubes: 0, CubesDropped: 0, LowCones: 2,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 34, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: true, Engaged: false,
BalanceAttempt: false, CollectedBy: "unknown",
diff --git a/scouting/webserver/requests/messages/request_2023_data_scouting_response.fbs b/scouting/webserver/requests/messages/request_2023_data_scouting_response.fbs
index b472c58..341b012 100644
--- a/scouting/webserver/requests/messages/request_2023_data_scouting_response.fbs
+++ b/scouting/webserver/requests/messages/request_2023_data_scouting_response.fbs
@@ -24,6 +24,7 @@
middle_cones:int (id:16);
high_cones:int (id:17);
cones_dropped:int (id:18);
+ supercharged_pieces:int (id:29);
// Time in nanoseconds.
avg_cycle: int64 (id:19);
docked_auto: bool (id:20);
@@ -40,4 +41,4 @@
stats_list:[Stats2023] (id:0);
}
-root_type Request2023DataScoutingResponse;
+root_type Request2023DataScoutingResponse;
\ No newline at end of file
diff --git a/scouting/webserver/requests/messages/submit_actions.fbs b/scouting/webserver/requests/messages/submit_actions.fbs
index d8aa98d..d269788 100644
--- a/scouting/webserver/requests/messages/submit_actions.fbs
+++ b/scouting/webserver/requests/messages/submit_actions.fbs
@@ -12,7 +12,8 @@
enum ScoreLevel: short {
kLow,
kMiddle,
- kHigh
+ kHigh,
+ kSupercharged,
}
table AutoBalanceAction {
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 8646a30..ab12717 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -380,7 +380,7 @@
stat := db.Stats2023{TeamNumber: string(submitActions.TeamNumber()), MatchNumber: submitActions.MatchNumber(), SetNumber: submitActions.SetNumber(), CompLevel: string(submitActions.CompLevel()),
StartingQuadrant: 0, LowCubesAuto: 0, MiddleCubesAuto: 0, HighCubesAuto: 0, CubesDroppedAuto: 0,
LowConesAuto: 0, MiddleConesAuto: 0, HighConesAuto: 0, ConesDroppedAuto: 0, LowCubes: 0, MiddleCubes: 0, HighCubes: 0,
- CubesDropped: 0, LowCones: 0, MiddleCones: 0, HighCones: 0, ConesDropped: 0, AvgCycle: 0, CollectedBy: string(submitActions.CollectedBy()),
+ CubesDropped: 0, LowCones: 0, MiddleCones: 0, HighCones: 0, ConesDropped: 0, SuperchargedPieces: 0, AvgCycle: 0, CollectedBy: string(submitActions.CollectedBy()),
}
// Loop over all actions.
for i := 0; i < submitActions.ActionsListLength(); i++ {
@@ -460,6 +460,8 @@
stat.HighConesAuto += 1
} else if object == 1 && level == 2 && auto == false {
stat.HighCones += 1
+ } else if level == 3 {
+ stat.SuperchargedPieces += 1
} else {
return db.Stats2023{}, errors.New(fmt.Sprintf("Got unknown ObjectType/ScoreLevel/Auto combination"))
}
@@ -541,6 +543,7 @@
MiddleCones: stat.MiddleCones,
HighCones: stat.HighCones,
ConesDropped: stat.ConesDropped,
+ SuperchargedPieces: stat.SuperchargedPieces,
AvgCycle: stat.AvgCycle,
DockedAuto: stat.DockedAuto,
EngagedAuto: stat.EngagedAuto,
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index ac644ea..aa9cb1c 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -129,7 +129,7 @@
LowConesAuto: 1, MiddleConesAuto: 2, HighConesAuto: 1,
ConesDroppedAuto: 0, LowCubes: 1, MiddleCubes: 1,
HighCubes: 2, CubesDropped: 1, LowCones: 1,
- MiddleCones: 2, HighCones: 0, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 0, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 34, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: false, CollectedBy: "alex",
@@ -141,7 +141,7 @@
LowConesAuto: 0, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 0,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 53, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "bob",
@@ -214,7 +214,7 @@
LowConesAuto: 1, MiddleConesAuto: 2, HighConesAuto: 1,
ConesDroppedAuto: 0, LowCubes: 1, MiddleCubes: 1,
HighCubes: 2, CubesDropped: 1, LowCones: 1,
- MiddleCones: 2, HighCones: 0, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 0, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 34, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "isaac",
@@ -226,7 +226,7 @@
LowConesAuto: 0, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 0,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 53, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "unknown",
@@ -255,7 +255,7 @@
LowConesAuto: 1, MiddleConesAuto: 2, HighConesAuto: 1,
ConesDroppedAuto: 0, LowCubes: 1, MiddleCubes: 1,
HighCubes: 2, CubesDropped: 1, LowCones: 1,
- MiddleCones: 2, HighCones: 0, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 0, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 34, DockedAuto: true, EngagedAuto: false,
BalanceAttemptAuto: false, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "isaac",
@@ -267,7 +267,7 @@
LowConesAuto: 0, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 1, LowCubes: 0, MiddleCubes: 0,
HighCubes: 1, CubesDropped: 0, LowCones: 0,
- MiddleCones: 2, HighCones: 1, ConesDropped: 1,
+ MiddleCones: 2, HighCones: 1, ConesDropped: 1, SuperchargedPieces: 0,
AvgCycle: 53, DockedAuto: false, EngagedAuto: false,
BalanceAttemptAuto: true, Docked: false, Engaged: false,
BalanceAttempt: true, CollectedBy: "unknown",
@@ -368,6 +368,27 @@
},
{
ActionTaken: &submit_actions.ActionTypeT{
+ Type: submit_actions.ActionTypePickupObjectAction,
+ Value: &submit_actions.PickupObjectActionT{
+ ObjectType: submit_actions.ObjectTypekCube,
+ Auto: false,
+ },
+ },
+ Timestamp: 3500,
+ },
+ {
+ ActionTaken: &submit_actions.ActionTypeT{
+ Type: submit_actions.ActionTypePlaceObjectAction,
+ Value: &submit_actions.PlaceObjectActionT{
+ ObjectType: submit_actions.ObjectTypekCube,
+ ScoreLevel: submit_actions.ScoreLevelkSupercharged,
+ Auto: false,
+ },
+ },
+ Timestamp: 3900,
+ },
+ {
+ ActionTaken: &submit_actions.ActionTypeT{
Type: submit_actions.ActionTypeEndMatchAction,
Value: &submit_actions.EndMatchActionT{
Docked: true,
@@ -375,7 +396,7 @@
BalanceAttempt: true,
},
},
- Timestamp: 4000,
+ Timestamp: 4200,
},
},
}).Pack(builder))
@@ -394,8 +415,8 @@
LowConesAuto: 0, MiddleConesAuto: 0, HighConesAuto: 0,
ConesDroppedAuto: 0, LowCubes: 0, MiddleCubes: 0,
HighCubes: 0, CubesDropped: 0, LowCones: 0,
- MiddleCones: 0, HighCones: 1, ConesDropped: 0,
- AvgCycle: 1100, DockedAuto: true, EngagedAuto: true,
+ MiddleCones: 0, HighCones: 1, ConesDropped: 0, SuperchargedPieces: 1,
+ AvgCycle: 950, DockedAuto: true, EngagedAuto: true,
BalanceAttemptAuto: false, Docked: true, Engaged: false,
BalanceAttempt: true, CollectedBy: "katie",
}
diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index e304f2a..95387ad 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -177,6 +177,15 @@
>
LOW
</button>
+ <!-- Impossible to place supercharged pieces in auto. -->
+ <div *ngIf="autoPhase == false" class="d-grid gap-2">
+ <button
+ class="btn btn-dark"
+ (click)="changeSectionTo('Pickup'); addAction({type: 'placeObjectAction', scoreLevel: ScoreLevel.kSupercharged});"
+ >
+ SUPERCHARGED
+ </button>
+ </div>
<!-- 'Balancing' during auto. -->
<div *ngIf="autoPhase" class="d-grid gap-2">
<label>