c328c4f3bc
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
Joseph Gardner2017-04-25 16:06:24 +12:00
cb40302c13
Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
cbt242017-04-25 15:56:44 +12:00
1653003cf0
Implemented Leg generation from Race.xml format - StreamedCourse now utilises StreamedCourseXMLReader as data source
cbt242017-04-25 15:51:44 +12:00
0257b9e18c
Changed the temp tcp client and server to send packets made by us and other fixes
hba562017-04-25 15:34:49 +12:00
84c518f89f
Timer now shows and updates correctly on the start menu. #story[761]
Joseph Gardner2017-04-25 15:04:42 +12:00
b346e10774
Refactored Constructors - Constructors after adding AC35Data as a parent were failing as they took in an extra parameter story[782]
Fan-Wu Yang2017-04-25 14:43:37 +12:00
c0bf5b1641
Added Decoding testing and splitting - Binary Message Decoder now can determine whether the files are correct or not - Boat Location Message is now a extension of AC35Data which will be read by the TCPClient - Boat Status is now an extension of AC35Data which will be read by the TCPClient - CourseWind is now an extension of AC35Data which will be read by TCPClient - ValueOf static method added MessageType to assist in determining the packet that was received. - Race Message is now an extension of AC35Data which will be read by TCPClient - PacketDumpReader created to read the sample file that was provided. - AC35Packet has been made to store each Dumped file packet. - AC35 Data Dump has been added to resources/dataDumps as ac35.bin #story[782]
Fan-Wu Yang2017-04-25 14:26:58 +12:00
26380f2677
Merge branch 'story30_XMLs' into splitIntoTwoModules
Joseph Gardner2017-04-25 14:01:09 +12:00
3461a2c0b7
Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
Joseph Gardner2017-04-25 13:13:15 +12:00
858db3f45e
Fixed interface implementation for StreamedCourse #story[758]
cbt242017-04-25 13:08:57 +12:00
a59342a668
Modified RaceClock to support arbitrary start times - Amended RaceDataSource interface to require time instead of mark for calculating time. #story[758]
cbt242017-04-25 13:00:45 +12:00
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.
David Wu2017-04-25 12:00:44 +12:00
67b73ec1db
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
hba562017-04-25 12:00:05 +12:00
721fb5f28a
Removed regatta xml creation from Event class into RegattaData class
Erika Savell2017-04-25 11:51:31 +12:00
4b5ebbd9e4
refactored networking code from networkingTest branch
hba562017-04-25 11:50:22 +12:00
d995d5df45
Fixed RegattaDataSource missing. -RegattaDataSource failed to push from before. It is now created and working.
David Wu2017-04-25 11:28:28 +12:00
2876eec1e4
Added some exception classes to encapsulate the internal exceptions that can occur when sending Boat/race/regatta data.
fjc402017-04-25 11:24:33 +12:00
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]
Joseph2017-04-25 02:13:57 +12:00
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.
fjc402017-04-24 21:53:51 +12:00
2ce84e3be4
Added myself to the .mailmap file.
fjc402017-04-24 20:23:29 +12:00
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.
fjc402017-04-24 20:19:39 +12:00
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
hba562017-04-23 21:18:38 +12:00
fdd994b7c0
finished the raceStatusDecoder -added a new boat status class
hba562017-04-23 20:32:58 +12:00
c5df90d276
Created RegattaDataSource and regattaTest.xml. -Event regattaData will now get data from the XML instead of having static data.
zwu182017-04-23 19:59:07 +12:00
23e007bd11
test for RaceStartStatusDecoder added -update to race start status decoder
hba562017-04-23 19:43:45 +12:00
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
hba562017-04-23 13:29:46 +12:00
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
hba562017-04-23 12:20:05 +12:00
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
hba562017-04-23 10:51:10 +12:00
43d087c764
Merge remote-tracking branch 'origin/networkingTest' into networkingTest
hba562017-04-21 17:41:32 +12:00
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
hba562017-04-21 17:41:18 +12:00
1b18eff3db
Added CRC to Encoder - Added CRC to Message Encoder #story[778]
Fan-Wu Yang2017-04-21 17:36:18 +12:00
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.
David Wu2017-04-21 16:58:22 +12:00
fdba50f9d2
Added course limit, course and marker seq field to xml fiule of race info
Erika Savell2017-04-21 16:52:07 +12:00
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]
Joseph Gardner2017-04-21 16:43:35 +12:00
ee24ecaadc
Merge remote-tracking branch 'origin/networkingTest' into networkingTest
hba562017-04-21 16:30:55 +12:00
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
hba562017-04-21 16:30:39 +12:00
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.
David Wu2017-04-21 16:22:23 +12:00
94ba18cf0c
Began xml creator for race info message
Erika Savell2017-04-21 15:33:37 +12:00
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
hba562017-04-21 14:22:47 +12:00
687ffb41e6
Create XML object of boat data. -XML object currently displaying out in terminal. -Reads in data from RaceDataSource. -TODO: Add sourceID to boats.
David Wu2017-04-21 14:19:49 +12:00
149c312080
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
fjc402017-04-21 13:38:01 +12:00
9e3ca68df8
added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]
Joseph Gardner2017-04-21 13:28:55 +12:00
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).
fjc402017-04-21 13:19:49 +12:00
a99f91a075
binary message decoder as well as refactor of xml encoder and decoder placement -added binary message decoder
hba562017-04-21 12:58:11 +12:00
ef53dee7fe
Changed device type constants to bytes.
fjc402017-04-21 12:56:00 +12:00
421663c145
Added device type enumerations as static ints for BoatLocationMessage.
fjc402017-04-21 12:54:48 +12:00
1a085e881d
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
fjc402017-04-21 12:26:34 +12:00
8da67d1dbc
Added class to encapsulate a BoatLocationMessage.
fjc402017-04-21 12:25:57 +12:00
4dd173261c
Added functions to the RaceVisionByteEncoder - Encodes Race Status - Encodes displayTextMessage - Encodes raceStartStatus - Encodes yachtEventCode #story[778]
Fan-Wu Yang2017-04-21 12:24:21 +12:00
a85bf292d5
new branch for xml readers for the visuliser
Joseph Gardner2017-04-21 12:23:02 +12:00
231a1824d1
Condensed Race and ConstantVelocityRace into one class
Erika Savell2017-04-21 12:17:17 +12:00
34c0aec0b9
Mock race runs without an fx component
Erika Savell2017-04-21 10:47:15 +12:00
3326da4f5d
Started removing fx component from mock module.
Erika Savell2017-04-20 15:09:55 +12:00
9d9c491372
XML Message Decoder added with test -added XMLMessageDecoder to decode xml files from byte array -added test class for xml decoder -renamed getByteArray method to encode -made longToSixBytes private
hba562017-04-20 14:26:09 +12:00
79c5b93935
XML Message Encoder and tests class added -added XMLMessageEncoder to encode xml files into byte array -added test class for xml encoder -added regatta.xml to the test resources
hba562017-04-20 13:36:09 +12:00
669718d406
Cloned the main project into two submodules, mock and visualiser
Erika Savell2017-04-19 18:57:59 +12:00
d12f70c8f8
Merge remote-tracking branch 'origin/story_30' into story_30
cbt242017-04-19 18:08:35 +12:00
0f22cf81ef
Moved implementational details of generated races to ConstantVelocityRace. - Boat headings are now treated as a property, not a calculation #story[758]
cbt242017-04-19 18:08:27 +12:00
6046ba4cf1
Added Some Encoding functions for ByteStrem - Created Heart Beat encoding - Created race Status encoding - Create display Text encoding - Created race Start status encoding #story[778]
Fan-Wu Yang2017-04-19 17:55:04 +12:00
Erika Savell
Joseph Gardner
cbt24
hba56
Fan-Wu Yang
David Wu
fjc40