From 55b163aa78bc1056763eab1507a7cb5d1d7cb8bb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 7 Feb 2013 03:04:02 +0000 Subject: added ajar module git-svn-id: https://svn.spreadspace.org/avr/trunk@170 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- usb-i2c-sl018/Makefile | 2 +- usb-i2c-sl018/ajar.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ usb-i2c-sl018/ajar.h | 34 +++++++++++++++++++++ usb-i2c-sl018/tuer-rfid.c | 3 ++ 4 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 usb-i2c-sl018/ajar.c create mode 100644 usb-i2c-sl018/ajar.h diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index 6619f41..697806b 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 statemachine.o eventqueue.o limits.o manual.o +OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o statemachine.o eventqueue.o limits.o manual.o ajar.o LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa diff --git a/usb-i2c-sl018/ajar.c b/usb-i2c-sl018/ajar.c new file mode 100644 index 0000000..54bd6fb --- /dev/null +++ b/usb-i2c-sl018/ajar.c @@ -0,0 +1,76 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * Othmar Gsenger + * + * 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 . + */ + +#include +#include +#include "ajar.h" + +#define AJAR_PIN PIND +#define AJAR_PORT PORTD +#define AJAR_DDR DDRD +#define AJAR_BIT 4 + +#define AJAR_LP_MAX 255 + +void init_ajar(void) +{ + AJAR_DDR = AJAR_DDR & ~(1<= AJAR_LP_MAX) { + last_state = state; + lp_cnt = 0; + } + + if(last_state) + return ajar; + return shut; +} + +const char* ajar_to_string(ajar_t a) +{ + return a == ajar ? "ajar" : "shut"; +} + +void ajar_task(void) +{ + static ajar_t last_state = shut; + + ajar_t state = ajar_get(); + if(last_state != state) + printf("Door is now: %s\n\r", ajar_to_string(state)); + + last_state = state; +} diff --git a/usb-i2c-sl018/ajar.h b/usb-i2c-sl018/ajar.h new file mode 100644 index 0000000..44f0f82 --- /dev/null +++ b/usb-i2c-sl018/ajar.h @@ -0,0 +1,34 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * Othmar Gsenger + * + * 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 . + */ + +#ifndef R3TUER_ajar_h_INCLUDED +#define R3TUER_ajar_h_INCLUDED + +typedef enum { ajar, shut } ajar_t; + +void init_ajar(void); +ajar_t ajar_get(void); +const char* ajar_to_string(ajar_t a); +void ajar_task(void); + +#endif diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index 8973994..3e54a5d 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -43,6 +43,7 @@ #include "eventqueue.h" #include "limits.h" #include "manual.h" +#include "ajar.h" void handle_stdio(uint8_t cmd) { @@ -119,6 +120,7 @@ int main(void) init_eventqueue(); init_limits(); init_manual(); + init_ajar(); sei(); sl018_reset(); @@ -128,6 +130,7 @@ int main(void) anyio_task(); manual_task(); + ajar_task(); int16_t bytes_received = anyio_bytes_received(); if(bytes_received > 0) -- cgit v1.2.3