From d6e322a98855f6e6dcd4e73dac66c765d0217191 Mon Sep 17 00:00:00 2001 From: tixiv Date: Fri, 2 Mar 2012 00:01:47 +0000 Subject: [PATCH] there was a problem with initing the rfm12. I have corrected it. --- main.c | 8 ++++---- rfm12/borg_rfm12.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 7a2d9fe..a07e07c 100644 --- a/main.c +++ b/main.c @@ -31,16 +31,16 @@ int main (void){ percnt_inc(); #endif +#ifdef RFM12_SUPPORT + borg_rfm12_init(); +#endif + borg_hw_init(); #ifdef CAN_SUPPORT bcan_init(); #endif -#ifdef RFM12_SUPPORT - borg_rfm12_init(); -#endif - #ifdef JOYSTICK_SUPPORT joy_init(); #endif diff --git a/rfm12/borg_rfm12.c b/rfm12/borg_rfm12.c index e63e55c..3f6e0fc 100644 --- a/rfm12/borg_rfm12.c +++ b/rfm12/borg_rfm12.c @@ -1,5 +1,6 @@ #include +#include #include "rfm12.h" @@ -30,5 +31,6 @@ void borg_rfm12_tick(){ } void borg_rfm12_init(){ + _delay_ms(200);//the rfm12 seems to need this rfm12_init(); }