summaryrefslogtreecommitdiff
path: root/usb-i2c-sl018
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-02-07 05:17:41 +0000
committerChristian Pointner <equinox@spreadspace.org>2013-02-07 05:17:41 +0000
commitdcf1025ab0eaf0c60dae9d0b4a2056635ff542f5 (patch)
tree9090aa90ee42d3054e0a932228549d40f60b72e9 /usb-i2c-sl018
parentcleanup (diff)
naming convention for heartbeat
git-svn-id: https://svn.spreadspace.org/avr/trunk@178 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 47caffc..7700706 100644
--- a/usb-i2c-sl018/heartbeat.c
+++ b/usb-i2c-sl018/heartbeat.c
@@ -48,7 +48,7 @@ ISR(TIMER0_COMPA_vect)
}
}
-void init_heartbeat(void)
+void heartbeat_init(void)
{
led_off();
heartbeat_cnt = 0;
diff --git a/usb-i2c-sl018/heartbeat.h b/usb-i2c-sl018/heartbeat.h
index 4fcf0ae..148f823 100644
--- a/usb-i2c-sl018/heartbeat.h
+++ b/usb-i2c-sl018/heartbeat.h
@@ -24,7 +24,7 @@
#ifndef R3TUER_heatbeat_h_INCLUDED
#define R3TUER_heatbeat_h_INCLUDED
-void init_heartbeat(void);
+void heartbeat_init(void);
void heartbeat_task(void);
#endif
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index 856c76d..53c3435 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -122,7 +122,8 @@ int main(void)
led_init();
anyio_init(115200, false);
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 200000));
- init_heartbeat();
+
+ heartbeat_init();
init_stepper();
init_ledmatrix();
init_eventqueue();