Merge branch 'master' into stable

Marzogh · May 21, 2018 · 61ea25c · 61ea25c
2 parents ab7eaff + f828076
commit 61ea25c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,10 +1,5 @@
-![GitHub issue state](https://img.shields.io/github/issues/detail/s/Marzogh/SPIFlash/979.svg)
-![GitHub issue title](https://img.shields.io/github/issues/detail/title/Marzogh/SPIFlash/1290.svg)
-![GitHub issue author](https://img.shields.io/github/issues/detail/u/Marzogh/SPIFlash/979.svg)
-![GitHub issue label](https://img.shields.io/github/issues/detail/label/Marzogh/SPIFlash/979.svg)
-![GitHub issue comments](https://img.shields.io/github/issues/detail/comments/Marzogh/SPIFlash/979.svg)
-![GitHub issue age](https://img.shields.io/github/issues/detail/age/Marzogh/SPIFlash/979.svg)
-![GitHub issue last update](https://img.shields.io/github/issues/detail/last-update/Marzogh/SPIFlash/979.svg)
+![GitHub issue state](https://img.shields.io/github/issues/detail/s/Marzogh/SPIFlash/14.svg) ![GitHub issue title](https://img.shields.io/github/issues/detail/title/Marzogh/SPIFlash/14.svg) ![GitHub issue author](https://img.shields.io/github/issues/detail/u/Marzogh/SPIFlash/14.svg) ![GitHub issue label](https://img.shields.io/github/issues/detail/label/Marzogh/SPIFlash/14.svg) ![GitHub issue comments](https://img.shields.io/github/issues/detail/comments/Marzogh/SPIFlash/14.svg) ![GitHub issue age](https://img.shields.io/github/issues/detail/age/Marzogh/SPIFlash/14.svg) ![GitHub issue last update](https://img.shields.io/github/issues/detail/last-update/Marzogh/SPIFlash/14.svg)
+###### ---------------------------- **DO NOT DELETE OR EDIT** anything above this line ----------------------------
 ###### ---------------------------- **DO NOT DELETE OR EDIT** anything above this line ----------------------------
 
 Hey there! Thanks for using the SPIFlash library for Arduino.

diff --git a/examples/FlashDiagnostics/FlashDiagnostics.ino b/examples/FlashDiagnostics/FlashDiagnostics.ino
@@ -38,11 +38,12 @@
 #define FALSE 0
 
 SPIFlash flash;
+//SPIFlash flash(11);
 //SPIFlash flash(SS1, &SPI1);       //Use this constructor if using an SPI bus other than the default SPI. Only works with chips with more than one hardware SPI bus
 
 void setup() {
   Serial.begin(BAUD_RATE);
-#if defined (ARDUINO_ARCH_SAMD) || (__AVR_ATmega32U4__) || defined(ARCH_STM32)
+#if defined (ARDUINO_ARCH_SAMD) || (__AVR_ATmega32U4__) || defined(ARCH_STM32) || defined(NRF5)
   while (!Serial) ; // Wait for Serial monitor to open
 #endif
   delay(50); //Time to terminal get connected

diff --git a/examples/TestFlash/TestFlash.ino b/examples/TestFlash/TestFlash.ino
@@ -91,7 +91,7 @@ String inputString, outputString;
 #define BAUD_RATE 115200
 #endif
 
-SPIFlash flash;                   
+SPIFlash flash(11);                   
 //SPIFlash flash(SS1, &SPI1);       //Use this constructor if using an SPI bus other than the default SPI. Only works with chips with more than one hardware SPI bus
 
 void setup() {

diff --git a/extras/Changes.log b/extras/Changes.log
@@ -31,6 +31,7 @@ The library now does the following - if the flash memory chip is compatible with
 			- eraseSector, eraseBlock32K, eraseBlock64K
 --> Reads timing information from SFDP to accurately time the following operations:
 			- eraseSector, eraseBlock32K, eraseBlock64K
+- Fixes #125 in commit 10c2b86. The library automatically uses the alternate chip erase code (0xC7) as required (only on fully supported chips)
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 //				 	 						Version 3.1.0 									   	   //