fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
530 Commits 1 Branch 0 Tags
572e54b076cbfcc934cae74da44e04f3f2e829c5
Commit Graph
530 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Wu c2183a68a0 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 12:00:52 +12:00
David Wu 0fd4de7ec7 Fixed previously broken tests due to refactoring app. 
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.

#story[778]
 2017-04-25 12:00:44 +12:00
hba56 67b73ec1db Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-04-25 12:00:05 +12:00
Erika Savell 721fb5f28a Removed regatta xml creation from Event class into RegattaData class 
#story[778]
 2017-04-25 11:51:31 +12:00
hba56 4b5ebbd9e4 refactored networking code from networkingTest branch 
#story[778, 782]
 2017-04-25 11:50:22 +12:00
Erika Savell 7f2d8107b8 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-04-25 11:39:22 +12:00
David Wu d995d5df45 Fixed RegattaDataSource missing. 
-RegattaDataSource failed to push from before. It is now created and working.

#story[778]
 2017-04-25 11:28:28 +12:00
fjc40 2876eec1e4 Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data. 
#story[778]
 2017-04-25 11:24:33 +12:00
Joseph 22075ee415 Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861] 2017-04-25 02:13:57 +12:00
fjc40 bf5ea193af Mock App now passes an OutputStream into the "Event" class. This is where data is written to (i.e., writing data over tcp socket). 
Updated Event and Race class to write to this stream, and added some TODO notes which point out where we need to properly serialize messages, when merged with networking code.
 2017-04-24 21:53:51 +12:00
fjc40 2ce84e3be4 Added myself to the .mailmap file. 2017-04-24 20:23:29 +12:00
fjc40 091ee4735b Race.simulateRace() function now generates a BoatLocationMessage after updating the position of each boat. Currently we just print the message to stdout. 
Added functions to convert knots (as a double) to mm/sec (as an int) to BoatLocationMessage class.
Added toString function to BoatLocationMessage class.
Added a sequence number member to the BoatInRace class.
Added Knots to meters per second conversion factor to Contants class.

#story[788]
 2017-04-24 20:19:39 +12:00
hba56 49fc4ec02e added raceStatusDecpderTest and some debugging 
-added raceStatusDecpderTest
-fix a problem where the encoder method for race status added 4 bytes where it should have put 1
-added getters to the info in raceStatusDecoder
-fixed a problem with the values looked for in the decoder

#story[782]
 2017-04-23 21:18:38 +12:00
hba56 fdd994b7c0 finished the raceStatusDecoder 
-added a new boat status class

#story[782]
 2017-04-23 20:32:58 +12:00
zwu18 c5df90d276 Created RegattaDataSource and regattaTest.xml. 
-Event regattaData will now get data from the XML instead of having static data.

#story[778]
 2017-04-23 19:59:07 +12:00
hba56 23e007bd11 test for RaceStartStatusDecoder added 
-update to race start status decoder

#story[782]
 2017-04-23 19:43:45 +12:00
hba56 f5000eea11 added decoder test for courseWindDecoder 
-added test for coureswind decoder
-changed windID in raceVisionEncoder to byte as char is 2 bytes and can only transport 1

#story[778, 782]
 2017-04-23 13:29:46 +12:00
hba56 c9a968a5fd added decoder test for boatlocation 
-refactered networking test file structure
-boatlocationdecoder now makes a boatlocation message with its data
-boatlocationmessage sequence number changed to an int
-racevisionbyteencode changed device type to just be a byte
-fixed the short conversion in racevisionbyteencode
-added boatlocation decoder test

#story[778, 782]
 2017-04-23 12:20:05 +12:00
hba56 615115160d added decoders for avg wind, course wind and mark rounding 
-refactered networking test file structure
-added average wind decoder
-added course wind decoder
-added mark rounding decoder
-updated boat location decoder
-added true wind direction to the boatLocationMessage class
-added true wind direction to raceVisionByteEncoder method for boat location

#story[778, 782]
 2017-04-23 10:51:10 +12:00
hba56 43d087c764 Merge remote-tracking branch 'origin/networkingTest' into networkingTest 2017-04-21 17:41:32 +12:00
hba56 ec0747ab9a added decoders for race start status and race status 
-refactered decoders into own package
-added race status decoder
-added race start status decoder
-started on the boat location decoder

