-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add test sensor data * handle if there are no temperatures * add tests for grainbin.update * Update README.md * add healthcheck for pgadmin and postgres * add a startup script * Update .dockerignore * remove database_management container * add netcat to dockerfile
- Loading branch information
Showing
19 changed files
with
398 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
.env* | ||
.mypy_cache | ||
.pytest_cache | ||
.*.egg-info | ||
.*.egg-info | ||
Dockerfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# A start up script for the fd_device container. | ||
# This script is run when the container is started. | ||
# It will wait for the database to be ready, then run any migrations | ||
# and then start fd_device. | ||
|
||
# Wait for the database to be ready | ||
echo "Waiting for database to be ready..." | ||
while ! nc -z fd_database 5432; do | ||
sleep 0.1 | ||
done | ||
echo "Database is ready!" | ||
|
||
# Run migrations | ||
echo "Running database migrations..." | ||
pipenv run fd_device database database_upgrade --revision head | ||
|
||
# Start fd_device | ||
echo "Starting fd_device..." | ||
pipenv run fd_device run |
2 changes: 1 addition & 1 deletion
2
device/tests/grainbin/test_bus_owfs_page.txt → ...e/tests/grainbin/test_bus_1_owfs_page.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<HTML><HEAD><TITLE>1-Wire Web: Directory</TITLE></HEAD> | ||
<BODY BGCOLOR='#BBBBBB'><TABLE WIDTH='100%' BGCOLOR='#DDDDDD' BORDER='1'><TR><TD>OWFS</TD><TD><A HREF='/'>Bus listing</A></TD><TD><A HREF='http://www.owfs.org'>OWFS homepage</A></TD><TD><A HREF='http://www.maxim-ic.com'>Dallas/Maxim</A></TD><TD>by <A HREF='mailto://paul.alfille@gmail.com'>Paul H Alfille</A></TD></TR></TABLE> | ||
<H1>bus.1</H1><HR> | ||
<TABLE BGCOLOR="#DDDDDD" BORDER=1><TR><TD><A HREF='/'><CODE><B><BIG>top</BIG></B></CODE></A></TD><TD>highest level</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/interface'><CODE><B><BIG>interface</BIG></B></CODE></A></TD><TD>interface</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/28.CC9A290D0000'><CODE><B><BIG>28.CC9A290D0000</BIG></B></CODE></A></TD><TD>28.CC9A290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/28.BC9A290D0000'><CODE><B><BIG>28.BC9A290D0000</BIG></B></CODE></A></TD><TD>28.BC9A290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/28.BBE5290D0000'><CODE><B><BIG>28.BBE5290D0000</BIG></B></CODE></A></TD><TD>28.BBE5290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/simultaneous'><CODE><B><BIG>simultaneous</BIG></B></CODE></A></TD><TD>simultaneous</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/alarm'><CODE><B><BIG>alarm</BIG></B></CODE></A></TD><TD>alarm</TD><TD>directory</TD></TR></TABLE></BODY></HTML> | ||
<TABLE BGCOLOR="#DDDDDD" BORDER=1><TR><TD><A HREF='/'><CODE><B><BIG>top</BIG></B></CODE></A></TD><TD>highest level</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/interface'><CODE><B><BIG>interface</BIG></B></CODE></A></TD><TD>interface</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/28.CC9A290D0000'><CODE><B><BIG>28.CC9A290D0000</BIG></B></CODE></A></TD><TD>28.CC9A290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/28.BC9A290D0000'><CODE><B><BIG>28.BC9A290D0000</BIG></B></CODE></A></TD><TD>28.BC9A290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/28.BBE5290D0000'><CODE><B><BIG>28.BBE5290D0000</BIG></B></CODE></A></TD><TD>28.BBE5290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/simultaneous'><CODE><B><BIG>simultaneous</BIG></B></CODE></A></TD><TD>simultaneous</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.1/alarm'><CODE><B><BIG>alarm</BIG></B></CODE></A></TD><TD>alarm</TD><TD>directory</TD></TR></TABLE></BODY></HTML>% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<HTML><HEAD><TITLE>1-Wire Web: bus.2/28.FF63B4711404</TITLE></HEAD> | ||
<BODY BGCOLOR='#BBBBBB'><TABLE WIDTH='100%' BGCOLOR='#DDDDDD' BORDER='1'><TR><TD>OWFS</TD><TD><A HREF='/'>Bus listing</A></TD><TD><A HREF='http://www.owfs.org'>OWFS homepage</A></TD><TD><A HREF='http://www.maxim-ic.com'>Dallas/Maxim</A></TD><TD>by <A HREF='mailto://paul.alfille@gmail.com'>Paul H Alfille</A></TD></TR></TABLE> | ||
<H1>bus.2/28.FF63B4711404</H1><HR> | ||
<BR><small><A href='/uncached/bus.2/28.FF63B4711404'>uncached version</A></small><TABLE BGCOLOR="#DDDDDD" BORDER=1><TR><TD><A HREF='/bus.2/'><CODE><B><BIG>up</BIG></B></CODE></A></TD><TD>directory</TD></TR><TR><TD><B>address</B></TD><TD>28FF63B47114047A</TD></TR> | ||
<TR><TD><B>alias</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.2/28.FF63B4711404'><INPUT TYPE='TEXT' NAME='alias' VALUE=''><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>crc8</B></TD><TD>7A</TD></TR> | ||
<TR><TD><B>errata</B></TD><TD><A HREF='/bus.2/28.FF63B4711404/errata'>errata</A></TD></TR> | ||
<TR><TD><B>family</B></TD><TD>28</TD></TR> | ||
<TR><TD><B>fasttemp</B></TD><TD>22</TD></TR> | ||
<TR><TD><B>id</B></TD><TD>FF63B4711404</TD></TR> | ||
<TR><TD><B>latesttemp</B></TD><TD>22</TD></TR> | ||
<TR><TD><B>locator</B></TD><TD>FFFFFFFFFFFFFFFF</TD></TR> | ||
<TR><TD><B>power</B></TD><TD>NO (0)</TD></TR> | ||
<TR><TD><B>r_address</B></TD><TD>7A041471B463FF28</TD></TR> | ||
<TR><TD><B>r_id</B></TD><TD>041471B463FF</TD></TR> | ||
<TR><TD><B>r_locator</B></TD><TD>FFFFFFFFFFFFFFFF</TD></TR> | ||
<TR><TD><B>scratchpad</B></TD><TD><PRE>600101011FFF1F103F</PRE></TD></TR> | ||
<TR><TD><B>temperature</B></TD><TD>21.875</TD></TR> | ||
<TR><TD><B>temperature10</B></TD><TD>22</TD></TR> | ||
<TR><TD><B>temperature11</B></TD><TD>21.875</TD></TR> | ||
<TR><TD><B>temperature12</B></TD><TD>21.875</TD></TR> | ||
<TR><TD><B>temperature9</B></TD><TD>22</TD></TR> | ||
<TR><TD><B>temphigh</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.2/28.FF63B4711404'><INPUT TYPE='TEXT' NAME='temphigh' VALUE='1'><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>templow</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.2/28.FF63B4711404'><INPUT TYPE='TEXT' NAME='templow' VALUE='1'><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>tempres</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.2/28.FF63B4711404'><INPUT TYPE='TEXT' NAME='tempres' VALUE='11'><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>type</B></TD><TD>DS18B20</TD></TR> | ||
</TABLE></BODY></HTML>% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<HTML><HEAD><TITLE>1-Wire Web: Directory</TITLE></HEAD> | ||
<BODY BGCOLOR='#BBBBBB'><TABLE WIDTH='100%' BGCOLOR='#DDDDDD' BORDER='1'><TR><TD>OWFS</TD><TD><A HREF='/'>Bus listing</A></TD><TD><A HREF='http://www.owfs.org'>OWFS homepage</A></TD><TD><A HREF='http://www.maxim-ic.com'>Dallas/Maxim</A></TD><TD>by <A HREF='mailto://paul.alfille@gmail.com'>Paul H Alfille</A></TD></TR></TABLE> | ||
<H1>bus.2</H1><HR> | ||
<TABLE BGCOLOR="#DDDDDD" BORDER=1><TR><TD><A HREF='/'><CODE><B><BIG>top</BIG></B></CODE></A></TD><TD>highest level</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.2/interface'><CODE><B><BIG>interface</BIG></B></CODE></A></TD><TD>interface</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.2/28.77A9290D0000'><CODE><B><BIG>28.77A9290D0000</BIG></B></CODE></A></TD><TD>28.77A9290D0000</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.2/28.FF63B4711404'><CODE><B><BIG>28.FF63B4711404</BIG></B></CODE></A></TD><TD>28.FF63B4711404</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.2/simultaneous'><CODE><B><BIG>simultaneous</BIG></B></CODE></A></TD><TD>simultaneous</TD><TD>directory</TD></TR><TR><TD><A HREF='/bus.2/alarm'><CODE><B><BIG>alarm</BIG></B></CODE></A></TD><TD>alarm</TD><TD>directory</TD></TR></TABLE></BODY></HTML>% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<HTML><HEAD><TITLE>1-Wire Web: bus.1/28.CC9A290D0000</TITLE></HEAD> | ||
<BODY BGCOLOR='#BBBBBB'><TABLE WIDTH='100%' BGCOLOR='#DDDDDD' BORDER='1'><TR><TD>OWFS</TD><TD><A HREF='/'>Bus listing</A></TD><TD><A HREF='http://www.owfs.org'>OWFS homepage</A></TD><TD><A HREF='http://www.maxim-ic.com'>Dallas/Maxim</A></TD><TD>by <A HREF='mailto://paul.alfille@gmail.com'>Paul H Alfille</A></TD></TR></TABLE> | ||
<H1>bus.1/28.CC9A290D0000</H1><HR> | ||
<BR><small><A href='/uncached/bus.1/28.CC9A290D0000'>uncached version</A></small><TABLE BGCOLOR="#DDDDDD" BORDER=1><TR><TD><A HREF='/bus.1/'><CODE><B><BIG>up</BIG></B></CODE></A></TD><TD>directory</TD></TR><TR><TD><B>address</B></TD><TD>28CC9A290D000005</TD></TR> | ||
<TR><TD><B>alias</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.1/28.CC9A290D0000'><INPUT TYPE='TEXT' NAME='alias' VALUE=''><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>crc8</B></TD><TD>05</TD></TR> | ||
<TR><TD><B>errata</B></TD><TD><A HREF='/bus.1/28.CC9A290D0000/errata'>errata</A></TD></TR> | ||
<TR><TD><B>family</B></TD><TD>28</TD></TR> | ||
<TR><TD><B>fasttemp</B></TD><TD>22.5</TD></TR> | ||
<TR><TD><B>id</B></TD><TD>CC9A290D0000</TD></TR> | ||
<TR><TD><B>latesttemp</B></TD><TD>22.5</TD></TR> | ||
<TR><TD><B>locator</B></TD><TD>FFFFFFFFFFFFFFFF</TD></TR> | ||
<TR><TD><B>power</B></TD><TD>NO (0)</TD></TR> | ||
<TR><TD><B>r_address</B></TD><TD>0500000D299ACC28</TD></TR> | ||
<TR><TD><B>r_id</B></TD><TD>00000D299ACC</TD></TR> | ||
<TR><TD><B>r_locator</B></TD><TD>FFFFFFFFFFFFFFFF</TD></TR> | ||
<TR><TD><B>scratchpad</B></TD><TD><PRE>680101011FFF081097</PRE></TD></TR> | ||
<TR><TD><B>temperature</B></TD><TD>22.1875</TD></TR> | ||
<TR><TD><B>temperature10</B></TD><TD>22.25</TD></TR> | ||
<TR><TD><B>temperature11</B></TD><TD>22.25</TD></TR> | ||
<TR><TD><B>temperature12</B></TD><TD>22.1875</TD></TR> | ||
<TR><TD><B>temperature9</B></TD><TD>22.5</TD></TR> | ||
<TR><TD><B>temphigh</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.1/28.CC9A290D0000'><INPUT TYPE='TEXT' NAME='temphigh' VALUE='1'><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>templow</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.1/28.CC9A290D0000'><INPUT TYPE='TEXT' NAME='templow' VALUE='1'><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>tempres</B></TD><TD><FORM METHOD='GET' ACTION='http://fd1.farmmonitor.ca:8443/bus.1/28.CC9A290D0000'><INPUT TYPE='TEXT' NAME='tempres' VALUE='12'><INPUT TYPE='SUBMIT' VALUE='CHANGE'></FORM></TD></TR> | ||
<TR><TD><B>type</B></TD><TD>DS18B20</TD></TR> | ||
</TABLE></BODY></HTML>% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.