Merge pull request #40 from sparkfun/samd_update_1.5.0

Samd update 1.5.0

Author: jimblom

IDE_Board_Manager/package_sparkfun_index.json

@@ -542,6 +542,35 @@
               "version": "1.4.0"
             }
           ]
+        },
+        {
+          "name": "SparkFun SAMD Boards",
+          "architecture": "samd",
+          "version": "1.5.0",
+          "category": "Contributed",
+          "url": "https://github.com/sparkfun/Arduino_Boards/raw/master/IDE_Board_Manager/sparkfun-samd-1.5.0.tar.bz2",
+          "archiveFileName": "sparkfun-samd-1.5.0.tar.bz2",
+          "checksum": "SHA-256:0EC1574A319C1D561322C9E6FF1515B594956BC6B2CF6C92266F4D36684CBBF8",
+          "size": "322453",
+          "help": {
+            "online": "https://learn.sparkfun.com/tutorials/installing-arduino-ide/board-add-ons-with-arduino-board-manager"
+          },
+          "boards": [
+            {
+              "name": "SparkFun SAMD21 Mini Breakout"
+            },
+            {
+              "name": "SparkFun SAMD21 Dev Breakout"
+            },
+            {
+              "name": "SparkFun 9DoF Razor IMU M0"
+            },
+            {
+              "name": "LilyPad LilyMini"
+            }
+          ],
+          "toolsDependencies": [
+          ]
         }
       ],
       "tools": [
@@ -575,7 +604,7 @@
       ]
     },
     {
-      "maintainer": "SparkFun Electronics",
+      "maintainer": "SparkFun Electronics (dependency: Arduino SAMD Boards 1.6.19)",
       "help": {
         "online": "http://SparkFun.com"
       },

IDE_Board_Manager/sparkfun-samd-1.5.0.tar.bz2

@@ -34,7 +34,7 @@ samd21_dev.build.core=arduino
 samd21_dev.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
 samd21_dev.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 samd21_dev.build.openocdscript=openocd_scripts/arduino_zero.cfg
-samd21_dev.build.variant=arduino_zero
+samd21_dev.build.variant=SparkFun_SAMD21_Dev
 samd21_dev.build.variant_system_lib=
 samd21_dev.build.extra_combine_flags=
 samd21_dev.build.vid=0x1B4F

sparkfun/samd/boards.txt

@@ -238,14 +238,14 @@ size_t Print::printFloat(double number, uint8_t digits)
 
   // Print the decimal point, but only if there are digits beyond
   if (digits > 0) {
-    n += print(".");
+    n += print('.');
   }
 
   // Extract digits from the remainder one at a time
   while (digits-- > 0)
   {
     remainder *= 10.0;
-    unsigned int toPrint = (unsigned int)remainder;
+    unsigned int toPrint = (unsigned int)(remainder);
     n += print(toPrint);
     remainder -= toPrint;
   }

sparkfun/samd/cores/arduino/Print.cpp

@@ -28,6 +28,9 @@
 #define DEC 10
 #define HEX 16
 #define OCT 8
+#ifdef BIN // Prevent warnings if BIN is previously defined in "iotnx4.h" or similar
+#undef BIN
+#endif
 #define BIN 2
 
 class Print
@@ -54,6 +57,10 @@ class Print
       return write((const uint8_t *)buffer, size);
     }
 
+    // default to zero, meaning "a single write may block"
+    // should be overriden by subclasses with buffering
+    virtual int availableForWrite() { return 0; }
+
     size_t print(const __FlashStringHelper *);
     size_t print(const String &);
     size_t print(const char[]);
@@ -78,6 +85,8 @@ class Print
     size_t println(double, int = 2);
     size_t println(const Printable&);
     size_t println(void);
+
+    virtual void flush() { /* Empty implementation for backward compatibility */ }
 };
 
 #endif

sparkfun/samd/cores/arduino/Print.h

@@ -16,6 +16,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef __cplusplus
+
 #ifndef _RING_BUFFER_
 #define _RING_BUFFER_
 
@@ -27,24 +29,114 @@
 // location from which to read.
 #define SERIAL_BUFFER_SIZE 64
 
-class RingBuffer
+template <int N>
+class RingBufferN
 {
   public:
-    uint8_t _aucBuffer[SERIAL_BUFFER_SIZE] ;
-    int _iHead ;
-    int _iTail ;
+    uint8_t _aucBuffer[N] ;
+    volatile int _iHead ;
+    volatile int _iTail ;
 
   public:
-    RingBuffer( void ) ;
+    RingBufferN( void ) ;
     void store_char( uint8_t c ) ;
-	void clear();
-	int read_char();
-	int available();
-	int peek();
-	bool isFull();
+    void clear();
+    int read_char();
+    int available();
+    int availableForStore();
+    int peek();
+    bool isFull();
 
   private:
-	int nextIndex(int index);
-} ;
+    int nextIndex(int index);
+};
+
+typedef RingBufferN<SERIAL_BUFFER_SIZE> RingBuffer;
+
+
+template <int N>
+RingBufferN<N>::RingBufferN( void )
+{
+    memset( _aucBuffer, 0, N ) ;
+    clear();
+}
+
+template <int N>
+void RingBufferN<N>::store_char( uint8_t c )
+{
+  int i = nextIndex(_iHead);
+
+  // if we should be storing the received character into the location
+  // just before the tail (meaning that the head would advance to the
+  // current location of the tail), we're about to overflow the buffer
+  // and so we don't write the character or advance the head.
+  if ( i != _iTail )
+  {
+    _aucBuffer[_iHead] = c ;
+    _iHead = i ;
+  }
+}
+
+template <int N>
+void RingBufferN<N>::clear()
+{
+  _iHead = 0;
+  _iTail = 0;
+}
+
+template <int N>
+int RingBufferN<N>::read_char()
+{
+  if(_iTail == _iHead)
+    return -1;
+
+  uint8_t value = _aucBuffer[_iTail];
+  _iTail = nextIndex(_iTail);
+
+  return value;
+}
+
+template <int N>
+int RingBufferN<N>::available()
+{
+  int delta = _iHead - _iTail;
+
+  if(delta < 0)
+    return N + delta;
+  else
+    return delta;
+}
+
+template <int N>
+int RingBufferN<N>::availableForStore()
+{
+  if (_iHead >= _iTail)
+    return N - 1 - _iHead + _iTail;
+  else
+    return _iTail - _iHead - 1;
+}
+
+template <int N>
+int RingBufferN<N>::peek()
+{
+  if(_iTail == _iHead)
+    return -1;
+
+  return _aucBuffer[_iTail];
+}
+
+template <int N>
+int RingBufferN<N>::nextIndex(int index)
+{
+  return (uint32_t)(index + 1) % N;
+}
+
+template <int N>
+bool RingBufferN<N>::isFull()
+{
+  return (nextIndex(_iHead) == _iTail);
+}
 
 #endif /* _RING_BUFFER_ */
+
+#endif /* __cplusplus */