Commit Graph
239 Commits
Author SHA1 Message Date
Fan-Wu Yang 8223ae46a1 Fixed some issues
- Fixed issue where everything was inputted as an integer when converting to a byte array.
- Seperated loops that are used often to make it more readable.
#story[782]
2017-04-25 20:25:56 +12:00
Fan-Wu Yang 413ab7b768 Added Tests for bytesToLong
- Tested for Bytes to long
- Fixed little endian and big endian being thewrong way around.
#story[782]
2017-04-25 19:57:14 +12:00
Fan-Wu Yang df871b1242 Added tests to fix ByteConverter
- Integers cutting and chopping now works
- Integer to bytes word
- bytes to integer also work
#story[782]
2017-04-25 19:40:20 +12:00
Fan-Wu Yang be9f02997e Fixed issue where the new XML Decoder funtion was changed
- Changed String XML Message to InputSource
#story[782]
2017-04-25 18:36:39 +12:00
Fan-Wu Yang 7b4a428574 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-25 18:29:11 +12:00
Fan-Wu Yang 7d7564ce15 Added being able to decode everything into their respective classes
- Made classes for Heartbeat message, race status message, xml messag,e racestartstatus message, boat location message, mark rounding message, course wind message, average wind message.
- Made a statci calculation class for calculating bytes to int or long
- Message Decoder now kinda works!
#story[782]
2017-04-25 18:29:05 +12:00
hba56 0257b9e18c Changed the temp tcp client and server to send packets made by us and other fixes
-xmlmessagedecoder now outputs a inputsource for the vis team
-tests fixed for the new xmlmessagedecoder
-tcpclient now generates a packet encoded by our methods and sends it
-tcpserver now recieves a packet encoded by us and prints out some of its info

#story[778, 782]
2017-04-25 15:34:49 +12:00
Fan-Wu Yang b346e10774 Refactored Constructors
- Constructors after adding AC35Data as a parent were failing as they took in an extra parameter
story[782]
2017-04-25 14:43:37 +12:00
Fan-Wu Yang 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]
2017-04-25 14:26:58 +12:00
hba56 d960bc67a2 refactored networking code
#story[778, 782]
2017-04-25 12:11:08 +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
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
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
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
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
Fan-Wu Yang c63c6a3c77 Added Encoding to RaceVisionByteEncoder
- Added chatterText
2017-04-21 12:51:48 +12:00
fjc40andFan-Wu Yang a7e0ffae42 Added class to encapsulate a BoatLocationMessage.
#story[778]
2017-04-21 12:43:36 +12:00
Fan-Wu Yang 54a2c08258 Added RaceVisionByteEncoder
- Encodes heartBeat
- Encodes raceStatus
- Encodes displayTextMessage
- Encodes raceStartStatus
- Encodes yachtEventCode
#story[778]
2017-04-21 12:27:34 +12:00
Fan-Wu Yang 4dd173261c Added functions to the RaceVisionByteEncoder
- Encodes Race Status
- Encodes displayTextMessage
- Encodes raceStartStatus
- Encodes yachtEventCode
#story[778]
2017-04-21 12:24:21 +12:00
hba56 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

#story[778, 782]
2017-04-20 14:26:09 +12:00
hba56 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

#story[778, 782]
2017-04-20 13:36:09 +12:00
Fan-Wu Yang 4ba9331528 Merge branch 'networkingTest' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into networkingTest 2017-04-19 17:55:10 +12:00
Fan-Wu Yang 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]
2017-04-19 17:55:04 +12:00
hba56 8384b1a2ef updated .xmls in the format used by AC35
#story[778, 782]
2017-04-19 16:25:19 +12:00
hba56 b5bd1c9d6d updated to have main methods for the server and client
#story[778, 782]
2017-04-19 15:04:29 +12:00
hba56 43af929701 Started a new branch for the networking side of story 29, 30
-added a basic tcp server and client

#story[778, 782]
2017-04-19 15:00:52 +12:00
Erika Savell 028cb33509 Fixing fxml problems
#story[760]
2017-04-19 13:52:00 +12:00
Erika Savell 374b31f5c0 Disabled scale buttons once one has been clicked
#story[760]
2017-04-19 13:41:33 +12:00
Erika Savell b1e55f8c7d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28 2017-04-19 13:40:40 +12:00
Erika Savell dc32868227 Created countdown clock on start screen.
#story[760]
2017-04-19 13:35:02 +12:00
Joseph Gardner fc15c3d151 Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759] 2017-04-19 13:09:45 +12:00
hba56 f5472bf595 Merge remote-tracking branch 'remotes/origin/master' into story28
-anchors now fills stage
-added time label

# Conflicts:
#	pom.xml
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/resources/scenes/racepane.fxml

#pair[fwy13, hba56]
#story[761]
2017-04-19 13:08:06 +12:00
hba56 edabe58b03 Merge remote-tracking branch 'remotes/origin/master' into story28
-anchors now fills stage
-added time label

# Conflicts:
#	pom.xml
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/resources/scenes/racepane.fxml

#pair[fwy13, hba56]
#story[761]
2017-04-19 12:48:03 +12:00
Joseph Gardner eb9fce1f22 Track scales with time scale #Pair[jjg64, zwu18] #Story[758] 2017-04-19 12:46:26 +12:00
cbt24 71535be143 Merge branch 'story_25' 2017-04-19 12:42:39 +12:00
cbt24 caf1e61391 Documented methods added for track handling.
#story[758]
2017-04-19 12:39:23 +12:00
Joseph Gardner af9d6769e5 Story 25 merged #Story[758] 2017-04-19 12:22:52 +12:00
Joseph Gardner b07e881edc Merge branch 'story_25'
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
2017-04-19 12:12:12 +12:00
Joseph Gardner 2945c8446e Points now last whole race with a lower opacity #Story[25] 2017-04-19 11:59:09 +12:00