Merge branch 'master' into Allow-Big-Structures

Zanduino · Sep 8, 2017 · 146ccdd · 146ccdd
2 parents 18fa112 + af9a603
commit 146ccdd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Examples/ReadWrite/ReadWrite.ino b/Examples/ReadWrite/ReadWrite.ino
@@ -83,7 +83,7 @@ void setup() {                                                                //
   } // of for-next loop                                                       //                                  //
                                                                               //                                  //
   Serial.println("Writing array to memory.");                                 //                                  //
-  char testArray[13] = "Hello World!";                                        //                                  //
+  char testArray[13] = "Hello Borld!";                                        //                                  //
   FRAM.write(200,testArray);                                                  //                                  //
   FRAM.read(200,testArray);                                                   //                                  //
   Serial.print("Read string array as \"");                                    //                                  //

diff --git a/MB85_FRAM.cpp b/MB85_FRAM.cpp
@@ -113,9 +113,9 @@ uint8_t MB85_FRAM_Class::getDevice(uint32_t &memAddress,uint32_t &endAddress){//
 /*******************************************************************************************************************
 ** Method memSize() returns the device's size in Kb                                                               **
 *******************************************************************************************************************/
-uint16_t MB85_FRAM_Class::memSize(const uint8_t memNumber) {                  // Return memory size in bytes      //
-   if(memNumber<=_DeviceCount) return((uint32_t)_I2C[memNumber]*1024);        // Return appropriate value         //
-                          else return 0;                                      // or zero                          //
+uint32_t MB85_FRAM_Class::memSize(const uint8_t memNumber) {                  // Return memory size in bytes      //
+  if(memNumber<=_DeviceCount) return((uint32_t)_I2C[memNumber]*1024);         // Return either memory size or the //
+                         else return 0;                                       // value of zero                    //
 } // of method memSize()                                                      //----------------------------------//   
 
 /*******************************************************************************************************************

diff --git a/MB85_FRAM.h b/MB85_FRAM.h
@@ -59,8 +59,7 @@
       ~MB85_FRAM_Class();                                                     // Class destructor                 //
       uint8_t begin();                                                        // Start using I2C Communications   //
       uint32_t totalBytes();                                                  // Return the total memory available//
-      uint16_t memSize(const uint8_t memNumber);                              // Return memory size in bytes      //
-
+      uint32_t memSize(const uint8_t memNumber);                              // Return memory size in bytes      //
       /*************************************************************************************************************
       ** Declare the read and write methods as template functions. All device I/O is done through these two       **
       ** functions. If multiple memories have been found they are treated as if they were just one large memory,  **