diff options
author | Lars-Dominik Braun <lars@6xq.net> | 2014-03-10 17:30:31 +0100 |
---|---|---|
committer | Lars-Dominik Braun <lars@6xq.net> | 2014-04-22 16:51:13 +0200 |
commit | 24d11d4976062e965fb64861808548c39f53714b (patch) | |
tree | 5fbfcc1722d163647c0ce0c395c6e5a1794fc7d4 | |
parent | e69b2bc45ff0940b475a1832d25e051240fbda32 (diff) | |
download | hourglass-24d11d4976062e965fb64861808548c39f53714b.tar.gz hourglass-24d11d4976062e965fb64861808548c39f53714b.tar.bz2 hourglass-24d11d4976062e965fb64861808548c39f53714b.zip |
Add common.h
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | accel.c | 7 | ||||
-rw-r--r-- | common.h | 13 | ||||
-rw-r--r-- | gyro.c | 7 | ||||
-rw-r--r-- | main.c | 8 |
5 files changed, 19 insertions, 18 deletions
@@ -2,7 +2,7 @@ MCU = atmega88 all: sanduhr.hex -sanduhr.elf: main.c i2c.c i2c.h uart.c uart.h timer.c timer.h gyro.c gyro.h accel.c accel.h +sanduhr.elf: main.c i2c.c i2c.h uart.c uart.h timer.c timer.h gyro.c gyro.h accel.c accel.h common.h avr-gcc -std=gnu99 -mmcu=$(MCU) -Os -o $@ $^ sanduhr.hex: sanduhr.elf @@ -1,3 +1,5 @@ +#include "common.h" + #include <stdio.h> #include <string.h> #include <avr/io.h> @@ -14,11 +16,6 @@ #define LIS302DL_CTRLREG1 0x20 #define LIS302DL_UNUSED1 0x28 -#define sleepwhile(cond) \ - sleep_enable (); \ - while (cond) { sleep_cpu (); } \ - sleep_disable (); - /* the first interrupt is lost */ static volatile bool drdy = true; /* 0, 2 and 4 are zero, as they contain the dummy register’s content */ diff --git a/common.h b/common.h new file mode 100644 index 0000000..ecf2c27 --- /dev/null +++ b/common.h @@ -0,0 +1,13 @@ +#ifndef COMMON_H +#define COMMON_H + +/* cpu runs at 1mhz */ +#define F_CPU 1000000 + +#define sleepwhile(cond) \ + sleep_enable (); \ + while (cond) { sleep_cpu (); } \ + sleep_disable (); + +#endif /* COMMON_H */ + @@ -1,3 +1,5 @@ +#include "common.h" + #include <stdio.h> #include <string.h> #include <avr/io.h> @@ -27,11 +29,6 @@ #define L3GD20_CTRLREG3 0x22 #define L3GD20_CTRLREG4 0x23 -#define sleepwhile(cond) \ - sleep_enable (); \ - while (cond) { sleep_cpu (); } \ - sleep_disable (); - /* the first interrupt is lost */ static volatile bool drdy = true; static volatile int16_t val[3] = {0, 0, 0}; @@ -1,5 +1,4 @@ -/* cpu runs at 1mhz */ -#define F_CPU 1000000 +#include "common.h" #include <avr/io.h> #include <avr/interrupt.h> @@ -33,11 +32,6 @@ static void cpuInit () { CLKPR = 0b00000011; } -#define sleepwhile(cond) \ - sleep_enable (); \ - while (cond) { sleep_cpu (); } \ - sleep_disable (); - int main () { cpuInit (); ledInit (); |