From 9aa0db689fdd927433f61087eab1d30fb9f7133d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 5 Feb 2013 01:37:22 +0000 Subject: added heartbeat git-svn-id: https://svn.spreadspace.org/avr/trunk@116 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- usb-i2c-sl018/Makefile | 2 +- usb-i2c-sl018/heartbeat.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ usb-i2c-sl018/heartbeat.h | 30 +++++++++++++++++++++ usb-i2c-sl018/tuer-rfid.c | 6 +++++ 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 usb-i2c-sl018/heartbeat.c create mode 100644 usb-i2c-sl018/heartbeat.h (limited to 'usb-i2c-sl018') diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index 3199ff0..811648f 100644 --- a/usb-i2c-sl018/Makefile +++ b/usb-i2c-sl018/Makefile @@ -23,7 +23,7 @@ NAME := tuer-rfid BOARD_TYPE := teensy2 -OBJ := $(NAME).o +OBJ := $(NAME).o heartbeat.o LIBS := util led lufa-descriptor-usbserial EXTERNAL_LIBS := lufa diff --git a/usb-i2c-sl018/heartbeat.c b/usb-i2c-sl018/heartbeat.c new file mode 100644 index 0000000..6822320 --- /dev/null +++ b/usb-i2c-sl018/heartbeat.c @@ -0,0 +1,68 @@ +/* + * 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 "led.h" +#include "heartbeat.h" + +#define HEARTBEAT_DURATION 10 // *10 ms, duration of heartbeat pulse +#define HEARTBEAT_DELAY 200 // *10 ms, 1/heartbeat-frequency +uint8_t heartbeat_cnt = 0; +uint8_t heartbeat_flag; + +// while running this gets called every ~10ms +ISR(TIMER0_COMPA_vect) +{ + heartbeat_cnt++; + if(heartbeat_cnt == HEARTBEAT_DURATION) + heartbeat_flag = 0; + else if(heartbeat_cnt >= HEARTBEAT_DELAY) { + heartbeat_flag = 1; + heartbeat_cnt = 0; + } +} + +void init_heartbeat(void) +{ + led_off(); + heartbeat_cnt = 0; + heartbeat_flag = 1; + + // timer 2: ~10 ms, timebase for heartbeat signal + TCCR0A = 1< ~10 ms @ 16 MHz + //OCR2A = 194; // (1+194)*1024 = 199680 -> ~10 ms @ 20 MHz + TCNT2 = 0; // reseting timer + TIMSK0 = 1< + * 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_heatbeat_h_INCLUDED +#define R3TUER_heatbeat_h_INCLUDED + +void init_heartbeat(void); +void handle_heartbeat(void); + +#endif diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index 91906bf..153371f 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -32,6 +32,8 @@ #include "util.h" #include "led.h" +#include "heartbeat.h" + #include "LUFA/Drivers/Peripheral/TWI.h" #include "LUFA/Drivers/Peripheral/Serial.h" #include "LUFA/Drivers/Misc/RingBuffer.h" @@ -434,6 +436,8 @@ int main(void) sei(); Serial_Init(115200,false); Serial_CreateStream(&serial_stream); + + init_heartbeat(); sl018_reset(); for(;;) { @@ -449,5 +453,7 @@ int main(void) if(card_status) handle_card(); } + + handle_heartbeat(); } } -- cgit v1.2.3