From ae1494e0136e7d148dc8b6e35956f623d04f714a Mon Sep 17 00:00:00 2001 From: Jonathan Roemer Date: Sat, 7 Feb 2015 16:12:05 -0500 Subject: [PATCH] Initial networking setup is complete. At the moment, received current and desired temperatures are just spat out to the console. --- bin/networking/Network.class | Bin 1422 -> 0 bytes bin/networking/networking.class | Bin 0 -> 2605 bytes bin/testing/Networking_Test.class | Bin 0 -> 508 bytes src/networking/Network.java | 34 ------------ src/networking/networking.java | 87 ++++++++++++++++++++++++++++++ src/testing/Networking_Test.java | 13 +++++ 6 files changed, 100 insertions(+), 34 deletions(-) delete mode 100644 bin/networking/Network.class create mode 100644 bin/networking/networking.class create mode 100644 bin/testing/Networking_Test.class delete mode 100644 src/networking/Network.java create mode 100644 src/networking/networking.java create mode 100644 src/testing/Networking_Test.java diff --git a/bin/networking/Network.class b/bin/networking/Network.class deleted file mode 100644 index e7b6123220f2b5d39ac9dbc3c4358917783f4f95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1422 zcmZWp*-{fh6g{1VfiNIp3B&~>CFq4{0T)xO>eSj({ zwaQ1o$r4Y`Br#y6(w)Bd-2L4A`t$WWfSXv=5EAIOrT5-(cP#r&rWpLx5E1BmYrHcu z6@%jCjknVD1R^WTt7QR^7wDOH?3!oT-kMRV%P=r%2z1O?w&l$VgwvC2gwH#hGKMgE zbaWvmaH3$@vRL2UkZ#%7s7MAcIHplqGh9o(8^VaUZPf$@3;$=96G+vh`%b#^b=Q@) zSC+d~=^9?$l?AKjNn5%Cu_qr)S@kTYs9{K8;9n^%jfP=?Az#5TnUe3cP(%22uF`UPQh70V{F|RrjM&7^+Q?i{TumRQl5bBk3T= zV-Qu+SzK12E2@$fD99xj=&$OyhU)^I%yLtWjx%Y-^m)Pj$(mdjxpZ5@ts|T%edIKD zb=<*S^1-RIV?(VlE3|7=pX)?c;8b~Arp#cZDcUt>nzCxy7-lf5;eKQOTCLtUQ^e`cd}@i-a% z!Ek+~$qWN@qreYXn@Th5pS_gEi5SEf(;CMR(wyr(3}Y4}m_rgzc;|^I;53Td^i_=d zrA@JfZak-cf!_LP^Ayim)Hv<)l!xdkjz!vqu|&iKBEQkCA#sSS2=UfPDWRd*d8k@O Nf&Ze16{16U@fU(GP?Z1x diff --git a/bin/networking/networking.class b/bin/networking/networking.class new file mode 100644 index 0000000000000000000000000000000000000000..ee8b8b60eb9304c822c3e5a821f3f79f7e7d84bc GIT binary patch literal 2605 zcmcIkYf}?f7=BI&EW#>xZv-}?a^ zY3uj?nEnE%^f|j5a-lPIoR-Xxob%qE_j#Z9{PEYj-vLY@uOT4NW=ZEw#@;uro$=yN z4MBm%J>$?APaCu>Z|%vXBXHH0NogL+*}QE_%ZbZ_?8@?LTtGwxF3)DHoMTwdnvu@S zDxhmapd}}*)CKoKo;jH_ZJ8?MQ85WWrotr9e6hAb)!@*YK;4rclQQd=tgoSo35v+i zEds&WOiF5KWz(*m?T*K!eJJf%Cb=)2I<(-bj%#QasF^k`(|O3C!RXMMvUKX`LN_f& zQq^LS!J&m>9ydcoLoZ2kZ_Uj3On!S?vb|Mlq@=AOB+yZ?MXhY!i8;134m@)m`f*dk z4S|M=tU5l!fWVa<>6AnXTq^)zsS-n^4%acL`WO;uAM`L*xTuzTFru7pt4_|HJS-8< zKBi+FcLZvQGPPh@QlPa^)0GABQ#UMl4-*>h3pBaVU0c+0DvWA_Lyd(L3 zwbBej(M$LOVGR$;WEcA>=g0#c5lnN`nY@ZVhq}VrK7)~3a8zCKT^UMx$_z0sD{aHc z+cIS4!V2PJ9baKaKs!|WT;ArSI9xAZDP;CDhj|T83PK`zCB<|+#WU(4tLih!^gr~o zS(4S;orqtkJQqv#U{{qi1v-nnQ|9wpAv3VA zBdy*O%~ea<640GpX&+?xP&&~SHPs?%eoty(d^FWeE7b0x=0sd}N(f~hpUJWr)x|P- zJ1OT)rJsi4^FF3(*6`H^Ut9#yfojz7r12C$Ezg%K&UGc{dfN4}bCCX*afPuBZaywC zngP*5uNvNLo}wku)U|Pfwim<4=vX*KPvR8U6C=myJHf3J3@_e3#^_tzefSGLZ~ij) z8>$jjJ#XGecZhemeJ10n~3wN-M|2r7&%O0>ajxG3QvuUc}X9^ z9Nmb~Gr&x(c*O>*uttvo1V5l&L(3Va5a74Ql0w6J?U^Er7w(BvCH|eN#K%(g`oE)U zgzb*8(YwTbhi%?tgZJ6?1gV-NRa2yDl5~uch6f}dOsXRPGgV*Xn@UyTXAY)X4d@j8 zi4j*;-!7iQNKit_;0bn?MmvwOcXak=ILIp{8jelpsQVb@iKExm`eWYCQXX@Z#0;(T z?D{EgvDbnClnm5})!#4;*q4btM(lB7e^rLv{v_-IIrbZX^EVNWO?&_V literal 0 HcmV?d00001 diff --git a/bin/testing/Networking_Test.class b/bin/testing/Networking_Test.class new file mode 100644 index 0000000000000000000000000000000000000000..536b4d66db6da295397857bddd2082c15578ea56 GIT binary patch literal 508 zcmaJ-Jx>Bb5Pb^==y8f4ps~|VExbZIjSY#_1q%tSS#Y9@aA)@R@ORm0V&M<)M;YG+ z0u*SmGjC?+z4`e5`TPQKfxQ|^3j0oSXVS;GBknb`&xH3~rfLWjwuXA5_BdepP{*=2EBeam2f{ak5+d5_G>Hx3Xofe@V8k=d m$>)rwJ*4p3N%SAq4f)i_F%dI literal 0 HcmV?d00001 diff --git a/src/networking/Network.java b/src/networking/Network.java deleted file mode 100644 index f47fa24..0000000 --- a/src/networking/Network.java +++ /dev/null @@ -1,34 +0,0 @@ -package networking; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.ServerSocket; -import java.net.Socket; - -public class Network { - // Listen on port 7777 - private static final int PORT = 7777; - - // The server listens on int PORT and updates the current - public static void serverCurrentTemperatureListener() throws Exception { - ServerSocket listener = new ServerSocket(PORT); - try { - while (true) { - Socket socket = listener.accept(); - try { - BufferedReader input = - new BufferedReader(new InputStreamReader(socket.getInputStream())); - String currentTemperature = input.readLine(); - System.out.printf("The current temperature is:", currentTemperature); - } finally { - socket.close(); - } - } - } - finally { - listener.close(); - } - } - - -} \ No newline at end of file diff --git a/src/networking/networking.java b/src/networking/networking.java new file mode 100644 index 0000000..bbec9a9 --- /dev/null +++ b/src/networking/networking.java @@ -0,0 +1,87 @@ +package networking; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.ServerSocket; +import java.net.Socket; + +public interface networking { + // Listen for the current temperature on port 7000 + static final int receiveCurrentTempPORT = 7000; + // Send the current temperature on port 7000 + static final int sendCurrentTempPORT = 7000; + // Listen for the desired temperature on port 7001 + static final int receiveDesiredTempPORT = 7001; + // Send the desired temperature on port 7001 + static final int sendDesiredTempPORT = 7001; + + // Listens on receiveCurrentTempPORT and outputs the received string to console. + public static void receiveCurrentTemp() throws Exception { + ServerSocket listener = new ServerSocket(receiveCurrentTempPORT); + try { + // This stays running continuously once called. + while (true) { + Socket socket = listener.accept(); + try { + BufferedReader input = + new BufferedReader(new InputStreamReader(socket.getInputStream())); + int currentTemperature = Integer.parseInt(input.readLine()); + System.out.printf("The current temperature is:", currentTemperature); + } finally { + socket.close(); + } + } + } + finally { + listener.close(); + } + } + + // Listens on receiveDesiredTempPORT and outputs the received string to console. + public static void receiveDesiredTemp() throws Exception { + ServerSocket listener = new ServerSocket(receiveDesiredTempPORT); + try { + while (true) { + Socket socket = listener.accept(); + try { + BufferedReader input = + new BufferedReader(new InputStreamReader(socket.getInputStream())); + int currentTemperature = Integer.parseInt(input.readLine()); + System.out.printf("The desired temperature is:", currentTemperature); + } finally { + socket.close(); + } + } + } + finally { + listener.close(); + } + } + + // Sends the current temperature on port sendCurrentTempPORT. + public static void sendCurrentTemp(int currentTemperature, String thermostatIP) throws Exception { + Socket sender = new Socket(thermostatIP, sendCurrentTempPORT); + try { + while (true) { + PrintWriter out = new PrintWriter(sender.getOutputStream(), true); + out.println(currentTemperature); + } + } finally { + sender.close(); + } + } + + // Sends the desired temperature on port sendCurrentTempPORT. + public static void sendDesiredTemp(int desiredTemperature, String thermostatIP) throws Exception { + Socket sender = new Socket(thermostatIP, sendDesiredTempPORT); + try { + while (true) { + PrintWriter out = new PrintWriter(sender.getOutputStream(), true); + out.println(desiredTemperature); + } + } finally { + sender.close(); + } + } +} \ No newline at end of file diff --git a/src/testing/Networking_Test.java b/src/testing/Networking_Test.java new file mode 100644 index 0000000..1192556 --- /dev/null +++ b/src/testing/Networking_Test.java @@ -0,0 +1,13 @@ +package testing; + +import networking.networking; + +public class Networking_Test implements networking { + public void Networking_test() { + this.serverCurrentTemperatureListener(); + } + + public void serverCurrentTemperatureListener() { + this.serverCurrentTemperatureListener(); + } +}