Merged in changes from upstream SAMD CORE 1.6.16 2017.08.23

mattairtech · mattairtech · commit b9aa95de9aa7 · 2017-09-30T06:28:19.000Z
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,11 +1,8 @@
-1.6.16: (identical to beta version 1.6.8-beta-b3)
-1.6.8-beta-b3:
-* Changed version numbering to match Arduino SAMD core to indicate which upstream changes have been merged in.
-  Release version 1.6.7 then skips to 1.6.16. Beta version 1.6.8-beta-b3 became release version 1.6.16.
+1.6.16 (release version, same as 1.6.16-beta-b0):
+1.6.16-beta-b0:
 * Added MattairTech Xeno support (64-pin D21, L21, and C21)
-* Merged in changes from upstream SAMD CORE 1.6.17 (not released yet):
-  * Fix changing trigger mode (RISING/FALLING/...) in attachInterrupt(..) during runtime. Thanks @joverbee
-  * Improved ISR response time. Thanks @joverbee
+* Changed version numbering to match Arduino SAMD core to indicate which upstream changes have been merged in.
+  * Release version 1.6.7 then skips to 1.6.16. Beta version 1.6.8-beta-b2 skips to 1.6.16-beta-b0.
 * Merged in changes from upstream SAMD CORE 1.6.16 2017.08.23:
   * PWMs now can perform real 16-bit resolution if analogWriteResolution(16) is set. Thanks @Adminius
   * USB CDC: fixed issue of available() getting stuck when receiving ZLP's
@@ -15,6 +12,8 @@
   * Fixed pgm_read_ptr compatibility macro. Thanks @nkrkv
 * Documentation updates
 
+**Version numbering change**
+
 1.6.8-beta-b2:
 * Added SD Card firmware loading support to the bootloader (4KB and 8KB)
 * Removed SDU library, as the bootloader now supports SD cards directly
diff --git a/README.md b/README.md
@@ -18,12 +18,9 @@ CHANGELOG for details on upstream commits and MattairTech additions that have be
 
 ## What's New - Release Version (1.6.16)
 
-* Changed version numbering to match Arduino SAMD core to indicate which upstream changes have been merged in.
-  Release version 1.6.7 then skips to 1.6.16. Beta version 1.6.8-beta-b3 became 1.6.16.
 * Added MattairTech Xeno support (64-pin D21, L21, and C21)
-* Merged in changes from upstream SAMD CORE 1.6.17 (not released yet):
-  * Fix changing trigger mode (RISING/FALLING/...) in attachInterrupt(..) during runtime. Thanks @joverbee
-  * Improved ISR response time. Thanks @joverbee
+* Changed version numbering to match Arduino SAMD core to indicate which upstream changes have been merged in.
+  * Release version 1.6.7 then skips to 1.6.16. Beta version 1.6.8-beta-b2 skips to 1.6.16-beta-b0.
 * Merged in changes from upstream SAMD CORE 1.6.16 2017.08.23:
   * PWMs now can perform real 16-bit resolution if analogWriteResolution(16) is set. Thanks @Adminius
   * USB CDC: fixed issue of available() getting stuck when receiving ZLP's
@@ -34,11 +31,13 @@ CHANGELOG for details on upstream commits and MattairTech additions that have be
 * Documentation updates
 
 
-## What's New - Beta Version (1.6.8-beta)
+## What's New - Beta Version (1.6.16-beta)
 **See Beta Builds section for installation instructions.**
 
-**1.6.8-beta-b3:**
-*Beta version 1.6.8-beta-b3 became release version 1.6.16. See above*
+**1.6.16-beta-b0:**
+*Beta version 1.6.16-beta-b0 became release version 1.6.16. See above*
+
+**Version numbering change**
 
 **1.6.8-beta-b2:**
 * Added SD Card firmware loading support to the bootloader (4KB and 8KB)
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
@@ -355,7 +355,7 @@ allow the build_all_bootloaders.sh script to select SD Card support.
 
 #### Boards definitions:
 
-* MT_D21E_rev_A, MT_D21E_rev_B, MT_D11, MT_D21J
+* Xeno, MT_D21E_rev_A, MT_D21E_rev_B, MT_D11, MT_D21J
 * arduino_zero, arduino_mkrzero, arduino_mkr1000, genuino_mkr1000, genuino_zero
 * Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
 
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
@@ -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;
   }
diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
@@ -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
diff --git a/cores/arduino/RingBuffer.cpp b/cores/arduino/RingBuffer.cpp
@@ -67,6 +67,14 @@ int RingBuffer::available()
 		return delta;
 }
 
+int RingBuffer::availableForStore()
+{
+	if (_iHead >= _iTail)
+		return SERIAL_BUFFER_SIZE - 1 - _iHead + _iTail;
+	else
+		return _iTail - _iHead - 1;
+}
+
 int RingBuffer::peek()
 {
 	if(_iTail == _iHead)
diff --git a/cores/arduino/RingBuffer.h b/cores/arduino/RingBuffer.h
@@ -40,6 +40,7 @@ class RingBuffer
 	void clear();
 	int read_char();
 	int available();
+	int availableForStore();
 	int peek();
 	bool isFull();
 
diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
@@ -218,6 +218,16 @@ int SERCOM::writeDataUART(uint8_t data)
   return 1;
 }
 
+void SERCOM::enableDataRegisterEmptyInterruptUART()
+{
+  sercom->USART.INTENSET.reg |= SERCOM_USART_INTENSET_DRE;
+}
+
+void SERCOM::disableDataRegisterEmptyInterruptUART()
+{
+  sercom->USART.INTENCLR.reg = SERCOM_USART_INTENCLR_DRE;
+}
+
 /*	=========================
  *	===== Sercom SPI
  *	=========================
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
@@ -168,6 +168,8 @@ class SERCOM
 		int writeDataUART(uint8_t data) ;
 		bool isUARTError() ;
 		void acknowledgeUARTError() ;
+		void enableDataRegisterEmptyInterruptUART();
+		void disableDataRegisterEmptyInterruptUART();
 
 		/* ========== SPI ========== */
 		void initSPI(SercomSpiTXPad mosi, SercomRXPad miso, SercomSpiCharSize charSize, SercomDataOrder dataOrder) ;
diff --git a/cores/arduino/Stream.cpp b/cores/arduino/Stream.cpp
@@ -27,7 +27,7 @@
 
 #define PARSE_TIMEOUT 1000  // default number of milli-seconds to wait
 
-// private method to read stream with timeout
+// protected method to read stream with timeout
 int Stream::timedRead()
 {
   int c;
@@ -39,7 +39,7 @@ int Stream::timedRead()
   return -1;     // -1 indicates timeout
 }
 
-// private method to peek stream with timeout
+// protected method to peek stream with timeout
 int Stream::timedPeek()
 {
   int c;
diff --git a/cores/arduino/Stream.h b/cores/arduino/Stream.h
@@ -51,15 +51,14 @@ class Stream : public Print
   protected:
     unsigned long _timeout;      // number of milliseconds to wait for the next char before aborting timed read
     unsigned long _startMillis;  // used for timeout measurement
-    int timedRead();    // private method to read stream with timeout
-    int timedPeek();    // private method to peek stream with timeout
+    int timedRead();    // read stream with timeout
+    int timedPeek();    // peek stream with timeout
     int peekNextDigit(LookaheadMode lookahead, bool detectDecimal); // returns the next numeric digit in the stream or -1 if timeout
 
   public:
     virtual int available() = 0;
     virtual int read() = 0;
     virtual int peek() = 0;
-    virtual void flush() = 0;
 
     Stream() {_timeout=1000;}
 
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
@@ -184,6 +184,15 @@ uint32_t USBDeviceClass::sendConfiguration(uint32_t maxlen)
 	return true;
 }
 
+static void utox8(uint32_t val, char* s) {
+	for (int i = 0; i < 8; i++) {
+		int d = val & 0XF;
+		val = (val >> 4);
+
+		s[7 - i] = d > 9 ? 'A' + d - 10 : '0' + d;
+	}
+}
+
 bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 {
 	uint8_t t = setup.wValueH;
@@ -231,8 +240,19 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 		}
 		else if (setup.wValueL == ISERIAL) {
 #ifdef PLUGGABLE_USB_ENABLED
+			// from section 9.3.3 of the datasheet
+			#define SERIAL_NUMBER_WORD_0	*(volatile uint32_t*)(0x0080A00C)
+			#define SERIAL_NUMBER_WORD_1	*(volatile uint32_t*)(0x0080A040)
+			#define SERIAL_NUMBER_WORD_2	*(volatile uint32_t*)(0x0080A044)
+			#define SERIAL_NUMBER_WORD_3	*(volatile uint32_t*)(0x0080A048)
+
 			char name[ISERIAL_MAX_LEN];
-			PluggableUSB().getShortName(name);
+			utox8(SERIAL_NUMBER_WORD_0, &name[0]);
+			utox8(SERIAL_NUMBER_WORD_1, &name[8]);
+			utox8(SERIAL_NUMBER_WORD_2, &name[16]);
+			utox8(SERIAL_NUMBER_WORD_3, &name[24]);
+
+			PluggableUSB().getShortName(&name[32]);
 			return sendStringDescriptor((uint8_t*)name, setup.wLength);
 #endif
 		}
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
@@ -44,7 +44,7 @@
 #define CDC_TX CDC_ENDPOINT_IN
 #endif
 
