Fix for PWM on many pins, now works on: 5, 6, 9, 10, 11, 12, 13, 15 (A1), 16 (A2)

ladyada · ladyada · commit fed20f6e4973 · 2016-07-25T00:17:37.000-04:00
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cores/arduino/wiring_analog.c
	platform.txt
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,19 @@
-SAMD CORE 1.6.6
+SAMD CORE
+
+* Fixed Serial.flush() blocking before any writes. Thanks @hangmoh
+* Added snprintf_P to avr/pgmspace.h stub. Thanks @jantje
+* Another small fix to String iterators. Thanks @Ivan-Perez @Chris--A
+* Fixes SerialUSB.write(...) returning 0 instead of byte written
+* Added Uart::availableForWrite()
+* Added defines for RAMSTART, RAMSIZE, RAMEND
+* Fixed writing LOW to a digital input pin blocking subsequent digitalRead attempts
+* Fixed digitalWrite() unnecessarily activating the pull-up resistor
+* Wire: Slave writes now use TX buffer
+* Added getTimeout() method to Stream.
+* Fixed glitch in PWM generation that may happen when calling analogWrite()
+* PWM frequency is now 732.4Hz (before it was 187500.0Hz)
+
+SAMD CORE 1.6.6 2016.05.19
 
 * Fixed digitalPinToInterrupt() macro, now it works as documented.
 * Added analogInputToDigitalPin macro
@@ -8,6 +23,7 @@ SAMD CORE 1.6.6
 * Fixed Wire.write(0x00) "ambiguos method" error
 * String class now supports iterators. Thanks @Chris--A
 * Remove enabling bootloader protection when burning bootloader. This enables WDT, so sketches do not work.
+* Added remote upload for Yun-Shield
 
 SAMD CORE 1.6.5 2016.04.02
 
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
@@ -35,6 +35,7 @@ typedef uint16_t word;
 //
 #include "avr/pgmspace.h"
 #include "avr/interrupt.h"
+#include "avr/io.h"
 
 #include "binary.h"
 #include "itoa.h"
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
@@ -245,7 +245,7 @@ size_t Print::printFloat(double number, uint8_t digits)
   while (digits-- > 0)
   {
     remainder *= 10.0;
-    int toPrint = int(remainder);
+    unsigned int toPrint = (unsigned int)remainder;
     n += print(toPrint);
     remainder -= toPrint;
   }
diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
@@ -104,6 +104,10 @@ void SERCOM::enableUART()
 
 void SERCOM::flushUART()
 {
+  // Skip checking transmission completion if data register is empty
+  if(isDataRegisterEmptyUART())
+    return;
+
   // Wait for transmission to complete
   while(!sercom->USART.INTFLAG.bit.TXC);
 }
@@ -553,11 +557,8 @@ bool SERCOM::sendDataSlaveWIRE(uint8_t data)
   //Send data
   sercom->I2CS.DATA.bit.DATA = data;
 
-  //Wait data transmission successful
-  while(!sercom->I2CS.INTFLAG.bit.DRDY);
-
   //Problems on line? nack received?
-  if(sercom->I2CS.STATUS.bit.RXNACK)
+  if(!sercom->I2CS.INTFLAG.bit.DRDY || sercom->I2CS.STATUS.bit.RXNACK)
     return false;
   else
     return true;
diff --git a/cores/arduino/Stream.h b/cores/arduino/Stream.h
@@ -66,7 +66,8 @@ class Stream : public Print
 // parsing methods
 
   void setTimeout(unsigned long timeout);  // sets maximum milliseconds to wait for stream data, default is 1 second
-
+  unsigned long getTimeout(void) { return _timeout; }
+  
   bool find(char *target);   // reads data from the stream until the target string is found
   bool find(uint8_t *target) { return find ((char *)target); }
   // returns true if target string is found, false if timed out (see setTimeout)
diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
@@ -202,6 +202,13 @@ int Serial_::available(void)
 	return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;
 }
 
+int Serial_::availableForWrite(void)
+{
+	// return the number of bytes left in the current bank,
+	// always EP size - 1, because bank is flushed on every write
+	return (EPX_SIZE - 1);
+}
+
 int Serial_::peek(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
@@ -236,8 +243,7 @@ int Serial_::read(void)
 		unsigned char c = buffer->buffer[buffer->tail];
 		buffer->tail = (uint32_t)(buffer->tail + 1) % CDC_SERIAL_BUFFER_SIZE;
 		buffer->full = false;
-// 		if (usb.available(CDC_ENDPOINT_OUT))
-// 			accept();
+
 		return c;
 	}
 }
