added statemachine

git-svn-id: https://svn.spreadspace.org/avr/trunk@140 aa12f405-d877-488e-9caf-2d797e2a1cc7

5 files changed, 65 insertions, 2 deletions

diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile
index 42ba1d7..a547d69 100644
--- a/usb-i2c-sl018/Makefile
+++ b/usb-i2c-sl018/Makefile
@@ -23,7 +23,7 @@
 
 NAME := tuer-rfid
 BOARD_TYPE := teensy2
-OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o usb_serial.o
+OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o usb_serial.o statemachine.o
 LIBS := util led lufa-descriptor-usbserial
 EXTERNAL_LIBS := lufa
 
diff --git a/usb-i2c-sl018/statemachine.c b/usb-i2c-sl018/statemachine.c
new file mode 100644
index 0000000..ac88ec5
--- /dev/null
+++ b/usb-i2c-sl018/statemachine.c
@@ -0,0 +1,32 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *                     Othmar Gsenger <otti@wirdorange.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "statemachine.h"
+#include "stepper.h"
+enum {reset, closed, closing, open, opening, timeout_after_open, timeout_after_close, error, manual_movement} state = reset;
+
+void statemachine_task(void)
+{
+
+}
diff --git a/usb-i2c-sl018/statemachine.h b/usb-i2c-sl018/statemachine.h
new file mode 100644
index 0000000..26e692b
--- /dev/null
+++ b/usb-i2c-sl018/statemachine.h
@@ -0,0 +1,29 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *                     Othmar Gsenger <otti@wirdorange.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef R3TUER_statemachine_h_INCLUDED
+#define R3TUER_statemachine_h_INCLUDED
+
+void statemachine_task(void);
+
+#endif
diff --git a/usb-i2c-sl018/stepper.h b/usb-i2c-sl018/stepper.h
index 233423a..531bf9e 100644
--- a/usb-i2c-sl018/stepper.h
+++ b/usb-i2c-sl018/stepper.h
@@ -23,7 +23,7 @@
 
 #ifndef R3TUER_stepper_h_INCLUDED
 #define R3TUER_stepper_h_INCLUDED
-
+#include <stdint.h>
 typedef enum { dir_open = 0, dir_close = 1 } stepper_direction_t;
 
 void init_stepper(void);
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index eef038a..d87bde5 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -40,6 +40,7 @@
 #include "sl018.h"
 #include "keystore.h"
 #include "usb_serial.h"
+#include "statemachine.h"
 
 void handle_stdio(uint8_t cmd)
 {  
@@ -123,6 +124,7 @@ int main(void)
   sl018_reset();
 
   for(;;) {
+    statemachine_task();
     usb_serial_task();
 
     int16_t bytes_received = usb_serial_bytes_received();