merging in #6

.travis.yml

@@ -18,7 +18,7 @@ branches:
 
 env:
   global:
-     - ARDUINO_IDE_VERSION="1.8.5"
+     - ARDUINO_IDE_VERSION="1.8.7"
      - PRETTYNAME="Adafruit SPIFlash library"
 
 before_install:

Adafruit_SPIFlash.cpp

@@ -28,7 +28,7 @@ Adafruit_SPIFlash::Adafruit_SPIFlash(int8_t ss, SPIClass *spiinterface)
 }
 
 
-boolean Adafruit_SPIFlash::begin(spiflash_type_t t) {
+bool Adafruit_SPIFlash::begin(spiflash_type_t t) {
   type = t;
 
   DEBUG_PRINTLN("Begin SPIFlash");
@@ -135,7 +135,7 @@ void Adafruit_SPIFlash::spiwrite(uint8_t data) {
   spiwrite(&data, 1);
 }
 
-void Adafruit_SPIFlash::spiwrite(uint8_t *data, uint16_t length) {
+void Adafruit_SPIFlash::spiwrite(const uint8_t *data, uint16_t length) {
   byte c;
 
   if (_spi) { // hardware SPI
@@ -434,9 +434,6 @@ void Adafruit_SPIFlash::WriteEnable (bool enable)
 /**************************************************************************/
 uint32_t Adafruit_SPIFlash::readBuffer (uint32_t address, uint8_t *buffer, uint32_t len)
 {
-  uint32_t a, i;
-  a = i = 0;
-
   // Make sure the address is valid
   if (address >= totalsize)
   {
@@ -625,7 +622,7 @@ bool Adafruit_SPIFlash::eraseChip (void)
                 within the limits of the starting address and page length.
 */
 /**************************************************************************/
-uint32_t Adafruit_SPIFlash::WritePage (uint32_t address, uint8_t *buffer, uint32_t len, bool fastquit)
+uint32_t Adafruit_SPIFlash::WritePage (uint32_t address, const uint8_t *buffer, uint32_t len, bool fastquit)
 {
   uint8_t status;
 
@@ -690,7 +687,7 @@ uint32_t Adafruit_SPIFlash::WritePage (uint32_t address, uint8_t *buffer, uint32
     return 0;
   }
 
-  // Transfer data
+  // Transfer data 
   spiwrite(buffer, len);
 
   // Write only occurs after the CS line is de-asserted
@@ -723,7 +720,7 @@ uint32_t Adafruit_SPIFlash::WritePage (uint32_t address, uint8_t *buffer, uint32
                 address and size of the flash device.
 */
 /**************************************************************************/
-uint32_t Adafruit_SPIFlash::writeBuffer(uint32_t address, uint8_t *buffer, uint32_t len)
+uint32_t Adafruit_SPIFlash::writeBuffer(uint32_t address, const uint8_t *buffer, uint32_t len)
 {
   uint32_t bytestowrite;
   uint32_t bufferoffset;
@@ -787,8 +784,8 @@ uint32_t Adafruit_SPIFlash::writeBuffer(uint32_t address, uint8_t *buffer, uint3
 /**************************************************************************/
 uint32_t Adafruit_SPIFlash::findFirstEmptyAddr(void)
 {
-  uint32_t address, latestUsedAddr;
-  uint8_t b;
+  uint32_t address = 0, latestUsedAddr = 0;
+  uint8_t b = 0;
 
   // Wait until the device is ready or a timeout occurs
   if (WaitForReady())
@@ -837,10 +834,12 @@ uint32_t Adafruit_SPIFlash::getAddr(void) {
   return currentAddr;
 }
 
-boolean Adafruit_SPIFlash::appendData(void) {
+bool Adafruit_SPIFlash::appendData(void) {
   uint32_t addr = findFirstEmptyAddr();
-  if (addr == -1) return false;
+  if (addr == uint32_t(-1)) 
+    return false;
   seek(addr);
+  return true;
 }
 
 size_t Adafruit_SPIFlash::write(uint8_t b) {

Adafruit_SPIFlash.h

@@ -95,7 +95,7 @@ class Adafruit_SPIFlash  : public Print {
   Adafruit_SPIFlash(int8_t clk, int8_t miso, int8_t mosi, int8_t ss);
   Adafruit_SPIFlash(int8_t ss, SPIClass *spiinterface=&SPI);
 
-  boolean begin(spiflash_type_t t);
+  bool begin(spiflash_type_t t);
 
   // Help functions to display formatted text
   void PrintHex(const byte * data, const uint32_t numBytes);
@@ -114,17 +114,17 @@ class Adafruit_SPIFlash  : public Print {
   bool     eraseChip (void);
 
   // Write one page worth of data
-  uint32_t writePage (uint32_t address, uint8_t *buffer, uint32_t len, bool fastquit=false) {
+  uint32_t writePage (uint32_t address, const uint8_t *buffer, uint32_t len, bool fastquit=false) {
     return WritePage(address, buffer, len, fastquit);
   }
-  uint32_t WritePage (uint32_t address, uint8_t *buffer, uint32_t len, bool fastquit=false);
+  uint32_t WritePage (uint32_t address, const uint8_t *buffer, uint32_t len, bool fastquit=false);
 
   // Write an arbitrary-sized buffer
-  virtual uint32_t writeBuffer (uint32_t address, uint8_t *buffer, uint32_t len);
+  uint32_t writeBuffer (uint32_t address, const uint8_t *buffer, uint32_t len);
   uint32_t findFirstEmptyAddr(void);
   void seek(uint32_t);
   size_t write(uint8_t b);
-  boolean appendData(void);
+  bool appendData(void);
   uint32_t getAddr();
   uint8_t readstatus();
 
@@ -133,9 +133,9 @@ class Adafruit_SPIFlash  : public Print {
 
  protected:
   spiflash_type_t type;
-  int32_t pagesize;
-  int32_t pages;
-  int32_t totalsize;
+  uint32_t pagesize;
+  uint32_t pages;
+  uint32_t totalsize;
   uint8_t addrsize;
 
   uint32_t currentAddr;
@@ -149,7 +149,7 @@ class Adafruit_SPIFlash  : public Print {
 
   void readspidata(uint8_t* buff, uint8_t n);
   void spiwrite(uint8_t c);
-  void spiwrite(uint8_t *data, uint16_t length);
+  void spiwrite(const uint8_t *data, uint16_t length);
   uint8_t spiread(void);
   void spiread(uint8_t *data, uint16_t length);
   bool WaitForReady(uint32_t timeout=1000);

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit SPIFlash
-version=1.0.8
+version=1.1.0
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=SPI Flash filesystem support for FAT and CircuitPython FS support from within Arduino