diff --git a/bin/networking/Network.class b/bin/networking/Network.class deleted file mode 100644 index e7b6123..0000000 Binary files a/bin/networking/Network.class and /dev/null differ diff --git a/bin/networking/networking.class b/bin/networking/networking.class new file mode 100644 index 0000000..ee8b8b6 Binary files /dev/null and b/bin/networking/networking.class differ diff --git a/bin/testing/Networking_Test.class b/bin/testing/Networking_Test.class new file mode 100644 index 0000000..536b4d6 Binary files /dev/null and b/bin/testing/Networking_Test.class differ 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(); + } +}