fix examples for express boards to check the SPI define

adafruit · Feb 17, 2019 · 4f15bde · 4f15bde
1 parent 4e6251d
commit 4f15bde
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 28 deletions.
diff --git a/examples/SPI_Flash_Manipulator/SPI_Flash_Manipulator.ino b/examples/SPI_Flash_Manipulator/SPI_Flash_Manipulator.ino
@@ -4,13 +4,14 @@
 void PrintHex(const byte * data, const uint32_t numBytes);
 #include <Adafruit_SPIFlash.h>
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
 #endif
+
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI 
 
 #define SD_CS 2

diff --git a/examples/circuitpython_backupFiles/circuitpython_backupFiles.ino b/examples/circuitpython_backupFiles/circuitpython_backupFiles.ino
@@ -24,16 +24,16 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
+#define NEOPIN         40       // neopixel pin
+
 #define BUFFERSIZ      200
 
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI 
@@ -50,7 +50,7 @@ Adafruit_NeoPixel pixel = Adafruit_NeoPixel(1, NEOPIN, NEO_GRB + NEO_KHZ800);
 
 void setup() {
   Serial.begin(115200);
-  while (!Serial);
+  //while (!Serial);
   delay(1000); // small delay in case we want to watch it on the serial port  
   Serial.println("Adafruit Express CircuitPython Flash Repair");
 
@@ -169,4 +169,4 @@ void error(uint8_t i) {
     }
     delay(1000);    
   }
-}
+}
diff --git a/examples/fatfs_circuitpython/fatfs_circuitpython.ino b/examples/fatfs_circuitpython/fatfs_circuitpython.ino
@@ -35,16 +35,15 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
+
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI
 
 // Alternatively you can define and use non-SPI pins!

diff --git a/examples/fatfs_datalogging/fatfs_datalogging.ino b/examples/fatfs_datalogging/fatfs_datalogging.ino
@@ -27,16 +27,15 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
+
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI
 
 // Alternatively you can define and use non-SPI pins!

diff --git a/examples/fatfs_format/fatfs_format.ino b/examples/fatfs_format/fatfs_format.ino
@@ -44,14 +44,12 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI

diff --git a/examples/fatfs_full_usage/fatfs_full_usage.ino b/examples/fatfs_full_usage/fatfs_full_usage.ino
@@ -35,16 +35,15 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
+
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI
 
 // Alternatively you can define and use non-SPI pins!

diff --git a/examples/fatfs_print_file/fatfs_print_file.ino b/examples/fatfs_print_file/fatfs_print_file.ino
@@ -31,16 +31,16 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
+
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI
 
 // Alternatively you can define and use non-SPI pins!

diff --git a/examples/flash_erase/flash_erase.ino b/examples/flash_erase/flash_erase.ino
@@ -29,15 +29,12 @@
                                               // If you change this be
                                               // sure to change the fatfs
                                               // object type below to match.
-
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI

diff --git a/examples/flash_erase_express/flash_erase_express.ino b/examples/flash_erase_express/flash_erase_express.ino
@@ -33,16 +33,17 @@
                                               // sure to change the fatfs
                                               // object type below to match.
 
-#if !defined(SS1)
+#if (SPI_INTERFACES_COUNT == 1)
   #define FLASH_SS       SS                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI                   // What SPI port is Flash on?
-  #define NEOPIN         8
 #else
   #define FLASH_SS       SS1                    // Flash chip SS pin.
   #define FLASH_SPI_PORT SPI1                   // What SPI port is Flash on?
-  #define NEOPIN         40
 #endif
 
+#define NEOPIN         40       // neopixel pin
+
+
 Adafruit_SPIFlash flash(FLASH_SS, &FLASH_SPI_PORT);     // Use hardware SPI
 // Alternatively you can define and use non-SPI pins!
 //Adafruit_SPIFlash flash(SCK1, MISO1, MOSI1, FLASH_SS);