ctdo
/
borgware-2d
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed rfm12 inclusion, added as submodule

This commit is contained in:
Christian Kroll 2014-03-18 19:50:26 +01:00
parent 55505c08a6
commit e39472b51a
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "src/rfm12/rfm12_lib"]
path = src/rfm12/rfm12_lib
url = git@github.com:das-labor/librfm12.git

2
src/rfm12/rfm12.c
View File

@ -1,4 +1,4 @@
#include "rfm12_config.h" #include "rfm12_config.h"
#include "rfm12_lib/rfm12.c" #include "rfm12_lib/src/rfm12.c"

2
src/rfm12/rfm12.h
View File

@ -1,4 +1,4 @@
#include "rfm12_config.h" #include "rfm12_config.h"
#include "rfm12_lib/rfm12.h" #include "rfm12_lib/src/rfm12.h"

15
src/rfm12/rfm12_config.h
View File

@ -49,6 +49,8 @@
#include "../config.h" #include "../config.h"
#include "../makros.h" #include "../makros.h"
#include <avr/interrupt.h>
//Pin that the RFM12's slave select is connected to //Pin that the RFM12's slave select is connected to
//#define DDR_SS DDRB //#define DDR_SS DDRB
//#define PORT_SS PORTB //#define PORT_SS PORTB
@ -124,13 +126,23 @@
#define RFM12_INT_VECT (INT0_vect) #define RFM12_INT_VECT (INT0_vect)
//the interrupt mask register //the interrupt mask register
#ifdef EIMSK
#define RFM12_INT_MSK EIMSK
#elif defined(GIMSK)
#define RFM12_INT_MSK GIMSK #define RFM12_INT_MSK GIMSK
#else
#define RFM12_INT_MSK GICR
#endif
//the interrupt bit in the mask register //the interrupt bit in the mask register
#define RFM12_INT_BIT (INT0) #define RFM12_INT_BIT (INT0)
//the interrupt flag register //the interrupt flag register
#ifdef EIFR
#define RFM12_INT_FLAG EIFR
#else
#define RFM12_INT_FLAG GIFR #define RFM12_INT_FLAG GIFR
#endif
//the interrupt bit in the flag register //the interrupt bit in the flag register
#define RFM12_FLAG_BIT (INTF0) #define RFM12_FLAG_BIT (INTF0)
@ -160,6 +172,3 @@
*/ */
#define RFM12_UART_DEBUG 0 #define RFM12_UART_DEBUG 0

1
src/rfm12/rfm12_lib Submodule

@ -0,0 +1 @@
Subproject commit e49ecece7baf2faa48ed2f6c659228b4d77c0c66