Skip to content
Snippets Groups Projects
Commit f5e53610 authored by Brennenstuhl, Tobias FORNATL, GY's avatar Brennenstuhl, Tobias FORNATL, GY
Browse files

Merge origin/master

Conflicts:
	assignments/ReportingForDuty.md
parent d40f4c57
No related branches found
No related tags found
No related merge requests found
......@@ -22,10 +22,10 @@ public class BrennenstuhlEspduReceiver
public static final int MAX_PDU_SIZE = 8192;
/** Default multicast group address we send on. */
public static final String DEFAULT_MULTICAST_ADDRESS = BrennenstuhllEspduSender.DEFAULT_MULTICAST_ADDRESS;
public static final String DEFAULT_MULTICAST_ADDRESS = BrennenstuhlEspduSender.DEFAULT_MULTICAST_ADDRESS;
/** Default multicast port used, matches Wireshark DIS capture default */
public static final int DEFAULT_MULTICAST_PORT = BrennenstuhllEspduSender.DEFAULT_MULTICAST_PORT;
public static final int DEFAULT_MULTICAST_PORT = BrennenstuhlEspduSender.DEFAULT_MULTICAST_PORT;
public static void main(String args[])
{
......
......@@ -17,7 +17,7 @@ import edu.nps.moves.dis7.enumerations.PlatformDomain;
* @author Don McGregor
* @author Don Brutzman
*/
public class BrennenstuhllEspduSender
public class BrennenstuhlEspduSender
{
public static final int NUMBER_TO_SEND = 5; // 5000
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment