From 56cbed7e3a04448f7863c5bd12edc984e218bfb2 Mon Sep 17 00:00:00 2001
From: George Talusan <george.talusan@gmail.com>
Date: Fri, 20 Oct 2017 14:14:44 -0400
Subject: [PATCH] disable DMA I2C on BLE Nano 2

---
 libraries/Wire/Wire.h         | 12 ++++++++----
 libraries/Wire/Wire_nRF51.cpp |  6 +++---
 libraries/Wire/Wire_nRF52.cpp |  6 +++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index 412ec588..bc6ee45c 100755
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -31,16 +31,20 @@
 // WIRE_HAS_END means Wire has end()
 #define WIRE_HAS_END 1
 
+#if defined(NRF52) && !defined(ARDUINO_RB_BLE_NANO_2)
+#define USE_DMA_TWI 1
+#endif
+
 class TwoWire : public Stream
 {
   public:
-#ifdef NRF52
+#ifdef USE_DMA_TWI
     TwoWire(NRF_TWIM_Type * p_twim, NRF_TWIS_Type * p_twis, IRQn_Type IRQn, uint8_t pinSDA, uint8_t pinSCL);
 #else
     TwoWire(NRF_TWI_Type * p_twi, uint8_t pinSDA, uint8_t pinSCL);
 #endif
     void begin();
-#ifdef NRF52
+#ifdef USE_DMA_TWI
     void begin(uint8_t);
 #endif
     void end();
@@ -60,7 +64,7 @@ class TwoWire : public Stream
     virtual int read(void);
     virtual int peek(void);
     virtual void flush(void);
-#ifdef NRF52
+#ifdef USE_DMA_TWI
     void onReceive(void(*)(int));
     void onRequest(void(*)(void));
     void onService(void);
@@ -69,7 +73,7 @@ class TwoWire : public Stream
     using Print::write;
 
   private:
-#ifdef NRF52
+#ifdef USE_DMA_TWI
     NRF_TWIM_Type * _p_twim;
     NRF_TWIS_Type * _p_twis;
 #else
diff --git a/libraries/Wire/Wire_nRF51.cpp b/libraries/Wire/Wire_nRF51.cpp
index bb4a9d60..072ef2c3 100755
--- a/libraries/Wire/Wire_nRF51.cpp
+++ b/libraries/Wire/Wire_nRF51.cpp
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef NRF51
+#include "Wire.h"
+
+#ifndef USE_DMA_TWI
 
 extern "C" {
 #include <string.h>
@@ -28,8 +30,6 @@ extern "C" {
 #include <Arduino.h>
 #include <wiring_private.h>
 
-#include "Wire.h"
-
 TwoWire::TwoWire(NRF_TWI_Type * p_twi, uint8_t pinSDA, uint8_t pinSCL)
 {
   this->_p_twi = p_twi;
diff --git a/libraries/Wire/Wire_nRF52.cpp b/libraries/Wire/Wire_nRF52.cpp
index e6ef2824..5c712412 100755
--- a/libraries/Wire/Wire_nRF52.cpp
+++ b/libraries/Wire/Wire_nRF52.cpp
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef NRF52
+#include "Wire.h"
+
+#ifdef USE_DMA_TWI
 
 extern "C" {
 #include <string.h>
@@ -27,8 +29,6 @@ extern "C" {
 #include <Arduino.h>
 #include <wiring_private.h>
 
-#include "Wire.h"
-
 TwoWire::TwoWire(NRF_TWIM_Type * p_twim, NRF_TWIS_Type * p_twis, IRQn_Type IRQn, uint8_t pinSDA, uint8_t pinSCL)
 {
   this->_p_twim = p_twim;