Merge "Fix logger message bridge config for images"
diff --git a/scouting/scouting_test.ts b/scouting/scouting_test.ts
index c3a1c6e..f400430 100644
--- a/scouting/scouting_test.ts
+++ b/scouting/scouting_test.ts
@@ -71,8 +71,8 @@
await expectReviewFieldToBe('Attempted to Climb', 'No');
// Validate Defense.
- await expectReviewFieldToBe('Defense Played On Rating', '3');
- await expectReviewFieldToBe('Defense Played Rating', '3');
+ await expectReviewFieldToBe('Defense Played On Rating', '0');
+ await expectReviewFieldToBe('Defense Played Rating', '0');
// TODO(phil): Submit data and make sure it made its way to the database
// correctly. Right now the /requests/submit/data_scouting endpoint is not
diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 1fb672f..4c94670 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -27,8 +27,8 @@
teleUpperShotsMade: number = 0;
teleLowerShotsMade: number = 0;
teleShotsMissed: number = 0;
- defensePlayedOnScore: number = 3;
- defensePlayedScore: number = 3;
+ defensePlayedOnScore: number = 0;
+ defensePlayedScore: number = 0;
level: Level;
proper: boolean = false;
climbed: boolean = false;
@@ -58,14 +58,6 @@
this.level = 'Transversal';
}
- defensePlayedOnSlider(event) {
- this.defensePlayedOnScore = event.target.value;
- }
-
- defensePlayedSlider(event) {
- this.defensePlayedScore = event.target.value;
- }
-
setClimbedTrue() {
this.climbed = true;
}
diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index 257b40a..aa89105 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -71,19 +71,28 @@
<div *ngSwitchCase="'Climb'" id="climb" class="container-fluid">
<div class="row">
<form>
- <input (click)="setClimbedFalse()" type="radio" name="climbing" id="continue"><label for="continue">Kept Shooting</label><br>
- <input (click)="setClimbedTrue()" type="radio" name="climbing" id="climbed"><label for="climbed">Attempted to Climb</label><br>
+ <input [ngModel]="climbed" (click)="setClimbedFalse()" type="radio" name="climbing" id="continue" value="true">
+ <label for="continue">Kept Shooting</label><br>
+ <input [ngModel]="climbed" (click)="setClimbedTrue()" type="radio" name="climbing" id="climbed" value="false">
+ <label for="climbed">Attempted to Climb</label><br>
</form>
</div>
<div *ngIf="climbed">
<h4>Bar Made</h4>
<form>
- <input (click)="setLow()" type="radio" name="level" id="low"><label for="low">Low</label><br>
- <input (click)="setMedium()" type="radio" name="level" id="medium"><label for="medium">Medium</label><br>
- <input (click)="setHigh()" type="radio" name="level" id="high"><label for="high">High</label><br>
- <input (click)="setTransversal()" type="radio" name="level" id="transversal"><label for="transversal">Transversal</label><br>
- <input (click)="toggleProper()" type="checkbox" id="proper"><label for="proper">~10 seconds to attempt next level?</label>
- <input (click)="setFailed()" type="radio" name="level" id="failed"><label for="failed">Failed</label><br>
+ <input [ngModel]="level" (click)="setLow()" type="radio" name="level" id="low" value="Low">
+ <label for="low">Low</label><br>
+ <input [ngModel]="level" (click)="setMedium()" type="radio" name="level" id="medium" value="Medium">
+ <label for="medium">Medium</label><br>
+ <input [ngModel]="level" (click)="setHigh()" type="radio" name="level" id="high" value="High">
+ <label for="high">High</label><br>
+ <input [ngModel]="level" (click)="setTransversal()" type="radio" name="level" id="transversal" value="Transversal">
+ <label for="transversal">Transversal</label><br>
+ <input [ngModel]="level" (click)="setFailed()" type="radio" name="level" id="failed" value="Failed">
+ <label for="failed">Failed</label><br>
+
+ <input (click)="toggleProper()" type="checkbox" id="proper">
+ <label for="proper">~10 seconds to attempt next level?</label>
</form>
</div>
<div class="row">
@@ -105,7 +114,7 @@
</div>
<div class="col">
- <input type="range" min="0" max="5" value="0" (input)="defensePlayedOnSlider($event)">
+ <input type="range" min="0" max="5" value="0" [(ngModel)]="defensePlayedOnScore">
</div>
<div class="col">
@@ -124,7 +133,7 @@
</div>
<div class="col">
- <input type="range" min="0" max="5" value="0" (input)="defensePlayedSlider($event)">
+ <input type="range" min="0" max="5" value="0" [(ngModel)]="defensePlayedScore">
</div>
<div class="col">
diff --git a/y2022/y2022_roborio.json b/y2022/y2022_roborio.json
index b16f0cb..e342094 100644
--- a/y2022/y2022_roborio.json
+++ b/y2022/y2022_roborio.json
@@ -211,13 +211,19 @@
"num_senders": 2,
"logger": "LOCAL_AND_REMOTE_LOGGER",
"logger_nodes": [
- "imu"
+ "imu",
+ "logger"
],
"destination_nodes": [
{
"name": "imu",
"priority": 5,
- "time_to_live": 5000000
+ "time_to_live": 50000000
+ },
+ {
+ "name": "logger",
+ "priority": 5,
+ "time_to_live": 50000000
}
]
},