fjc40
3481a882de
Fixed Team Oracle's boat name in mock data file.
...
#story[778]
2017-05-07 14:28:31 +12:00
fjc40
ecebace9f1
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
2017-04-28 11:22:05 +12:00
fjc40
873089707d
Fixed the RaceStatusDecoder not deserializing BoatStatus (a subobject of RaceStatus) properly.
...
RaceVisionByteEncoder.heartBeat now uses a long (and grabs the low 4 bytes from it), as the streaming spec requires a 4 byte unsigned int.
#story[778] #story[782]
2017-04-28 01:32:39 +12:00
fjc40
d29c0a9439
Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.
...
#story[778]
2017-04-28 01:30:03 +12:00
fjc40
90f8bec415
Moved several classes from seng302.model to its own module - sharedModel (this is supposed to contain any shared data model code between mock and visualiser). Specifically, Regatta, Boat, BoatInRace, Constants, GPSCoordinate, Leg, Marker.
...
Updated RaceVisionByteEncoder.raceStatus to accept a Racestatus object rather than a bunch of parameters.
Added getters to RaceStatus class.
Updated some tests.
Removed Network tests from Mock, as they were duplicated.
2017-04-28 01:27:45 +12:00
fjc40
50cb31b85f
Moved networking code into the network module.
2017-04-27 20:28:07 +12:00
fjc40
06d786d581
Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules
...
# Conflicts:
# mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
# Selected copy from splitIntoTwoModules.
2017-04-27 20:02:18 +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
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
fjc40 and Fan-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
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
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
fjc40
ef53dee7fe
Changed device type constants to bytes.
...
#fix #story[778]
2017-04-21 12:56:00 +12:00
fjc40
421663c145
Added device type enumerations as static ints for BoatLocationMessage.
...
#story[778]
2017-04-21 12:54:48 +12:00
fjc40 and Fan-Wu Yang
a7e0ffae42
Added class to encapsulate a BoatLocationMessage.
...
#story[778]
2017-04-21 12:43:36 +12:00
fjc40
1a085e881d
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
2017-04-21 12:26:34 +12:00
fjc40
8da67d1dbc
Added class to encapsulate a BoatLocationMessage.
...
#story[778]
2017-04-21 12:25:57 +12:00
fjc40