@@ -262,7 +268,7 @@ size_t Serial_::write(const uint8_t *buffer, size_t size)
 	{
 		uint32_t r = usb.send(CDC_ENDPOINT_IN, buffer, size);
 
-		if (r == 0) {
+		if (r > 0) {
 			return r;
 		} else {
 			setWriteError();
diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h
@@ -118,6 +118,7 @@ class Serial_ : public Stream
 	void end(void);
 
 	virtual int available(void);
+	virtual int availableForWrite(void);
 	virtual void accept(void);
 	virtual int peek(void);
 	virtual int read(void);
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
@@ -262,9 +262,6 @@ void USBDeviceClass::handleEndpoint(uint8_t ep)
 #if defined(CDC_ENABLED)
 	if (ep == CDC_ENDPOINT_OUT)
 	{
-		// The RAM Buffer is empty: we can receive data
-		//usbd.epBank0ResetReady(CDC_ENDPOINT_OUT);
-
 		// Handle received bytes
 		if (available(CDC_ENDPOINT_OUT))
 			Serial.accept();
@@ -463,10 +460,6 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 	}
 	else if (config == USB_ENDPOINT_TYPE_CONTROL)
 	{
-		// XXX: Needed?
-// 		usbd.epBank0DisableAutoZLP(ep);
-// 		usbd.epBank1DisableAutoZLP(ep);
-
 		// Setup Control OUT
 		usbd.epBank0SetSize(ep, 64);
 		usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
@@ -614,46 +607,14 @@ uint8_t USBDeviceClass::armRecv(uint32_t ep)
 // Blocking Send of data to an endpoint
 uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 {
+	uint32_t written = 0;
 	uint32_t length = 0;
 
 	if (!_usbConfiguration)
 		return -1;
 	if (len > 16384)
 		return -1;
 
-#if 0
-// This shortcut has some issues:
-// - sometimes it fails when sending an odd number of bytes (may be
-//   due to memory alignment?)
-// - the data pointer should point to "stable" data (and this is not
-//   guaranteed by caller, it may be some sort of temporary buffer)
-// - the SRAM is not guaranteed to start at 0x20000000
-
-// All the above problems must be properly fixed before reenabling
-// this part
-
-	if ((unsigned int)data > 0x20000000)
-	{
-		// Buffer in RAM
-		usbd.epBank1SetAddress(ep, (void *)data);
-		usbd.epBank1SetMultiPacketSize(ep, 0);
-
-		usbd.epBank1SetByteCount(ep, len);
-
-		// Clear the transfer complete flag
-		usbd.epBank1AckTransferComplete(ep);
-
-		// RAM buffer is full, we can send data (IN)
-		usbd.epBank1SetReady(ep);
-
-		// Wait for transfer to complete
-		while (!usbd.epBank1IsTransferComplete(ep)) {
-			;  // need fire exit.
-		}
-		return 0;
-	}
-#endif
-
 #ifdef PIN_LED_TXL
 	digitalWrite(PIN_LED_TXL, LOW);
 	txLEDPulse = TX_RX_LED_PULSE_MS;
@@ -684,10 +645,11 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 		while (!usbd.epBank1IsTransferComplete(ep)) {
 			;  // need fire exit.
 		}
+		written += length;
 		len -= length;
 		data = (char *)data + length;
 	}
-	return len;
+	return written;
 }
 
 uint32_t USBDeviceClass::armSend(uint32_t ep, const void* data, uint32_t len)
diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
@@ -77,6 +77,11 @@ int Uart::available()
   return rxBuffer.available();
 }
 
+int Uart::availableForWrite()
+{
+  return (sercom->isDataRegisterEmptyUART() ? 1 : 0);
+}
+
 int Uart::peek()
 {
   return rxBuffer.peek();
diff --git a/cores/arduino/Uart.h b/cores/arduino/Uart.h
@@ -32,6 +32,7 @@ class Uart : public HardwareSerial
     void begin(unsigned long baudrate, uint16_t config);
     void end();
     int available();
+    int availableForWrite();
     int peek();
     int read();
     void flush();
diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
@@ -195,7 +195,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
 void String::move(String &rhs)
 {
 	if (buffer) {
-		if (capacity >= rhs.len) {
+		if (rhs && capacity >= rhs.len) {
 			strcpy(buffer, rhs.buffer);
 			len = rhs.len;
 			rhs.len = 0;
diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
@@ -159,10 +159,12 @@ class String
 	char& operator [] (unsigned int index);
 	void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
 	void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
-		{getBytes((unsigned char *)buf, bufsize, index);}
-	const char * c_str() const { return buffer; }
-	const char* begin() { return c_str(); }
-	const char* end() { return c_str() + length(); }
+		{ getBytes((unsigned char *)buf, bufsize, index); }
+	const char* c_str() const { return buffer; }
+	char* begin() { return buffer; }
+	char* end() { return buffer + length(); }
+	const char* begin() const { return c_str(); }
+	const char* end() const { return c_str() + length(); }
 
 	// search
 	int indexOf( char ch ) const;
diff --git a/cores/arduino/avr/io.h b/cores/arduino/avr/io.h
@@ -0,0 +1,32 @@
+/*
+  io.h - Definitions for compatibility with AVR io macros
+
+  Copyright (c) 2016 Arduino LLC
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE
+*/
+
+#ifndef _IO_H_
+#define _IO_H_
+
+#define RAMSTART (HMCRAMC0_ADDR)
+#define RAMSIZE  (HMCRAMC0_SIZE)
+#define RAMEND   (RAMSTART + RAMSIZE - 1)
+
+#endif
diff --git a/cores/arduino/avr/pgmspace.h b/cores/arduino/avr/pgmspace.h
@@ -97,6 +97,7 @@ typedef const void* uint_farptr_t;
 #define memcmp_PF(s1, s2, n) memcmp((s1), (s2), (n))
 
 #define sprintf_P(s, f, ...) sprintf((s), (f), __VA_ARGS__)
+#define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__)
 
 #define pgm_read_byte(addr) (*(const unsigned char *)(addr))
 #define pgm_read_word(addr) (*(const unsigned short *)(addr))
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
@@ -36,7 +36,7 @@ void Dummy_Handler(void)
 
 /* Cortex-M0+ core handlers */
 void HardFault_Handler(void) __attribute__ ((weak, alias("Dummy_Handler")));
-void Reest_Handler    (void);
+void Reset_Handler    (void);
 void NMI_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SVC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void PendSV_Handler   (void) __attribute__ ((weak, alias("Dummy_Handler")));
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
diff --git a/platform.txt b/platform.txt
diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ size_t Print::printFloat(double number, uint8_t digits)`
`245`	`245`	`while (digits-- > 0)`
`246`	`246`	`{`
`247`	`247`	`remainder *= 10.0;`
`248`		`- int toPrint = 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
`@@ -202,6 +202,13 @@ int Serial_::available(void)`
`202`	`202`	`return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;`
`203`	`203`	`}`
`204`	`204`
	`205`	`+int Serial_::availableForWrite(void)`
	`206`	`+{`
	`207`	`+ // return the number of bytes left in the current bank,`
	`208`	`+ // always EP size - 1, because bank is flushed on every write`
	`209`	`+ return (EPX_SIZE - 1);`
	`210`	`+}`
	`211`	`+`
`205`	`212`	`int Serial_::peek(void)`
`206`	`213`	`{`
`207`	`214`	`ring_buffer *buffer = &cdc_rx_buffer;`
`@@ -236,8 +243,7 @@ int Serial_::read(void)`
`236`	`243`	`unsigned char c = buffer->buffer[buffer->tail];`
`237`	`244`	`buffer->tail = (uint32_t)(buffer->tail + 1) % CDC_SERIAL_BUFFER_SIZE;`
`238`	`245`	`buffer->full = false;`
`239`		`-// if (usb.available(CDC_ENDPOINT_OUT))`
`240`		`-// accept();`
	`246`	`+`
`241`	`247`	`return c;`
`242`	`248`	`}`
`243`	`249`	`}`
`@@ -262,7 +268,7 @@ size_t Serial_::write(const uint8_t *buffer, size_t size)`
`262`	`268`	`{`
`263`	`269`	`uint32_t r = usb.send(CDC_ENDPOINT_IN, buffer, size);`
`264`	`270`
`265`		`- if (r == 0) {`
	`271`	`+ if (r > 0) {`
`266`	`272`	`return r;`
`267`	`273`	`} else {`
`268`	`274`	`setWriteError();`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,11 @@ int Uart::available()`
`77`	`77`	`return rxBuffer.available();`
`78`	`78`	`}`
`79`	`79`
	`80`	`+int Uart::availableForWrite()`
	`81`	`+{`
	`82`	`+ return (sercom->isDataRegisterEmptyUART() ? 1 : 0);`
	`83`	`+}`
	`84`	`+`
`80`	`85`	`int Uart::peek()`
`81`	`86`	`{`
`82`	`87`	`return rxBuffer.peek();`