From 98526900c7bf809b1399ef21ba091d7f1c76b517 Mon Sep 17 00:00:00 2001 From: Brendan Date: Mon, 9 Feb 2015 14:58:01 -0700 Subject: [PATCH] minor updates --- CopterController/TCPexample/EchoServer.java | 51 ++++++++++++++++++++ CopterController/TCPexample/Server.java | 1 + GroundStation/v1/GroundStation.class | Bin 9712 -> 11350 bytes 3 files changed, 52 insertions(+) create mode 100644 CopterController/TCPexample/EchoServer.java diff --git a/CopterController/TCPexample/EchoServer.java b/CopterController/TCPexample/EchoServer.java new file mode 100644 index 0000000..e6983bc --- /dev/null +++ b/CopterController/TCPexample/EchoServer.java @@ -0,0 +1,51 @@ +/** + * + */ + +import java.lang.*; +import java.io.*; +import java.net.*; + +/** + * Echo server. if receives "DISCONNECT", will shut down server properly + */ +class EchoServer { + public static void main(String args[]) { + ServerSocket srvr; + Socket skt; + BufferedReader in; + PrintWriter out; + + try { + System.out.print( "Setting up server\n" ); + srvr = new ServerSocket( 51717 ); + skt = srvr.accept(); + System.out.print( "Server has connected!\n" ); + + in = new BufferedReader( new InputStreamReader( skt.getInputStream() ) ); + out = new PrintWriter( skt.getOutputStream(), true); + + while( true ) { + System.out.print( "waiting for message...\n" ); + while( !in.ready() ) {} + String rx = in.readLine(); + System.out.print( "message received: " + rx + "\n" ); + + if( rx.equals( "DISCONNECT" ) ) { + System.out.print( "disconnecting\n" ); + break; + } + + System.out.print("Sending string: '" + rx + "'\n"); + out.println( rx ); + } + out.close(); + in.close(); + skt.close(); + srvr.close(); + } + catch(Exception e) { + System.out.print("Whoops! It didn't work!\n"); + } + } +} \ No newline at end of file diff --git a/CopterController/TCPexample/Server.java b/CopterController/TCPexample/Server.java index fbd1eda..5c5dcc9 100644 --- a/CopterController/TCPexample/Server.java +++ b/CopterController/TCPexample/Server.java @@ -4,6 +4,7 @@ import java.net.*; /** * Echo server. if receives "DISCONNECT", will shut down server properly + * Used for testing GroundStation communications */ class Server { public static void main(String args[]) { diff --git a/GroundStation/v1/GroundStation.class b/GroundStation/v1/GroundStation.class index 5719b8ac72c1ba288cc04b24160110d250369746..eee607233f8af5d8f2a56380ae1f74525e31a69d 100644 GIT binary patch literal 11350 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 H6fgdNA}`@? literal 9712 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