diff --git a/dawn/main/ansible/Ansible.js b/dawn/main/ansible/Ansible.js index 32df11b0..bad8d0f7 100644 --- 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 index 2f32fc2f..fc95b113 100644 --- 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} `,