[Dawn] Dynamic Team Flag

pioneers · Apr 15, 2017 · 5f5c594 · 5f5c594
1 parent 5b072ab
commit 5f5c594
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dawn/main/ansible/Ansible.js b/dawn/main/ansible/Ansible.js
@@ -17,6 +17,7 @@ import {
 } from '../../renderer/actions/InfoActions';
 import { updatePeripherals } from '../../renderer/actions/PeripheralActions';
 import { uploadStatus, robotState, Logger, defaults } from '../../renderer/utils/utils';
+import { stationNumber } from './LCM';
 
 const dawnBuilder = ProtoBuf.loadProtoFile(`${__dirname}/ansible.proto`);
 const DawnData = dawnBuilder.build('DawnData');
@@ -59,7 +60,7 @@ function buildProto(data) {
   return new DawnData({
     student_code_status: status,
     gamepads,
-    team_color: 0,
+    team_color: (stationNumber < 2) ? DawnData.TeamColor.BLUE : DawnData.TeamColor.GOLD,
   });
 }
 

diff --git a/dawn/renderer/reducers/FieldStore.js b/dawn/renderer/reducers/FieldStore.js
@@ -2,7 +2,6 @@ import { ActionTypes } from '../constants/Constants';
 import { stationNumber } from '../../main/ansible/LCM';
 
 const initialFieldState = {
-  rIsBlue: stationNumber < 2,
   rTeamNumber: 0,
   rTeamName: 'Unknown',
   rStationTag: (stationNumber < 2) ? `Blue ${stationNumber + 1} ` : `Gold ${stationNumber - 1} `,