fixed rfm12 inclusion, added as submodule
This commit is contained in:
parent
55505c08a6
commit
e39472b51a
|
@ -0,0 +1,3 @@
|
|||
[submodule "src/rfm12/rfm12_lib"]
|
||||
path = src/rfm12/rfm12_lib
|
||||
url = git@github.com:das-labor/librfm12.git
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
#include "rfm12_config.h"
|
||||
#include "rfm12_lib/rfm12.c"
|
||||
#include "rfm12_lib/src/rfm12.c"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
#include "rfm12_config.h"
|
||||
#include "rfm12_lib/rfm12.h"
|
||||
#include "rfm12_lib/src/rfm12.h"
|
||||
|
||||
|
|
|
@ -49,6 +49,8 @@
|
|||
#include "../config.h"
|
||||
#include "../makros.h"
|
||||
|
||||
#include <avr/interrupt.h>
|
||||
|
||||
//Pin that the RFM12's slave select is connected to
|
||||
//#define DDR_SS DDRB
|
||||
//#define PORT_SS PORTB
|
||||
|
@ -124,13 +126,23 @@
|
|||
#define RFM12_INT_VECT (INT0_vect)
|
||||
|
||||
//the interrupt mask register
|
||||
#define RFM12_INT_MSK GIMSK
|
||||
#ifdef EIMSK
|
||||
#define RFM12_INT_MSK EIMSK
|
||||
#elif defined(GIMSK)
|
||||
#define RFM12_INT_MSK GIMSK
|
||||
#else
|
||||
#define RFM12_INT_MSK GICR
|
||||
#endif
|
||||
|
||||
//the interrupt bit in the mask register
|
||||
#define RFM12_INT_BIT (INT0)
|
||||
|
||||
//the interrupt flag register
|
||||
#define RFM12_INT_FLAG GIFR
|
||||
#ifdef EIFR
|
||||
#define RFM12_INT_FLAG EIFR
|
||||
#else
|
||||
#define RFM12_INT_FLAG GIFR
|
||||
#endif
|
||||
|
||||
//the interrupt bit in the flag register
|
||||
#define RFM12_FLAG_BIT (INTF0)
|
||||
|
@ -160,6 +172,3 @@
|
|||
*/
|
||||
#define RFM12_UART_DEBUG 0
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit e49ecece7baf2faa48ed2f6c659228b4d77c0c66
|
Loading…
Reference in New Issue