Skip to content

Commit

Permalink
Some updates to the documentation and readme files, and IP updates to…
Browse files Browse the repository at this point in the history
… the server and ThermostatDevice classes to allow for testing.
  • Loading branch information
pid1 committed May 1, 2015
1 parent 07b3d4d commit 1dd9dad
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
The testing packages contains our various test files, which were used for validation throughout the development process.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/server/server.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/thermostat/ThermostatDevice.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1dd9dad

Please sign in to comment.