# HG changeset patch # User Daniel O'Connor # Date 1364876390 -37800 # Node ID 6466e8720e04c7884c793805b9ee6e61b4cf3b92 # Parent f1cc171b06b5b5b24522f9eb61948d124c1f7248 Add sprinkler control stubs for testing diff -r f1cc171b06b5 -r 6466e8720e04 BSDmakefile --- a/BSDmakefile Tue Apr 02 10:54:20 2013 +1030 +++ b/BSDmakefile Tue Apr 02 14:49:50 2013 +1030 @@ -10,6 +10,7 @@ main.c \ misc.c \ spi.c \ + sprink.c \ startup_stm32f10x_md_mthomas.c \ syscalls.c \ system_stm32f10x.c \ diff -r f1cc171b06b5 -r 6466e8720e04 main.c --- a/main.c Tue Apr 02 10:54:20 2013 +1030 +++ b/main.c Tue Apr 02 14:49:50 2013 +1030 @@ -19,6 +19,7 @@ #include "lcd.h" #include "main.h" #include "rtc.h" +#include "sprink.h" #include "tempctrl.h" #include "touch.h" @@ -156,12 +157,16 @@ /* Setup temperature control stuff */ tempctrl_init(); + + /* Setup sprinkler stuff */ + sprink_init(); while (1) { fputs("> ", stdout); while (cmd.state != 255) { tempctrl_update(); + sprink_update(); } if (cmd.len < 1) diff -r f1cc171b06b5 -r 6466e8720e04 sprink.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sprink.c Tue Apr 02 14:49:50 2013 +1030 @@ -0,0 +1,40 @@ +/* + * Sprinkler control logic + * + * Copyright (c) 2013 + * Daniel O'Connor . All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +void +sprink_init(void) { +} + +void +sprink_update(void) { +} + +void +sprink_cmd(int argc, char **argv) { +} + diff -r f1cc171b06b5 -r 6466e8720e04 sprink.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sprink.h Tue Apr 02 14:49:50 2013 +1030 @@ -0,0 +1,31 @@ +/* + * Sprinkler headers + * + * Copyright (c) 2013 + * Daniel O'Connor . All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +void sprink_init(void); +void sprink_update(void); +void sprink_cmd(int argc, char **argv);