-#define ISERIAL_MAX_LEN        33
+#define ISERIAL_MAX_LEN        65
 
 // Defined string description
 #define IMANUFACTURER	1
diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
@@ -50,10 +50,13 @@ void Uart::end()
 {
   sercom->resetUART();
   rxBuffer.clear();
+  txBuffer.clear();
 }
 
 void Uart::flush()
 {
+  while(txBuffer.available()); // wait until TX buffer is empty
+
   sercom->flushUART();
 }
 
@@ -63,6 +66,16 @@ void Uart::IrqHandler()
     rxBuffer.store_char(sercom->readDataUART());
   }
 
+  if (sercom->isDataRegisterEmptyUART()) {
+    if (txBuffer.available()) {
+      uint8_t data = txBuffer.read_char();
+
+      sercom->writeDataUART(data);
+    } else {
+      sercom->disableDataRegisterEmptyInterruptUART();
+    }
+  }
+
   if (sercom->isUARTError()) {
     sercom->acknowledgeUARTError();
     // TODO: if (sercom->isBufferOverflowErrorUART()) ....
@@ -79,7 +92,7 @@ int Uart::available()
 
 int Uart::availableForWrite()
 {
-  return (sercom->isDataRegisterEmptyUART() ? 1 : 0);
+  return txBuffer.availableForStore();
 }
 
 int Uart::peek()
@@ -94,7 +107,16 @@ int Uart::read()
 
 size_t Uart::write(const uint8_t data)
 {
-  sercom->writeDataUART(data);
+  if (sercom->isDataRegisterEmptyUART() && txBuffer.available() == 0) {
+    sercom->writeDataUART(data);
+  } else {
+    while(txBuffer.isFull()); // spin lock until a spot opens up in the buffer
+
+    txBuffer.store_char(data);
+
+    sercom->enableDataRegisterEmptyInterruptUART();
+  }
+
   return 1;
 }
 
diff --git a/cores/arduino/Uart.h b/cores/arduino/Uart.h
@@ -46,6 +46,7 @@ class Uart : public HardwareSerial
   private:
     SERCOM *sercom;
     RingBuffer rxBuffer;
+    RingBuffer txBuffer;
 
     uint8_t uc_pinRX;
     uint8_t uc_pinTX;
diff --git a/cores/arduino/avr/pgmspace.h b/cores/arduino/avr/pgmspace.h
@@ -103,7 +103,7 @@ typedef const void* uint_farptr_t;
 #define pgm_read_word(addr) (*(const unsigned short *)(addr))
 #define pgm_read_dword(addr) (*(const unsigned long *)(addr))
 #define pgm_read_float(addr) (*(const float *)(addr))
-#define pgm_read_ptr(addr) (*(const void *)(addr))
+#define pgm_read_ptr(addr) (*(const void **)(addr))
 
 #define pgm_read_byte_near(addr) pgm_read_byte(addr)
 #define pgm_read_word_near(addr) pgm_read_word(addr)
diff --git a/cores/arduino/delay.c b/cores/arduino/delay.c
@@ -26,7 +26,7 @@ extern "C" {
 /** Tick Counter united by ms */
 static volatile uint32_t _ulTickCount=0 ;
 
-uint32_t millis( void )
+unsigned long millis( void )
 {
 // todo: ensure no interrupts
   return _ulTickCount ;
@@ -36,7 +36,7 @@ uint32_t millis( void )
 // Theory: repeatedly take readings of SysTick counter, millis counter and SysTick interrupt pending flag.
 // When it appears that millis counter and pending is stable and SysTick hasn't rolled over, use these
 // values to calculate micros. If there is a pending SysTick, add one to the millis counter in the calculation.
-uint32_t micros( void )
+unsigned long micros( void )
 {
   uint32_t ticks, ticks2;
   uint32_t pend, pend2;
@@ -61,7 +61,7 @@ uint32_t micros( void )
   // a runtime multiplication and shift, saving a few cycles
 }
 
-void delay( uint32_t ms )
+void delay( unsigned long ms )
 {
   if ( ms == 0 )
   {
diff --git a/cores/arduino/delay.h b/cores/arduino/delay.h
@@ -33,7 +33,7 @@ extern "C" {
  *
  * \return Number of milliseconds since the program started (uint32_t)
  */
-extern uint32_t millis( void ) ;
+extern unsigned long millis( void ) ;
 
 /**
  * \brief Returns the number of microseconds since the Arduino board began running the current program.
@@ -45,23 +45,23 @@ extern uint32_t millis( void ) ;
  *
  * \note There are 1,000 microseconds in a millisecond and 1,000,000 microseconds in a second.
  */
-extern uint32_t micros( void ) ;
+extern unsigned long micros( void ) ;
 
 /**
  * \brief Pauses the program for the amount of time (in miliseconds) specified as parameter.
  * (There are 1000 milliseconds in a second.)
  *
  * \param dwMs the number of milliseconds to pause (uint32_t)
  */
-extern void delay( uint32_t dwMs ) ;
+extern void delay( unsigned long dwMs ) ;
 
 /**
  * \brief Pauses the program for the amount of time (in microseconds) specified as parameter.
  *
  * \param dwUs the number of microseconds to pause (uint32_t)
  */
-static __inline__ void delayMicroseconds( uint32_t ) __attribute__((always_inline, unused)) ;
-static __inline__ void delayMicroseconds( uint32_t usec )
+static __inline__ void delayMicroseconds( unsigned int ) __attribute__((always_inline, unused)) ;
+static __inline__ void delayMicroseconds( unsigned int usec )
 {
   if ( usec == 0 )
   {
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
diff --git a/libraries/I2S/src/I2S.cpp b/libraries/I2S/src/I2S.cpp
diff --git a/libraries/I2S/src/I2S.h b/libraries/I2S/src/I2S.h
diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp

Original file line number	Diff line number	Diff line change
`@@ -238,14 +238,14 @@ size_t Print::printFloat(double number, uint8_t digits)`
`238`	`238`
`239`	`239`	`// Print the decimal point, but only if there are digits beyond`
`240`	`240`	`if (digits > 0) {`
`241`		`- n += print(".");`
	`241`	`+ n += print('.');`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`// Extract digits from the remainder one at a time`
`245`	`245`	`while (digits-- > 0)`
`246`	`246`	`{`
`247`	`247`	`remainder *= 10.0;`
`248`		`- unsigned int toPrint = (unsigned int)remainder;`
	`248`	`+ unsigned int toPrint = (unsigned int)(remainder);`
`249`	`249`	`n += print(toPrint);`
`250`	`250`	`remainder -= toPrint;`
`251`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,14 @@ int RingBuffer::available()`
`67`	`67`	`return delta;`
`68`	`68`	`}`
`69`	`69`
	`70`	`+int RingBuffer::availableForStore()`
	`71`	`+{`
	`72`	`+ if (_iHead >= _iTail)`
	`73`	`+ return SERIAL_BUFFER_SIZE - 1 - _iHead + _iTail;`
	`74`	`+ else`
	`75`	`+ return _iTail - _iHead - 1;`
	`76`	`+}`
	`77`	`+`
`70`	`78`	`int RingBuffer::peek()`
`71`	`79`	`{`
`72`	`80`	`if(_iTail == _iHead)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`#define PARSE_TIMEOUT 1000 // default number of milli-seconds to wait`
`29`	`29`
`30`		`-// private method to read stream with timeout`
	`30`	`+// protected method to read stream with timeout`
`31`	`31`	`int Stream::timedRead()`
`32`	`32`	`{`
`33`	`33`	`int c;`
`@@ -39,7 +39,7 @@ int Stream::timedRead()`
`39`	`39`	`return -1; // -1 indicates timeout`
`40`	`40`	`}`
`41`	`41`
`42`		`-// private method to peek stream with timeout`
	`42`	`+// protected method to peek stream with timeout`
`43`	`43`	`int Stream::timedPeek()`
`44`	`44`	`{`
`45`	`45`	`int c;`