From 340f319c3e91bfa934f3890618cc675391aa6af8 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Sat, 20 Mar 2021 20:12:39 -0700 Subject: [PATCH] Due can't use SPI_PTR; delete ATXMEGA/readme.md (use docs/atxmega.md instead) --- docs/atxmega.md | 9 +++--- utility/ATXMegaD3/README.md | 54 ---------------------------------- utility/Due/RF24_arch_config.h | 3 +- 3 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 utility/ATXMegaD3/README.md diff --git a/docs/atxmega.md b/docs/atxmega.md index 248ba300e..d1ebf61e6 100644 --- a/docs/atxmega.md +++ b/docs/atxmega.md @@ -40,12 +40,11 @@ ISR(TCE0_OVF_vect) ``` Declare the rf24 radio with `RF24 radio(XMEGA_PORTC_PIN3, XMEGA_SPI_PORT_C);` -First parameter is the CE pin which can be any available pin on the uC. - -Second parameter is the CS which can be on port C (**XMEGA_SPI_PORT_C**) or on port D (**XMEGA_SPI_PORT_D**). +1. First parameter is the CE pin which can be any available pin on the microcontroller. +2. Second parameter is the CS which can be on port C (**XMEGA_SPI_PORT_C**) or on port D (**XMEGA_SPI_PORT_D**). Call the `__start_timer()` to start the millisecond timer. -@note Note about the millisecond functionality:
+@note The millisecond functionality is based on the TCE0 so don't use these pins as IO.
-The operating frequency of the uC is 32MHz. If you have other frequency change the TCE0 registers appropriatly in function `__start_timer()` in **compatibility.c** file for your frequency. +The operating frequency of the uC is 32MHz. If you have a different frequency, change the TCE0 registers appropriatly in function `__start_timer()` in **compatibility.c** file for your frequency. diff --git a/utility/ATXMegaD3/README.md b/utility/ATXMegaD3/README.md deleted file mode 100644 index 6b704fa71..000000000 --- a/utility/ATXMegaD3/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This is a fork from **http://nRF24.github.io/RF24** which can be build as a static library for Atmel Studio 7. - -Not all files are needed. - -Just copy the following structure into a GCC Static Library project in AS7: -``` -utility\ - ATXMega256D3\ - compatibility.c - compatibility.h - gpio.cpp - gpio.h - gpio_helper.c - gpio_helper.h - includes.h - RF24_arch_config.h - spi.cpp - spi.h -nRF24L01.h -printf.h -RF24.cpp -RF24.h -RF24_config.h -``` - -Only ATXMega256D3 is supported right now! - -## Notes -The millisecond functionality is based on the TCE0 so don't use these pins as IO. - -The operating frequency of the uC is 32MHz. If else change the TCE0 registers appropriatly in function **__start_timer()** in **compatibility.c** file for your frequency. - - -## Usage -Add the library to your project! -In the file where the **main()** is put the following in order to update the millisecond functionality: -``` -ISR(TCE0_OVF_vect) -{ - update_milisec(); -} -``` - -Declare the rf24 radio with **RF24 radio(XMEGA_PORTC_PIN3, XMEGA_SPI_PORT_C);** - -First parameter is the CE pin which can be any available pin on the uC. - -Second parameter is the CS which can be on port C (**XMEGA_SPI_PORT_C**) or on port D (**XMEGA_SPI_PORT_D**). - -Call the **__start_timer()** to start the millisecond timer. - - - -** For further information please see http://nRF24.github.io/RF24 for all documentation** diff --git a/utility/Due/RF24_arch_config.h b/utility/Due/RF24_arch_config.h index 9a69eb155..a25670709 100644 --- a/utility/Due/RF24_arch_config.h +++ b/utility/Due/RF24_arch_config.h @@ -19,8 +19,7 @@ #include #define _BV(x) (1<<(x)) -#define _SPI SPIClass -#define RF24_SPI_PTR +#define _SPI SPI #ifdef SERIAL_DEBUG #define IF_SERIAL_DEBUG(x) ({x;})