Add Arduino SAMD Packages_Patches

To fix Arduino SAMD compiler error when using STL
khoih-prog · Aug 4, 2020 · 3253152 · 3253152
1 parent db9b01b
commit 3253152
Show file tree

Hide file tree

Showing 3 changed files with 411 additions and 61 deletions.
diff --git a/Packages_Patches/arduino/hardware/samd/1.8.6/cores/arduino/Arduino.h b/Packages_Patches/arduino/hardware/samd/1.8.6/cores/arduino/Arduino.h
@@ -0,0 +1,160 @@
+/*
+  Arduino.h - Main include file for the Arduino SDK
+  Copyright (c) 2014 Arduino LLC.  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
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  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.
+
+  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
+*/
+
+// KH, This is the fix according to https://github.com/arduino/ArduinoCore-samd/pull/399
+// to avoid notorious compiler error while uing STL (min and max macro error)
+// It's terrible Arduino has just released new core and still don't merge the PR
+
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+typedef bool boolean;
+typedef uint8_t byte;
+typedef uint16_t word;
+
+// some libraries and sketches depend on this AVR stuff,
+// assuming Arduino.h or WProgram.h automatically includes it...
+//
+#include "avr/pgmspace.h"
+#include "avr/interrupt.h"
+#include "avr/io.h"
+#include "binary.h"
+#include "itoa.h"
+
+#ifdef __cplusplus
+  extern "C"{
+#endif // __cplusplus
+
+// Include Atmel headers
+#include "sam.h"
+#include "wiring_constants.h"
+
+#define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L )
+#define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SystemCoreClock / 1000L) )
+#define microsecondsToClockCycles(a) ( (a) * (SystemCoreClock / 1000000L) )
+void yield( void ) ;
+/* system functions */
+int main( void );
+void init( void );
+/* sketch */
+void setup( void ) ;
+void loop( void ) ;
+#include "WVariant.h"
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+
+// The following headers are for C++ only compilation
+#ifdef __cplusplus
+  #include "WCharacter.h"
+  #include "WString.h"
+  #include "Tone.h"
+  #include "WMath.h"
+  #include "HardwareSerial.h"
+  #include "pulse.h"
+  #include <bits/stl_algobase.h>
+#endif
+
+#include "delay.h"
+
+#ifdef __cplusplus
+  #include "Uart.h"
+#endif
+
+// Include board variant
+#include "variant.h"
+#include "wiring.h"
+#include "wiring_digital.h"
+#include "wiring_analog.h"
+#include "wiring_shift.h"
+#include "WInterrupts.h"
+
+#ifndef __cplusplus
+  // undefine stdlib's abs if encountered
+  #ifdef abs
+    #undef abs
+  #endif // abs
+
+  #define min(a,b) ((a)<(b)?(a):(b))
+  #define max(a,b) ((a)>(b)?(a):(b))
+  #define abs(x) ((x)>0?(x):-(x))
+  #define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+
+#else
+  //using std::min;
+  //using std::max;
+  template<class T, class L> 
+  auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (b < a) ? b : a;
+  }
+
+  template<class T, class L> 
+  auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (a < b) ? b : a;
+  }
+#endif
+
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() __enable_irq()
+#define noInterrupts() __disable_irq()
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+#define bit(b) (1UL << (b))
+
+#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606)
+  // Interrupts
+  #define digitalPinToInterrupt(P)   ( P )
+#endif
+
+// Allows publishing the Beta core under samd-beta / arduino organization
+#ifndef ARDUINO_ARCH_SAMD
+#define ARDUINO_ARCH_SAMD
+#endif
+
+// USB Device
+#include "USB/USBDesc.h"
+#include "USB/USBCore.h"
+#include "USB/USBAPI.h"
+#include "USB/USB_host.h"
+
+#ifdef __cplusplus
+  #include "USB/CDC.h"
+#endif
+
+#endif // Arduino_h
diff --git a/Packages_Patches/arduino/hardware/samd/1.8.7/cores/arduino/Arduino.h b/Packages_Patches/arduino/hardware/samd/1.8.7/cores/arduino/Arduino.h
@@ -0,0 +1,160 @@
+/*
+  Arduino.h - Main include file for the Arduino SDK
+  Copyright (c) 2014 Arduino LLC.  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
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  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.
+
+  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
+*/
+
+// KH, This is the fix according to https://github.com/arduino/ArduinoCore-samd/pull/399
+// to avoid notorious compiler error while uing STL (min and max macro error)
+// It's terrible Arduino has just released new core and still don't merge the PR
+
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+typedef bool boolean;
+typedef uint8_t byte;
+typedef uint16_t word;
+
+// some libraries and sketches depend on this AVR stuff,
+// assuming Arduino.h or WProgram.h automatically includes it...
+//
+#include "avr/pgmspace.h"
+#include "avr/interrupt.h"
+#include "avr/io.h"
+#include "binary.h"
+#include "itoa.h"
+
+#ifdef __cplusplus
+  extern "C"{
+#endif // __cplusplus
+
+// Include Atmel headers
+#include "sam.h"
+#include "wiring_constants.h"
+
+#define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L )
+#define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SystemCoreClock / 1000L) )
+#define microsecondsToClockCycles(a) ( (a) * (SystemCoreClock / 1000000L) )
+void yield( void ) ;
+/* system functions */
+int main( void );
+void init( void );
+/* sketch */
+void setup( void ) ;
+void loop( void ) ;
+#include "WVariant.h"
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+
+// The following headers are for C++ only compilation
+#ifdef __cplusplus
+  #include "WCharacter.h"
+  #include "WString.h"
+  #include "Tone.h"
+  #include "WMath.h"
+  #include "HardwareSerial.h"
+  #include "pulse.h"
+  #include <bits/stl_algobase.h>
+#endif
+
+#include "delay.h"
+
+#ifdef __cplusplus
+  #include "Uart.h"
+#endif
+
+// Include board variant
+#include "variant.h"
+#include "wiring.h"
+#include "wiring_digital.h"
+#include "wiring_analog.h"
+#include "wiring_shift.h"
+#include "WInterrupts.h"
+
+#ifndef __cplusplus
+  // undefine stdlib's abs if encountered
+  #ifdef abs
+    #undef abs
+  #endif // abs
+
+  #define min(a,b) ((a)<(b)?(a):(b))
+  #define max(a,b) ((a)>(b)?(a):(b))
+  #define abs(x) ((x)>0?(x):-(x))
+  #define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+
+#else
+  //using std::min;
+  //using std::max;
+  template<class T, class L> 
+  auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (b < a) ? b : a;
+  }
+
+  template<class T, class L> 
+  auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (a < b) ? b : a;
+  }
+#endif
+
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() __enable_irq()
+#define noInterrupts() __disable_irq()
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+#define bit(b) (1UL << (b))
+
+#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606)
+  // Interrupts
+  #define digitalPinToInterrupt(P)   ( P )
+#endif
+
+// Allows publishing the Beta core under samd-beta / arduino organization
+#ifndef ARDUINO_ARCH_SAMD
+#define ARDUINO_ARCH_SAMD
+#endif
+
+// USB Device
+#include "USB/USBDesc.h"
+#include "USB/USBCore.h"
+#include "USB/USBAPI.h"
+#include "USB/USB_host.h"
+
+#ifdef __cplusplus
+  #include "USB/CDC.h"
+#endif
+
+#endif // Arduino_h