commit 77f1c73c3ea6225ba114954c4b88b3250646317c Author: David Sorber Date: Sun May 5 19:54:02 2013 -0400 Continuing to work on final project documentation. Also fixed another minor bug in rpi_client.py. diff --git a/525.743/code/rpi_client.py b/525.743/code/rpi_client.py index c241993..594121a 100644 --- a/525.743/code/rpi_client.py +++ b/525.743/code/rpi_client.py @@ -162,7 +162,7 @@ def main(): # Create the SensorReading object before we sort the temps reading = SensorReading(now, temps[0], temps[1], temps[2], - temps[3], relay_state) + temps[3], False) # Sort all the temperature readings for easier manipulation temps.sort(reverse=True) @@ -181,6 +181,9 @@ def main(): relay_state = True relay.on() + # Update the relay status after deciding to turn it on or off + reading.relay_status = relay_state + # Send a reading to the server once every minute if interval_counter == REMOTE_DATA_INTERVAL: if DEBUG: diff --git a/525.743/code/server.py b/525.743/code/server.py index 167f949..cb3c6cb 100644 --- a/525.743/code/server.py +++ b/525.743/code/server.py @@ -8,7 +8,7 @@ import sys from bfcslib.sensor_reading import SensorReading DB_PATH = '/home/dsorber/bfcs/beer_temps.db' -HOST = '10.0.0.6' +HOST = '192.168.1.1' PORT = 2243 def main(): diff --git a/525.743/documentation/code_pdfs/all.html.pdf b/525.743/documentation/code_pdfs/all.html.pdf new file mode 100644 index 0000000..a43cd1d Binary files /dev/null and b/525.743/documentation/code_pdfs/all.html.pdf differ diff --git a/525.743/documentation/code_pdfs/app.wsgi.pdf b/525.743/documentation/code_pdfs/app.wsgi.pdf new file mode 100644 index 0000000..0f12ddc Binary files /dev/null and b/525.743/documentation/code_pdfs/app.wsgi.pdf differ diff --git a/525.743/documentation/code_pdfs/day.html.pdf b/525.743/documentation/code_pdfs/day.html.pdf new file mode 100644 index 0000000..882abcd Binary files /dev/null and b/525.743/documentation/code_pdfs/day.html.pdf differ diff --git a/525.743/documentation/code_pdfs/index.html.pdf b/525.743/documentation/code_pdfs/index.html.pdf new file mode 100644 index 0000000..70cc260 Binary files /dev/null and b/525.743/documentation/code_pdfs/index.html.pdf differ diff --git a/525.743/documentation/code_pdfs/rpi_client.py.pdf b/525.743/documentation/code_pdfs/rpi_client.py.pdf new file mode 100644 index 0000000..c72d209 Binary files /dev/null and b/525.743/documentation/code_pdfs/rpi_client.py.pdf differ diff --git a/525.743/documentation/code_pdfs/sensor.py.pdf b/525.743/documentation/code_pdfs/sensor.py.pdf new file mode 100644 index 0000000..bb3e179 Binary files /dev/null and b/525.743/documentation/code_pdfs/sensor.py.pdf differ diff --git a/525.743/documentation/code_pdfs/sensor_reading.py.pdf b/525.743/documentation/code_pdfs/sensor_reading.py.pdf new file mode 100644 index 0000000..c8fcb51 Binary files /dev/null and b/525.743/documentation/code_pdfs/sensor_reading.py.pdf differ diff --git a/525.743/documentation/code_pdfs/server.py.pdf b/525.743/documentation/code_pdfs/server.py.pdf new file mode 100644 index 0000000..c4881fe Binary files /dev/null and b/525.743/documentation/code_pdfs/server.py.pdf differ diff --git a/525.743/documentation/code_pdfs/seven_seg.py.pdf b/525.743/documentation/code_pdfs/seven_seg.py.pdf new file mode 100644 index 0000000..33f384f Binary files /dev/null and b/525.743/documentation/code_pdfs/seven_seg.py.pdf differ diff --git a/525.743/documentation/code_pdfs/status_led.py.pdf b/525.743/documentation/code_pdfs/status_led.py.pdf new file mode 100644 index 0000000..270a1a3 Binary files /dev/null and b/525.743/documentation/code_pdfs/status_led.py.pdf differ diff --git a/525.743/documentation/code_pdfs/tmp_512.py.pdf b/525.743/documentation/code_pdfs/tmp_512.py.pdf new file mode 100644 index 0000000..5bff48e Binary files /dev/null and b/525.743/documentation/code_pdfs/tmp_512.py.pdf differ diff --git a/525.743/documentation/final_doc.odt b/525.743/documentation/final_doc.odt index c655c2c..c5a7c3e 100644 Binary files a/525.743/documentation/final_doc.odt and b/525.743/documentation/final_doc.odt differ