From 1dd9dade4ddb971612fffb5589805ec02f10d402 Mon Sep 17 00:00:00 2001 From: Jonathan Roemer Date: Fri, 1 May 2015 10:20:50 -0400 Subject: [PATCH] Some updates to the documentation and readme files, and IP updates to the server and ThermostatDevice classes to allow for testing. --- DOCUMENTATION.md | 2 +- README.md | 2 +- src/server/server.java | 2 +- src/thermostat/ThermostatDevice.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index f02fe70..0dcabfe 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -16,4 +16,4 @@ The thermostat package deals with received commands from the server, and directl ##Networking The networking package is shared between both the server and the thermostat packages. It handles all network communication, and forwards commands. ##Testing -The testing packages contains our various JUnit test files, which were used for validation throughout the development process. \ No newline at end of file +The testing packages contains our various test files, which were used for validation throughout the development process. \ No newline at end of file diff --git a/README.md b/README.md index 691d1c6..123708e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The thermostat/thermocontroller device code is designed to be run on a Raspberry The server functionality runs in a JavaFX GUI. This requires the proprietary Oracle Java 8 runtime. It has been tested on Windows 7 SP2, OSX 10.10.3, and Arch GNU/Linux with Java 1.8.0_45. - +The networking code currently hard-codes IP addresses of 192.168.1.102 for the server and 192.168.1.103 for the Raspberry Pi thermostat device. There is unimplemented code that will allow for automatic device discovery. ##License Thermocontroller is licensed under the GPLv3. A full copy of the license is provided with this program under the name LICENSE.txt diff --git a/src/server/server.java b/src/server/server.java index ae2c4c2..cc701d4 100644 --- a/src/server/server.java +++ b/src/server/server.java @@ -92,7 +92,7 @@ public String getDevicesFromEmail(String email) { public void sendDesiredTemp(String desiredTemperature, String thermostatIP) throws Exception { // Opens a sending port // Replace this with the thermostatIP string if we get multicast working - Socket sender = new Socket("192.168.1.3", 7002); + Socket sender = new Socket("192.168.1.103", 7002); try { while (true) { // Instantiate a printwriter so we can write to the output stream diff --git a/src/thermostat/ThermostatDevice.java b/src/thermostat/ThermostatDevice.java index e35a21d..dbd24cb 100644 --- a/src/thermostat/ThermostatDevice.java +++ b/src/thermostat/ThermostatDevice.java @@ -97,7 +97,7 @@ public void sendCurrentTemp(String currentTemp, String serverIP) throws IOExcept // Sends the current temperature on port sendCurrentTempPORT // Open a sending port // Replace this with the serverIP string if we get multicast working - Socket sender = new Socket("192.168.0.3", 7000); + Socket sender = new Socket("192.168.1.102", 7000); try { while (true) { // Instantiate a printwriter so we can write to the output stream