summaryrefslogtreecommitdiff
path: root/usb-i2c-sl018
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-02-06 22:41:34 +0000
committerChristian Pointner <equinox@spreadspace.org>2013-02-06 22:41:34 +0000
commitd9ff51fb25f3c62441b6f22489c9075b6282cc6d (patch)
tree1bf4af0251ddf28f65cc437fbdcfc3098a91c2ee /usb-i2c-sl018
parentbasic statemachine (diff)
refactored heartbeat lib
git-svn-id: https://svn.spreadspace.org/avr/trunk@143 aa12f405-d877-488e-9caf-2d797e2a1cc7
Diffstat (limited to 'usb-i2c-sl018')
-rw-r--r--usb-i2c-sl018/heartbeat.c2
-rw-r--r--usb-i2c-sl018/heartbeat.h2
-rw-r--r--usb-i2c-sl018/tuer-rfid.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/usb-i2c-sl018/heartbeat.c b/usb-i2c-sl018/heartbeat.c
index fd9d5cb..fd7f11a 100644
--- a/usb-i2c-sl018/heartbeat.c
+++ b/usb-i2c-sl018/heartbeat.c
@@ -57,7 +57,7 @@ void init_heartbeat(void)
TIMSK0 = 1<<OCIE0A;
}
-void handle_heartbeat(void)
+void heartbeat_task(void)
{
if(heartbeat_flag)
led_on();
diff --git a/usb-i2c-sl018/heartbeat.h b/usb-i2c-sl018/heartbeat.h
index 2ad7166..4fcf0ae 100644
--- a/usb-i2c-sl018/heartbeat.h
+++ b/usb-i2c-sl018/heartbeat.h
@@ -25,6 +25,6 @@
#define R3TUER_heatbeat_h_INCLUDED
void init_heartbeat(void);
-void handle_heartbeat(void);
+void heartbeat_task(void);
#endif
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index 69523f9..c214f5b 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -133,6 +133,7 @@ int main(void)
if (sl018_check_for_new_card())
handle_card();
- handle_heartbeat();
+
+ heartbeat_task();
}
}