Merge branch 'zero-core' into zero-package

Author: cmaglie

boards.txt

@@ -1,6 +1,6 @@
 arduino_zero_edbg.name=Arduino Zero (Programming Port)
 arduino_zero_edbg.vid.0=0x03eb
-arduino_zero_edbg.pid.0=0x2111
+arduino_zero_edbg.pid.0=0x2157
 arduino_zero_edbg.upload.tool=openocd
 arduino_zero_edbg.upload.protocol=sam-ba
 arduino_zero_edbg.upload.maximum_size=262144
@@ -19,13 +19,15 @@ arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
 arduino_zero_edbg.build.variant=arduino_zero
 arduino_zero_edbg.build.variant_system_lib=
 arduino_zero_edbg.build.vid=0x2341
-arduino_zero_edbg.build.pid=0x004d
+arduino_zero_edbg.build.pid=0x804d
 arduino_zero_edbg.bootloader.tool=openocd
 arduino_zero_edbg.bootloader.file=zero/samd21_sam_ba.bin
 
 arduino_zero_native.name=Arduino Zero (Native USB Port)
 arduino_zero_native.vid.0=0x2341
-arduino_zero_native.pid.0=0x004d
+arduino_zero_native.pid.0=0x804d
+arduino_zero_native.vid.1=0x2341
+arduino_zero_native.pid.1=0x004d
 arduino_zero_native.upload.tool=bossac
 arduino_zero_native.upload.protocol=sam-ba
 arduino_zero_native.upload.maximum_size=262144
@@ -44,4 +46,4 @@ arduino_zero_native.build.openocdscript=openocd_scripts/arduino_zero.cfg
 arduino_zero_native.build.variant=arduino_zero
 arduino_zero_native.build.variant_system_lib=
 arduino_zero_native.build.vid=0x2341
-arduino_zero_native.build.pid=0x004d
+arduino_zero_native.build.pid=0x804d

bootloaders/zero/drivers/cdc_enumerate.c

@@ -50,10 +50,10 @@ const char devDescriptor[] = {
 	0x00,   // bDeviceSubclass: CDC class sub code
 	0x00,   // bDeviceProtocol: CDC Device protocol
 	0x40,   // bMaxPacketSize0
-	0xEB,   // idVendorL
-	0x03,   //
-	0x24,   // idProductL
-	0x61,   //
+	0x41,   // idVendorL
+	0x23,   //
+	0x4D,   // idProductL
+	0x00,   //
 	0x10,   // bcdDeviceL
 	0x01,   //
 	0x00,   // iManufacturer    // 0x01

bootloaders/zero/main.c

@@ -106,26 +106,22 @@ static void check_start_application(void)
 	}
 	else
 	{
-		switch (BOOT_DOUBLE_TAP_DATA) {
-		case 0:
-			/* First tap */
-			BOOT_DOUBLE_TAP_DATA = DOUBLE_TAP_MAGIC;
-
-			for (uint32_t i=0; i<125000; i++) /* 500ms */
-				/* force compiler to not optimize this... */
-				__asm__ __volatile__("");
-
-			/* Timeout happened, continue boot... */
-			BOOT_DOUBLE_TAP_DATA = 0;
-			break;
-		case DOUBLE_TAP_MAGIC:
+		if (BOOT_DOUBLE_TAP_DATA == DOUBLE_TAP_MAGIC) {
 			/* Second tap, stay in bootloader */
 			BOOT_DOUBLE_TAP_DATA = 0;
 			return;
-		default:
-			/* Fallback... reset counter and continue boot */
-			BOOT_DOUBLE_TAP_DATA = 0;
 		}
+
+		/* First tap */
+		BOOT_DOUBLE_TAP_DATA = DOUBLE_TAP_MAGIC;
+
+		/* Wait 0.5sec to see if the user tap reset again */
+		for (uint32_t i=0; i<125000; i++) /* 500ms */
+			/* force compiler to not optimize this... */
+			__asm__ __volatile__("");
+
+		/* Timeout happened, continue boot... */
+		BOOT_DOUBLE_TAP_DATA = 0;
 	}
 #endif
 

bootloaders/zero/samd21_sam_ba.bin

@@ -79,10 +79,9 @@ typedef enum
 
 typedef enum
 {
-	UART_TX_PAD_0 = 0x0ul,	//Only for UART
-	UART_TX_PAD_2 = 0x1ul,  //Only for UART
-	//UART_TX_PAD_1 = 0x0ul,	//DON'T USE
-	//UART_TX_PAD_3 = 0x1ul	//DON'T USE
+	UART_TX_PAD_0 = 0x0ul,	// Only for UART
+	UART_TX_PAD_2 = 0x1ul,  // Only for UART
+	UART_TX_RTS_CTS_PAD_0_2_3 = 0x2ul,  // Only for UART with TX on PAD0, RTS on PAD2 and CTS on PAD3
 } SercomUartTXPad;
 
 typedef enum

cores/arduino/SERCOM.h

@@ -254,59 +254,64 @@ String Stream::readStringUntil(char terminator)
 int Stream::findMulti( struct Stream::MultiTarget *targets, int tCount) {
   // any zero length target string automatically matches and would make
   // a mess of the rest of the algorithm.
-  for (struct MultiTarget *t = targets; t < targets+tCount; ++t)
+  for (struct MultiTarget *t = targets; t < targets+tCount; ++t) {
     if (t->len <= 0)
       return t - targets;
+  }
 
-  while(1) {
+  while (1) {
     int c = timedRead();
     if (c < 0)
       return -1;
 
     for (struct MultiTarget *t = targets; t < targets+tCount; ++t) {
       // the simple case is if we match, deal with that first.
-      if (c == t->str[t->index])
-	if (++t->index == t->len)
-	  return t - targets;
-	else
-	  continue;
+      if (c == t->str[t->index]) {
+        if (++t->index == t->len)
+          return t - targets;
+        else
+          continue;
+      }
 
       // if not we need to walk back and see if we could have matched further
       // down the stream (ie '1112' doesn't match the first position in '11112'
       // but it will match the second position so we can't just reset the current
       // index to 0 when we find a mismatch.
       if (t->index == 0)
-	continue;
+        continue;
 
       int origIndex = t->index;
       do {
-	--t->index;
-	// first check if current char works against the new current index
-	if (c != t->str[t->index])
-	  continue;
-
-	// if it's the only char then we're good, nothing more to check
-	if (t->index == 0) {
-	  t->index++;
-	  break;
-	}
-
-	// otherwise we need to check the rest of the found string
-	int diff = origIndex - t->index;
-	int i;
-	for (i = 0; i < t->index; ++i)
-	  if (t->str[i] != t->str[i + diff])
-	    break;
-	// if we successfully got through the previous loop then our current
-	// index is good.
-	if (i == t->index) {
-	  t->index++;
-	  break;
-	}
-	// otherwise we just try the next index
+        --t->index;
+        // first check if current char works against the new current index
+        if (c != t->str[t->index])
+          continue;
+
+        // if it's the only char then we're good, nothing more to check
+        if (t->index == 0) {
+          t->index++;
+          break;
+        }
+
+        // otherwise we need to check the rest of the found string
+        int diff = origIndex - t->index;
+        size_t i;
+        for (i = 0; i < t->index; ++i) {
+          if (t->str[i] != t->str[i + diff])
+            break;
+        }
+
+        // if we successfully got through the previous loop then our current
+        // index is good.
+        if (i == t->index) {
+          t->index++;
+          break;
+        }
+
+        // otherwise we just try the next index
       } while (t->index);
     }
   }
   // unreachable
   return -1;
-}
+}

cores/arduino/Stream.cpp

@@ -33,7 +33,7 @@
 //==================================================================
 
 #define USB_PID_DUE        0x003E
-#define USB_PID_ZERO       0x004D
+#define USB_PID_ZERO       0x804D
 
 // USB Device
 #define USB_VID            0x2341 // arduino LLC vid

cores/arduino/USB/USBCore.cpp

@@ -20,11 +20,13 @@
 #include "WVariant.h"
 #include "wiring_digital.h"
 
-Uart::Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX)
+Uart::Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX, SercomRXPad _padRX, SercomUartTXPad _padTX)
 {
   sercom = _s;
   uc_pinRX = _pinRX;
   uc_pinTX = _pinTX;
+  uc_padRX=_padRX ;
+  uc_padTX=_padTX;
 }
 
 void Uart::begin(unsigned long baudrate)
