Merge branch 'zero-core'

cmaglie · cmaglie · commit 0175ec857a4e · 2015-06-15T15:17:58.000+02:00
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
@@ -21,10 +21,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "variant.h"
+#include "../Arduino.h"
 #include "USB_host.h"
 #include "samd21_host.h"
-#include "sam.h"
 #include "wiring_digital.h"
 
 #define HOST_DEFINED
diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
@@ -17,8 +17,8 @@
 */
 
 #include "Uart.h"
-#include "WVariant.h"
-#include "wiring_digital.h"
+#include "Arduino.h"
+#include "wiring_private.h"
 
 Uart::Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX, SercomRXPad _padRX, SercomUartTXPad _padTX)
 {
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
@@ -16,9 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "WInterrupts.h"
-#include "variant.h"
-#include "wiring_digital.h"
+#include "Arduino.h"
 
 #include <string.h>
 
diff --git a/cores/arduino/avr/dtostrf.c b/cores/arduino/avr/dtostrf.c
@@ -1,7 +1,6 @@
 /*
   dtostrf - Emulation for dtostrf function from avr-libc
-  Copyright (c) 2014 Arduino.  All rights reserved.
-  Written by Cristian Maglie <c.maglie@bug.st>
+  Copyright (c) 2015 Arduino LLC.  All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/cores/arduino/avr/dtostrf.h b/cores/arduino/avr/dtostrf.h
@@ -1,7 +1,6 @@
 /*
   dtostrf - Emulation for dtostrf function from avr-libc
   Copyright (c) 2015 Arduino LLC.  All rights reserved.
-  Written by Cristian Maglie <c.maglie@arduino.cc>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -24,7 +23,7 @@
 extern "C" {
 #endif
 
-char *dtostrf (double val, signed char width, unsigned char prec, char *sout);
+char *dtostrf(double val, signed char width, unsigned char prec, char *sout);
 
 #ifdef __cplusplus
 }
diff --git a/cores/arduino/avr/interrupt.h b/cores/arduino/avr/interrupt.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LCC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,3 +15,9 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
+/*
+  Empty file.
+  This file is here to allow compatibility with sketches (made for AVR)
+  that includes <AVR/interrupt.h>
+*/
diff --git a/cores/arduino/avr/pgmspace.h b/cores/arduino/avr/pgmspace.h
@@ -1,19 +1,27 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  pgmspace.h - Definitions for compatibility with AVR pgmspace macros
 
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  Copyright (c) 2015 Arduino LLC
 
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
+  Based on work of Paul Stoffregen on Teensy 3 (http://pjrc.com)
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  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 __PGMSPACE_H_
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
@@ -16,10 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "variant.h"
-#include "wiring_analog.h"
-#include "wiring_digital.h"
-#include "wiring.h"
+#include "Arduino.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
@@ -16,9 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "wiring_analog.h"
-#include "wiring_digital.h"
-#include "variant.h"
+#include "Arduino.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cores/arduino/wiring_constants.h b/cores/arduino/wiring_constants.h
@@ -23,13 +23,13 @@
 extern "C"{
 #endif // __cplusplus
 
-// moved to wiring_digital.h
-//#define LOW             (0x0)
-//#define HIGH            (0x1)
+#define LOW             (0x0)
+#define HIGH            (0x1)
 
-//#define INPUT           (0x0)
-//#define OUTPUT          (0x1)
-//#define INPUT_PULLUP    (0x2)
+#define INPUT           (0x0)
+#define OUTPUT          (0x1)
+#define INPUT_PULLUP    (0x2)
+#define INPUT_PULLDOWN  (0x3)
 
 #define PI 3.1415926535897932384626433832795
 #define HALF_PI 1.5707963267948966192313216916398
diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
@@ -16,110 +16,12 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "wiring_digital.h"
-#include "WVariant.h"
+#include "Arduino.h"
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 
-int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral )
-{
-  // Handle the case the pin isn't usable as PIO
-  if ( g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
-  {
-    return -1 ;
-  }
-
-  switch ( ulPeripheral )
-  {
-    case PIO_DIGITAL:
-    case PIO_INPUT:
-    case PIO_INPUT_PULLUP:
-    case PIO_OUTPUT:
-      // Disable peripheral muxing, done in pinMode
-//			PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.PMUXEN = 0 ;
-
-      // Configure pin mode, if requested
-      if ( ulPeripheral == PIO_INPUT )
-      {
-        pinMode( ulPin, INPUT ) ;
-      }
-      else
-      {
-        if ( ulPeripheral == PIO_INPUT_PULLUP )
-        {
-          pinMode( ulPin, INPUT_PULLUP ) ;
-        }
-        else
-        {
-          if ( ulPeripheral == PIO_OUTPUT )
-          {
-            pinMode( ulPin, OUTPUT ) ;
-          }
-          else
-          {
-            // PIO_DIGITAL, do we have to do something as all cases are covered?
-          }
-        }
-      }
-    break ;
-
-    case PIO_ANALOG:
-    case PIO_SERCOM:
-    case PIO_SERCOM_ALT:
-    case PIO_TIMER:
-    case PIO_TIMER_ALT:
-    case PIO_EXTINT:
-    case PIO_COM:
-    case PIO_AC_CLK:
-#if 0
-      // Is the pio pin in the lower 16 ones?
-      // The WRCONFIG register allows update of only 16 pin max out of 32
-      if ( g_APinDescription[ulPin].ulPin < 16 )
-      {
-        PORT->Group[g_APinDescription[ulPin].ulPort].WRCONFIG.reg = PORT_WRCONFIG_WRPMUX | PORT_WRCONFIG_PMUXEN | PORT_WRCONFIG_PMUX( ulPeripheral ) |
-                                                                    PORT_WRCONFIG_WRPINCFG |
-                                                                    PORT_WRCONFIG_PINMASK( g_APinDescription[ulPin].ulPin ) ;
-      }
-      else
-      {
-        PORT->Group[g_APinDescription[ulPin].ulPort].WRCONFIG.reg = PORT_WRCONFIG_HWSEL |
-                                                                    PORT_WRCONFIG_WRPMUX | PORT_WRCONFIG_PMUXEN | PORT_WRCONFIG_PMUX( ulPeripheral ) |
-                                                                    PORT_WRCONFIG_WRPINCFG |
-                                                                    PORT_WRCONFIG_PINMASK( g_APinDescription[ulPin].ulPin - 16 ) ;
-      }
-#else
-      if ( g_APinDescription[ulPin].ulPin & 1 ) // is pin odd?
-      {
-        uint32_t temp ;
-
-        // Get whole current setup for both odd and even pins and remove odd one
-        temp = (PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg) & PORT_PMUX_PMUXE( 0xF ) ;
-        // Set new muxing
-        PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXO( ulPeripheral ) ;
-        // Enable port mux
-        PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= PORT_PINCFG_PMUXEN ;
-      }
-      else // even pin
-      {
-        uint32_t temp ;
-
-        temp = (PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg) & PORT_PMUX_PMUXO( 0xF ) ;
-        PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXE( ulPeripheral ) ;
-        PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= PORT_PINCFG_PMUXEN ; // Enable port mux
-      }
-#endif
-    break ;
-
-    case PIO_NOT_A_PIN:
-      return -1l ;
-    break ;
-  }
-
-  return 0l ;
-}
-
 void pinMode( uint32_t ulPin, uint32_t ulMode )
 {
   // Handle the case the pin isn't usable as PIO
diff --git a/cores/arduino/wiring_digital.h b/cores/arduino/wiring_digital.h
@@ -23,24 +23,8 @@
  extern "C" {
 #endif
 
-#define INPUT           (0x0ul)
-#define OUTPUT          (0x1ul)
-#define INPUT_PULLUP    (0x2ul)
-#define INPUT_PULLDOWN  (0x4ul)
-
-#define LOW             (0x0ul)
-#define HIGH            (0x1ul)
-
 #include "WVariant.h"
 
-/**
- * \brief Configures the specified pin to belong to a device peripheral or to behave either as a an input or an output. See the description of board for details.
- *
- * \param ulPin The number of the pin whose mode you wish to set
- * \param ulPeripheral See WVariant.h for type decription
- */
-extern int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral ) ;
-
 /**
  * \brief Configures the specified pin to behave either as an input or an output. See the description of digital pins for details.
  *
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
diff --git a/cores/arduino/wiring_private.h b/cores/arduino/wiring_private.h
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include "Uart.h"`
`20`		`-#include "WVariant.h"`
`21`		`-#include "wiring_digital.h"`
	`20`	`+#include "Arduino.h"`
	`21`	`+#include "wiring_private.h"`
`22`	`22`
`23`	`23`	`Uart::Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX, SercomRXPad _padRX, SercomUartTXPad _padTX)`
`24`	`24`	`{`