#story[778, 782]
 2017-04-21 17:41:18 +12:00
Fan-Wu Yang 1b18eff3db Added CRC to Encoder 
- Added CRC to Message Encoder
#story[778]
 2017-04-21 17:36:18 +12:00
Erika Savell 5304f7df7d removed problematic import 
#story[778]
 2017-04-21 17:11:56 +12:00
Erika Savell 3ff2a07680 Temporarily ignored some tests in mock 
#story[778]
 2017-04-21 17:08:28 +12:00
Erika Savell a7913a16f9 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:04:12 +12:00
Erika Savell 9764f448eb Added participants field to xml generator 
#story[778]
 2017-04-21 17:02:06 +12:00
Erika Savell c365d5a344 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 17:01:23 +12:00
David Wu 1d9b098f2b Create XML Object for regatta data. 
-Regatta data XML is generated in class Event.
-Regatta data is static as there isn't any information regarding it.

#story[778]
 2017-04-21 16:58:22 +12:00
Erika Savell fdba50f9d2 Added course limit, course and marker seq field to xml fiule of race info 
#story[778]
 2017-04-21 16:52:07 +12:00
Joseph Gardner 0d0b9e143f Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782] 2017-04-21 16:43:35 +12:00
hba56 ee24ecaadc Merge remote-tracking branch 'origin/networkingTest' into networkingTest 2017-04-21 16:30:55 +12:00
hba56 8e79164b69 updated encoder and decoder with test for decoder 
-added binary message decoder test
-updated binary message encoder
-updated binary message decoder
-added enum for message type

#story[778, 782]
 2017-04-21 16:30:39 +12:00
Fan-Wu Yang 82acf40dd6 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-21 16:23:53 +12:00
fjc40andFan-Wu Yang a1ab8347ca Added Encodings to RaceVisionByteEncoder 
- Added boatLocation Encoding
- Added markRounding Encoding
- Added courseWind Encoding
- Added averageWind Encoding
#story[778]
 2017-04-21 16:23:48 +12:00
David Wu 5397d14d3c Added sourceID to boats in race. 
-All boats in race will now have a sourceID.
-SourceID will be used in XML object for boat.

#story[778]
 2017-04-21 16:22:23 +12:00
Erika Savell 737755def6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 15:33:47 +12:00
Erika Savell 94ba18cf0c Began xml creator for race info message 
#story[778]
 2017-04-21 15:33:37 +12:00
hba56 655b5787a2 binary message encoder as well test for the decoder 
-added binary message encoder
-added test for the decoder
-bug with the sync number 2

#story[782]
 2017-04-21 14:22:47 +12:00
David Wu ec716058c6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 14:20:20 +12:00
David Wu 687ffb41e6 Create XML object of boat data. 
-XML object currently displaying out in terminal.
-Reads in data from RaceDataSource.
-TODO: Add sourceID to boats.

#story[778]
 2017-04-21 14:19:49 +12:00
fjc40 149c312080 Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock 2017-04-21 13:38:01 +12:00
Joseph Gardner 9e3ca68df8 added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782] 2017-04-21 13:28:55 +12:00
fjc40 9e1b3365bf Added helper functions to BoatLocationMessage which convert between the datatypes used by the message and datatypes used by our model. (Converts boat heading, wind angle, gps coordinate). 
#story[778]
 2017-04-21 13:19:49 +12:00
David Wu be59bb853c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:56 +12:00
David Wu 265bece9ed Added a heartbeat value to the race. 
-Heartbeat will display and update every 5 seconds.

#story[778]
 2017-04-21 13:10:46 +12:00
Erika Savell 33e3b3713c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:45 +12:00
Erika Savell 97c5c9662b Wrapped race in an event which sends out starting xml files 
#story[778]
 2017-04-21 13:10:30 +12:00
hba56 f56bb747a7 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-21 12:58:21 +12:00
hba56 a99f91a075 binary message decoder as well as refactor of xml encoder and decoder placement 
-added binary message decoder

#story[782]
 2017-04-21 12:58:11 +12:00
fjc40 ef53dee7fe Changed device type constants to bytes. 
#fix #story[778]
 2017-04-21 12:56:00 +12:00