v1.5.1-final

#### New in v1.5.1 1. Add support to nRF52 boards, such as AdaFruit Feather nRF52832, nRF52840 Express, BlueFruit Sense, Itsy-Bitsy nRF52840 Express, Metro nRF52840 Express, Clue nRF52840, Nordic nRF52840DK, Particle Xenon, etc. Raytac MDBT50Q-RX Dongle is not supported. 2. Add support to ***NINA_B302_ublox running as nRF52840***. Thanks to great work of [Miguel Alexandre Wisintainer](https://github.com/tcpipchip) for initiating, inspriring, working with, developing, debugging and testing. See [u-blox nina b](#1)
khoih-prog · Apr 23, 2020 · f1f517f · f1f517f
1 parent 645708e
commit f1f517f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 31 deletions.
diff --git a/src/utility/server_drv.cpp b/src/utility/server_drv.cpp
@@ -35,23 +35,14 @@
 
 #define _DEBUG_
 
-//#include "utility/server_drv.h"
 #include "server_drv.h"
 
 #include "Arduino.h"
-//#include "utility/spi_drv.h"
 #include "spi_drv.h"
 
-#if 1
 // From v1.5.1, For nRF52x
 #include "wl_types.h"
 #include "debug.h"
-#else
-extern "C" {
-#include "utility/wl_types.h"
-#include "utility/debug.h"
-}
-#endif
 
 // Start server TCP on port specified
 void ServerDrv::startServer(uint16_t port, uint8_t sock, uint8_t protMode)

diff --git a/src/utility/server_drv.h b/src/utility/server_drv.h
@@ -37,7 +37,6 @@
 #define Server_Drv_h
 
 #include <inttypes.h>
-//#include "utility/wifi_spi.h"
 #include "wifi_spi.h"
 
 typedef enum eProtMode {TCP_MODE, UDP_MODE, TLS_MODE, UDP_MULTICAST_MODE}tProtMode;

diff --git a/src/utility/spi_drv.cpp b/src/utility/spi_drv.cpp
@@ -35,7 +35,6 @@
 
 #include "Arduino.h"
 #include <SPI.h>
-//#include "utility/spi_drv.h"
 #include "spi_drv.h"
 #include "pins_arduino.h"
 
@@ -45,7 +44,7 @@
 #if defined(KH_WIFININA_DEBUG)
 #undef KH_WIFININA_DEBUG
 #endif
-#define KH_WIFININA_DEBUG   3
+#define KH_WIFININA_DEBUG   0
 
 #ifdef ARDUINO_SAMD_MKRVIDOR4000
 
@@ -69,14 +68,9 @@
 #endif    //ARDUINO_SAMD_MKRVIDOR4000
 
 #define _DEBUG_
-#if 1
+
 // From v1.5.1, For nRF52x
 #include "debug.h"
-#else
-extern "C" {
-#include "utility/debug.h"
-}
-#endif
 
 static uint8_t SLAVESELECT = 10; // ss
 static uint8_t SLAVEREADY  = 7;  // handshake pin

diff --git a/src/utility/spi_drv.h b/src/utility/spi_drv.h
@@ -37,7 +37,6 @@
 #define SPI_Drv_h
 
 #include <inttypes.h>
-//#include "utility/wifi_spi.h"
 #include "wifi_spi.h"
 
 #define SPI_START_CMD_DELAY 	10

diff --git a/src/utility/wifi_drv.cpp b/src/utility/wifi_drv.cpp
@@ -38,25 +38,15 @@
 #include <stdint.h>
 
 #include "Arduino.h"
-//#include "utility/spi_drv.h"
-//#include "utility/wifi_drv.h"
 #include "spi_drv.h"
 #include "wifi_drv.h"
 
 #define _DEBUG_
 
-#if 1
 // From v1.5.1, For nRF52x
 #include "wifi_spi.h"
 #include "wl_types.h"
 #include "debug.h"
-#else
-extern "C" {
-#include "utility/wifi_spi.h"
-#include "utility/wl_types.h"
-#include "utility/debug.h"
-}
-#endif
 
 // Array of data to cache the information related to the networks discovered
 char 	WiFiDrv::_networkSsid[][WL_SSID_MAX_LENGTH] = {{"1"},{"2"},{"3"},{"4"},{"5"}};

diff --git a/src/utility/wifi_drv.h b/src/utility/wifi_drv.h
@@ -37,7 +37,6 @@
 #define WiFi_Drv_h
 
 #include <inttypes.h>
-//#include "utility/wifi_spi.h"
 #include "wifi_spi.h"
 #include "IPAddress.h"
 #include "WiFiUdp_Generic.h"

diff --git a/src/utility/wifi_spi.h b/src/utility/wifi_spi.h
@@ -37,7 +37,6 @@
 #define WiFi_Spi_h
 
 #include <inttypes.h>
-//#include "utility/wl_definitions.h"
 #include "wl_definitions.h"
 
 #define CMD_FLAG        0