Skip to content

Added macro NRF52_SERIES when checking for _delay_us to work with NRF52840 #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

Added macro NRF52_SERIES when checking for _delay_us to work with NRF52840 #208

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dae23b2
Merge pull request #170 from Marzogh/master
Marzogh Apr 20, 2019
2711ccc
Merge pull request #178 from Marzogh/development
Marzogh Jun 1, 2019
82db983
Merge pull request #179 from Marzogh/development
Marzogh Jun 3, 2019
1f1e4de
Merge pull request #180 from Marzogh/stable
Marzogh Jun 3, 2019
107db45
Added macro NRF52_SERIES when checking for _delay_us to work with NRF…
jose-smt May 13, 2020
6ddd7a2
Merge branch 'development' into nrf52840_fix
Marzogh Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 39 additions & 38 deletions src/SPIMemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,43 +64,43 @@
// platforms (In ALPHA) //
// //
// Change the ZERO_SPISERCOM define below to use other SPI ports //
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
// #define ENABLEZERODMA //
// #define ZERO_SPISERCOM SERCOM4 //
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//

# include <Arduino.h>
# include <SPI.h>
# include "defines.h"
# include "SPIFlash.h"
# include "SPIFram.h"
# include "diagnostics.h"

# if defined(ARDUINO_ARCH_SAM)
# include <malloc.h>
# include <stdlib.h>
# include <stdio.h>
# include "DMASAM.h"
# endif

# if defined(ARDUINO_ARCH_SAMD)
# if defined(ENABLEZERODMA)
# include "DMASAMD.h"
# endif
# endif

# if defined(BOARD_RTL8195A)
# ifdef __cplusplus
extern "C" {
# endif

# include "gpio_api.h"
# include "PinNames.h"

# ifdef __cplusplus
}
# endif
# endif /* if defined(BOARD_RTL8195A) */
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
//#define ENABLEZERODMA //
//#define ZERO_SPISERCOM SERCOM4 //
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//

#include <Arduino.h>
#include <SPI.h>
#include "defines.h"
#include "SPIFlash.h"
#include "SPIFram.h"
#include "diagnostics.h"

#if defined (ARDUINO_ARCH_SAM)
#include <malloc.h>
#include <stdlib.h>
#include <stdio.h>
#include "DMASAM.h"
#endif

#if defined (ARDUINO_ARCH_SAMD)
#if defined (ENABLEZERODMA)
#include "DMASAMD.h"
#endif
#endif

#if defined (BOARD_RTL8195A)
#ifdef __cplusplus
extern "C" {
#endif

#include "gpio_api.h"
#include "PinNames.h"

#ifdef __cplusplus
}
#endif
#endif

# ifndef ARCH_STM32
# if defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_STM32L0) || defined(__STM32F1__) || defined(STM32F1) || \
Expand All @@ -109,7 +109,8 @@ extern "C" {
# endif
# endif
# if defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_ESP8266) || defined(SIMBLEE) || \
defined(ARDUINO_ARCH_ESP32) || defined(BOARD_RTL8195A) || defined(ARCH_STM32) || defined(ESP32) || defined(NRF52)
defined(ARDUINO_ARCH_ESP32) || defined(BOARD_RTL8195A) || defined(ARCH_STM32) || defined(ESP32) || defined(NRF52) || defined(NRF52_SERIES)

// RTL8195A included - @boseji <[email protected]> 02.03.17
# define _delay_us(us) delayMicroseconds(us)
# else
Expand Down