@@ -39,8 +41,7 @@ void Uart::begin(unsigned long baudrate, uint8_t config)
 
   sercom->initUART(UART_INT_CLOCK, SAMPLE_RATE_x16, baudrate);
   sercom->initFrame(extractCharSize(config), LSB_FIRST, extractParity(config), extractNbStopBit(config));
-  sercom->initPads(UART_TX_PAD_2, SERCOM_RX_PAD_3);
-
+  sercom->initPads(uc_padTX, uc_padRX);
 
   sercom->enableUART();
 }
@@ -140,13 +141,3 @@ SercomParityMode Uart::extractParity(uint8_t config)
       return SERCOM_ODD_PARITY;
   }
 }
-
-void SERCOM0_Handler()
-{
-  Serial1.IrqHandler();
-}
-
-void SERCOM5_Handler()
-{
-  Serial.IrqHandler();
-}

cores/arduino/Uart.cpp

@@ -25,11 +25,10 @@
 
 #include <cstddef>
 
-
 class Uart : public HardwareSerial
 {
   public:
-    Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX);
+    Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX, SercomRXPad _padRX, SercomUartTXPad _padTX);
     void begin(unsigned long baudRate);
     void begin(unsigned long baudrate, uint8_t config);
     void end();
@@ -50,14 +49,12 @@ class Uart : public HardwareSerial
 
     uint8_t uc_pinRX;
     uint8_t uc_pinTX;
+    SercomRXPad uc_padRX;
+    SercomUartTXPad uc_padTX;
 
     SercomNumberStopBit extractNbStopBit(uint8_t config);
     SercomUartCharSize extractCharSize(uint8_t config);
     SercomParityMode extractParity(uint8_t config);
 };
 
-extern Uart Serial;
-extern Uart Serial1;
-
-
 #endif

cores/arduino/Uart.h

@@ -64,6 +64,12 @@ typedef enum _ETCChannel
   TCC2_CH1 = (2<<8)|(1),
   TC3_CH0  = (3<<8)|(0),
   TC3_CH1  = (3<<8)|(1),
+  TC5_CH0  = (5<<8)|(0),
+  TC5_CH1  = (5<<8)|(1),
+#if defined __SAMD21J18A__
+  TC7_CH0  = (7<<8)|(0),
+  TC7_CH1  = (7<<8)|(1)
+#endif // __SAMD21J18A__
 } ETCChannel ;
 
 extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
@@ -90,6 +96,12 @@ typedef enum _EPWMChannel
   PWM2_CH1=TCC2_CH1,
   PWM3_CH0=TC3_CH0,
   PWM3_CH1=TC3_CH1,
+  PWM5_CH0=TC5_CH0,
+  PWM5_CH1=TC5_CH1,
+#if defined __SAMD21J18A__
+  PWM7_CH0=TC7_CH0,
+  PWM7_CH1=TC7_CH1
+#endif // __SAMD21J18A__
 } EPWMChannel ;
 
 typedef enum _EPortType