From 8f747a4a5756cbea5123b34bb7f65b043cb80c26 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Fri, 2 Apr 2021 12:57:56 -0700 Subject: [PATCH 1/9] Add Print::printf() method for sanity --- api/Print.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ api/Print.h | 6 +++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/api/Print.cpp b/api/Print.cpp index 8c3e1930..23f2a6de 100644 --- a/api/Print.cpp +++ b/api/Print.cpp @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include @@ -235,6 +236,53 @@ size_t Print::println(const Printable& x) return n; } +size_t Print::printf(const char *format, ...) { + va_list arg; + va_start(arg, format); + char temp[64]; + char* buffer = temp; + size_t len = vsnprintf(temp, sizeof(temp), format, arg); + va_end(arg); + if (len > sizeof(temp) - 1) { + buffer = new char[len + 1]; + if (!buffer) { + return 0; + } + va_start(arg, format); + vsnprintf(buffer, len + 1, format, arg); + va_end(arg); + } + len = write((const uint8_t*) buffer, len); + if (buffer != temp) { + delete[] buffer; + } + return len; +} + +// TODO - must be better way than cut-n-paste! +size_t Print::printf_P(const char *format, ...) { + va_list arg; + va_start(arg, format); + char temp[64]; + char* buffer = temp; + size_t len = vsnprintf(temp, sizeof(temp), format, arg); + va_end(arg); + if (len > sizeof(temp) - 1) { + buffer = new char[len + 1]; + if (!buffer) { + return 0; + } + va_start(arg, format); + vsnprintf(buffer, len + 1, format, arg); + va_end(arg); + } + len = write((const uint8_t*) buffer, len); + if (buffer != temp) { + delete[] buffer; + } + return len; +} + // Private Methods ///////////////////////////////////////////////////////////// size_t Print::printNumber(unsigned long n, uint8_t base) diff --git a/api/Print.h b/api/Print.h index a2b982da..744ad903 100644 --- a/api/Print.h +++ b/api/Print.h @@ -89,8 +89,12 @@ class Print size_t println(const Printable&); size_t println(void); + // EFP3 - Add printf() to make life so much easier... + size_t printf(const char *format, ...); + size_t printf_P(const char *format, ...); + virtual void flush() { /* Empty implementation for backward compatibility */ } }; } -using namespace arduino; \ No newline at end of file +using namespace arduino; From b20f68b65c787eec78ef81762c85db999d2ce071 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Tue, 6 Apr 2021 10:30:43 -0700 Subject: [PATCH 2/9] Allow misaligned accesses for pgm_read_XXX --- api/deprecated-avr-comp/avr/pgmspace.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/api/deprecated-avr-comp/avr/pgmspace.h b/api/deprecated-avr-comp/avr/pgmspace.h index 95897d75..b890af95 100644 --- a/api/deprecated-avr-comp/avr/pgmspace.h +++ b/api/deprecated-avr-comp/avr/pgmspace.h @@ -99,11 +99,29 @@ typedef const void* uint_farptr_t; #define sprintf_P(s, f, ...) sprintf((s), (f), __VA_ARGS__) #define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__) +#if 0 +// Requires natural aligned addresses #define pgm_read_byte(addr) (*(const unsigned char *)(addr)) #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) (*(void *const *)(addr)) +#else +// Supports misaligned addresses +#define pgm_read_byte(addr) (*(const unsigned char *)(addr)) +#define pgm_read_word(addr) ((unsigned short)(pgm_read_byte((intptr_t)addr) | (pgm_read_byte((intptr_t)addr + 1) << 8))) +#define pgm_read_dword(addr) ((unsigned long)(pgm_read_byte((intptr_t)addr) | (pgm_read_byte((intptr_t)addr + 1) << 8)) | \ + (pgm_read_byte((intptr_t)addr + 2) << 16) | (pgm_read_byte((intptr_t)addr + 3) << 24)) +#define pgm_read_ptr(addr) ((void *)pgm_read_dword(addr)) +static inline float pgm_read_float(const void *addr) { + union { + void *p; + float f; + } x; + x.p = pgm_read_ptr(addr); + return x.f; +} +#endif #define pgm_read_byte_near(addr) pgm_read_byte(addr) #define pgm_read_word_near(addr) pgm_read_word(addr) From 9da53735171f7cccbe781c66d9ee1068d94d6ec8 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Wed, 7 Apr 2021 19:54:45 -0700 Subject: [PATCH 3/9] Add some ancient AVR compat _P function definitions --- api/deprecated-avr-comp/avr/pgmspace.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/deprecated-avr-comp/avr/pgmspace.h b/api/deprecated-avr-comp/avr/pgmspace.h index b890af95..c0c26f32 100644 --- a/api/deprecated-avr-comp/avr/pgmspace.h +++ b/api/deprecated-avr-comp/avr/pgmspace.h @@ -98,6 +98,8 @@ typedef const void* uint_farptr_t; #define sprintf_P(s, f, ...) sprintf((s), (f), __VA_ARGS__) #define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__) +#define vsprintf_P(s, f, ...) vsprintf((s), (f), __VA_ARGS__) +#define vsnprintf_P(s, f, ...) vsnprintf((s), (f), __VA_ARGS__) #if 0 // Requires natural aligned addresses From 681daad7ba32fb955a4eb2e2bf26bf3f51288711 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Fri, 28 Jan 2022 17:17:55 -0800 Subject: [PATCH 4/9] Fix pgm_read* macros by using inline functions, not macros --- api/deprecated-avr-comp/avr/pgmspace.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/api/deprecated-avr-comp/avr/pgmspace.h b/api/deprecated-avr-comp/avr/pgmspace.h index c0c26f32..42df8940 100644 --- a/api/deprecated-avr-comp/avr/pgmspace.h +++ b/api/deprecated-avr-comp/avr/pgmspace.h @@ -110,11 +110,23 @@ typedef const void* uint_farptr_t; #define pgm_read_ptr(addr) (*(void *const *)(addr)) #else // Supports misaligned addresses -#define pgm_read_byte(addr) (*(const unsigned char *)(addr)) -#define pgm_read_word(addr) ((unsigned short)(pgm_read_byte((intptr_t)addr) | (pgm_read_byte((intptr_t)addr + 1) << 8))) -#define pgm_read_dword(addr) ((unsigned long)(pgm_read_byte((intptr_t)addr) | (pgm_read_byte((intptr_t)addr + 1) << 8)) | \ - (pgm_read_byte((intptr_t)addr + 2) << 16) | (pgm_read_byte((intptr_t)addr + 3) << 24)) -#define pgm_read_ptr(addr) ((void *)pgm_read_dword(addr)) +#ifdef __cplusplus +extern "C"{ +#endif +static inline unsigned char pgm_read_byte(const void *addr) { + return *(const unsigned char *)(addr); +} +static inline unsigned short pgm_read_word(const void *addr) { + const unsigned char *a = (const unsigned char *)addr; + return pgm_read_byte(a) | ( pgm_read_byte(a + 1) << 8 ); +} +static inline unsigned long pgm_read_dword(const void *addr) { + const unsigned char *a = (const unsigned char *)addr; + return pgm_read_byte(a) | ( pgm_read_byte(a + 1) << 8 ) | ( pgm_read_byte(a + 2) << 16 ) | ( pgm_read_byte(a + 3) << 24 ); +} +static inline void *pgm_read_ptr(const void *addr) { + return (void*) pgm_read_dword(addr); +} static inline float pgm_read_float(const void *addr) { union { void *p; @@ -123,6 +135,10 @@ static inline float pgm_read_float(const void *addr) { x.p = pgm_read_ptr(addr); return x.f; } +#ifdef __cplusplus +} +#endif + #endif #define pgm_read_byte_near(addr) pgm_read_byte(addr) From 990154cdde7a4ffcb1418967015b8d1220c50a84 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 8 Feb 2025 14:44:35 -0800 Subject: [PATCH 5/9] Add SPI block transfer with receive/send buffers --- api/HardwareSPI.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/HardwareSPI.h b/api/HardwareSPI.h index 7f6aea2b..58f5d75c 100644 --- a/api/HardwareSPI.h +++ b/api/HardwareSPI.h @@ -111,6 +111,9 @@ class HardwareSPI virtual uint16_t transfer16(uint16_t data) = 0; virtual void transfer(void *buf, size_t count) = 0; + // EFP3 - Additional block-based versions we implement + virtual void transfer(const void *txbuf, void *rxbuf, size_t count) = 0; + // Transaction Functions virtual void usingInterrupt(int interruptNumber) = 0; virtual void notUsingInterrupt(int interruptNumber) = 0; From a323bb010b13c9c910d03c879680aac5a777f45a Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 8 Feb 2025 17:02:27 -0800 Subject: [PATCH 6/9] Restore IPAddress V4/V6 rewrite --- api/IPAddress.cpp | 426 +++++++++++++++++----------------------------- api/IPAddress.h | 310 ++++++++++++++++++++++----------- 2 files changed, 365 insertions(+), 371 deletions(-) diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp index 05b41bc1..404b6562 100644 --- a/api/IPAddress.cpp +++ b/api/IPAddress.cpp @@ -1,147 +1,83 @@ /* - IPAddress.cpp - Base class that provides IPAddress - Copyright (c) 2011 Adrian McEwen. All right reserved. + IPAddress.cpp - Base class that provides IPAddress + Copyright (c) 2011 Adrian McEwen. 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 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. + 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 -*/ + 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 + */ -#include "IPAddress.h" -#include "Print.h" +#include +#include +#include -using namespace arduino; - -IPAddress::IPAddress() : IPAddress(IPv4) {} - -IPAddress::IPAddress(IPType ip_type) -{ - _type = ip_type; - memset(_address.bytes, 0, sizeof(_address.bytes)); -} - -IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) -{ - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - _address.bytes[IPADDRESS_V4_BYTES_INDEX] = first_octet; - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1] = second_octet; - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2] = third_octet; - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = fourth_octet; -} - -IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16) { - _type = IPv6; - _address.bytes[0] = o1; - _address.bytes[1] = o2; - _address.bytes[2] = o3; - _address.bytes[3] = o4; - _address.bytes[4] = o5; - _address.bytes[5] = o6; - _address.bytes[6] = o7; - _address.bytes[7] = o8; - _address.bytes[8] = o9; - _address.bytes[9] = o10; - _address.bytes[10] = o11; - _address.bytes[11] = o12; - _address.bytes[12] = o13; - _address.bytes[13] = o14; - _address.bytes[14] = o15; - _address.bytes[15] = o16; -} - -IPAddress::IPAddress(uint32_t address) +IPAddress::IPAddress(const IPAddress& from) { - // IPv4 only - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; - - // NOTE on conversion/comparison and uint32_t: - // These conversions are host platform dependent. - // There is a defined integer representation of IPv4 addresses, - // based on network byte order (will be the value on big endian systems), - // e.g. http://2398766798 is the same as http://142.250.70.206, - // However on little endian systems the octets 0x83, 0xFA, 0x46, 0xCE, - // in that order, will form the integer (uint32_t) 3460758158 . + ip_addr_copy(_ip, from._ip); } -IPAddress::IPAddress(const uint8_t *address) : IPAddress(IPv4, address) {} - -IPAddress::IPAddress(IPType ip_type, const uint8_t *address) -{ - _type = ip_type; - if (ip_type == IPv4) { - memset(_address.bytes, 0, sizeof(_address.bytes)); - memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); - } else { - memcpy(_address.bytes, address, sizeof(_address.bytes)); - } +IPAddress::IPAddress() { + _ip = *IP_ANY_TYPE; // lwIP's v4-or-v6 generic address } -IPAddress::IPAddress(const char *address) -{ - fromString(address); +bool IPAddress::isSet () const { + return !ip_addr_isany(&_ip) && ((*this) != IPADDR_NONE); } -String IPAddress::toString4() const -{ - char szRet[16]; - snprintf(szRet, sizeof(szRet), "%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]); - return String(szRet); +IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) { + setV4(); + (*this)[0] = first_octet; + (*this)[1] = second_octet; + (*this)[2] = third_octet; + (*this)[3] = fourth_octet; } -String IPAddress::toString6() const -{ - char szRet[40]; - snprintf(szRet, sizeof(szRet), "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", - _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3], - _address.bytes[4], _address.bytes[5], _address.bytes[6], _address.bytes[7], - _address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11], - _address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]); - return String(szRet); +void IPAddress::ctor32(uint32_t address) { + setV4(); + v4() = address; } -String IPAddress::toString() const -{ - if (_type == IPv4) { - return toString4(); - } else { - return toString6(); - } +IPAddress::IPAddress(const uint8_t *address) { + setV4(); + (*this)[0] = address[0]; + (*this)[1] = address[1]; + (*this)[2] = address[2]; + (*this)[3] = address[3]; } bool IPAddress::fromString(const char *address) { if (!fromString4(address)) { +#if LWIP_IPV6 return fromString6(address); +#else + return false; +#endif } return true; } -bool IPAddress::fromString4(const char *address) -{ - // TODO: add support for "a", "a.b", "a.b.c" formats +bool IPAddress::fromString4(const char *address) { + // TODO: (IPv4) add support for "a", "a.b", "a.b.c" formats - int16_t acc = -1; // Accumulator + uint16_t acc = 0; // Accumulator uint8_t dots = 0; - memset(_address.bytes, 0, sizeof(_address.bytes)); while (*address) { char c = *address++; if (c >= '0' && c <= '9') { - acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0'); + acc = acc * 10 + (c - '0'); if (acc > 255) { // Value out of [0..255] range return false; @@ -150,15 +86,11 @@ bool IPAddress::fromString4(const char *address) else if (c == '.') { if (dots == 3) { - // Too many dots (there must be 3 dots) + // Too much dots (there must be 3 dots) return false; } - if (acc < 0) { - /* No value between dots, e.g. '1..' */ - return false; - } - _address.bytes[IPADDRESS_V4_BYTES_INDEX + dots++] = acc; - acc = -1; + (*this)[dots++] = acc; + acc = 0; } else { @@ -171,23 +103,105 @@ bool IPAddress::fromString4(const char *address) // Too few dots (there must be 3 dots) return false; } - if (acc < 0) { - /* No value between dots, e.g. '1..' */ - return false; - } - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = acc; - _type = IPv4; + (*this)[3] = acc; + + setV4(); return true; } +IPAddress& IPAddress::operator=(const uint8_t *address) { + setV4(); + v4() = *reinterpret_cast(address); + return *this; +} + +IPAddress& IPAddress::operator=(uint32_t address) { + setV4(); + v4() = address; + return *this; +} + +bool IPAddress::operator==(const uint8_t* addr) const { + return isV4() && v4() == *reinterpret_cast(addr); +} + +size_t IPAddress::printTo(Print& p) const { + String s = toString(); + return p.print(s); +} + +String IPAddress::toString() const +{ + String s; + + if (!isSet()) + return "(IP unset)"; + +#if LWIP_IPV6 + if (isV6()) { + int count0 = 0; + for (int i = 0; i < 8; i++) { + uint16_t bit = PP_NTOHS(raw6()[i]); + if (bit || count0 < 0) { + char buff[64]; + snprintf(buff, 64, "%x", bit); + buff[63] = 0; + s += buff; + if (count0 > 0) + // no more hiding 0 + count0 = -8; + } else + count0++; + if ((i != 7 && count0 < 2) || count0 == 7) + s += ':'; + } + return s; + } +#endif + + for(int i = 0; i < 4; i++) { + char buff[16]; + snprintf(buff, 16, "%d", (*this)[i]); + buff[15] = 0; + s += buff; + if (i != 3) + s += '.'; + } + return s; + +} + +bool IPAddress::isValid(const String& arg) { + return IPAddress().fromString(arg); +} + +bool IPAddress::isValid(const char* arg) { + return IPAddress().fromString(arg); +} + +namespace arduino { +const IPAddress INADDR_ANY; // generic "0.0.0.0" for IPv4 & IPv6 +const IPAddress INADDR_NONE(255,255,255,255); +}; + +void IPAddress::clear() { + (*this) = INADDR_ANY; +} + +/**************************************/ + +#if LWIP_IPV6 + bool IPAddress::fromString6(const char *address) { + // TODO: test test test + uint32_t acc = 0; // Accumulator - int colons = 0, double_colons = -1; + int dots = 0, doubledots = -1; while (*address) { char c = tolower(*address++); - if (isalnum(c) && c <= 'f') { + if (isalnum(c)) { if (c >= 'a') c -= 'a' - '0' - 10; acc = acc * 16 + (c - '0'); @@ -197,27 +211,17 @@ bool IPAddress::fromString6(const char *address) { } else if (c == ':') { if (*address == ':') { - if (double_colons >= 0) { + if (doubledots >= 0) // :: allowed once return false; - } - if (*address != '\0' && *(address + 1) == ':') { - // ::: not allowed - return false; - } // remember location - double_colons = colons + !!acc; + doubledots = dots + !!acc; address++; - } else if (*address == '\0') { - // can't end with a single colon - return false; } - if (colons == 7) + if (dots == 7) // too many separators return false; - _address.bytes[colons * 2] = acc >> 8; - _address.bytes[colons * 2 + 1] = acc & 0xff; - colons++; + raw6()[dots++] = PP_HTONS(acc); acc = 0; } else @@ -225,144 +229,20 @@ bool IPAddress::fromString6(const char *address) { return false; } - if (double_colons == -1 && colons != 7) { + if (doubledots == -1 && dots != 7) // Too few separators return false; - } - if (double_colons > -1 && colons > 6) { - // Too many segments (double colon must be at least one zero field) - return false; - } - _address.bytes[colons * 2] = acc >> 8; - _address.bytes[colons * 2 + 1] = acc & 0xff; - colons++; - - if (double_colons != -1) { - for (int i = colons * 2 - double_colons * 2 - 1; i >= 0; i--) - _address.bytes[16 - colons * 2 + double_colons * 2 + i] = _address.bytes[double_colons * 2 + i]; - for (int i = double_colons * 2; i < 16 - colons * 2 + double_colons * 2; i++) - _address.bytes[i] = 0; - } - - _type = IPv6; - return true; -} - -IPAddress& IPAddress::operator=(const uint8_t *address) -{ - // IPv4 only conversion from byte pointer - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); - return *this; -} - -IPAddress& IPAddress::operator=(const char *address) -{ - fromString(address); - return *this; -} + raw6()[dots++] = PP_HTONS(acc); -IPAddress& IPAddress::operator=(uint32_t address) -{ - // IPv4 conversion - // See note on conversion/comparison and uint32_t - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; - return *this; -} - -bool IPAddress::operator==(const IPAddress& addr) const { - return (addr._type == _type) - && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0); -} - -bool IPAddress::operator==(const uint8_t* addr) const -{ - // IPv4 only comparison to byte pointer - // Can't support IPv6 as we know our type, but not the length of the pointer - return _type == IPv4 && memcmp(addr, &_address.bytes[IPADDRESS_V4_BYTES_INDEX], sizeof(uint32_t)) == 0; -} - -uint8_t IPAddress::operator[](int index) const { - if (_type == IPv4) { - return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; + if (doubledots != -1) { + for (int i = dots - doubledots - 1; i >= 0; i--) + raw6()[8 - dots + doubledots + i] = raw6()[doubledots + i]; + for (int i = doubledots; i < 8 - dots + doubledots; i++) + raw6()[i] = 0; } - return _address.bytes[index]; -} -uint8_t& IPAddress::operator[](int index) { - if (_type == IPv4) { - return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; - } - return _address.bytes[index]; -} - -size_t IPAddress::printTo(Print& p) const -{ - size_t n = 0; - - if (_type == IPv6) { - // IPv6 IETF canonical format: compress left-most longest run of two or more zero fields, lower case - int8_t longest_start = -1; - int8_t longest_length = 1; - int8_t current_start = -1; - int8_t current_length = 0; - for (int8_t f = 0; f < 8; f++) { - if (_address.bytes[f * 2] == 0 && _address.bytes[f * 2 + 1] == 0) { - if (current_start == -1) { - current_start = f; - current_length = 1; - } else { - current_length++; - } - if (current_length > longest_length) { - longest_start = current_start; - longest_length = current_length; - } - } else { - current_start = -1; - } - } - for (int f = 0; f < 8; f++) { - if (f < longest_start || f >= longest_start + longest_length) { - uint8_t c1 = _address.bytes[f * 2] >> 4; - uint8_t c2 = _address.bytes[f * 2] & 0xf; - uint8_t c3 = _address.bytes[f * 2 + 1] >> 4; - uint8_t c4 = _address.bytes[f * 2 + 1] & 0xf; - if (c1 > 0) { - n += p.print((char)(c1 < 10 ? '0' + c1 : 'a' + c1 - 10)); - } - if (c1 > 0 || c2 > 0) { - n += p.print((char)(c2 < 10 ? '0' + c2 : 'a' + c2 - 10)); - } - if (c1 > 0 || c2 > 0 || c3 > 0) { - n += p.print((char)(c3 < 10 ? '0' + c3 : 'a' + c3 - 10)); - } - n += p.print((char)(c4 < 10 ? '0' + c4 : 'a' + c4 - 10)); - if (f < 7) { - n += p.print(':'); - } - } else if (f == longest_start) { - if (longest_start == 0) { - n += p.print(':'); - } - n += p.print(':'); - } - } - return n; - } - - // IPv4 - for (int i =0; i < 3; i++) - { - n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + i], DEC); - n += p.print('.'); - } - n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + 3], DEC); - return n; + setV6(); + return true; } -const IPAddress arduino::IN6ADDR_ANY(IPv6); -const IPAddress arduino::INADDR_NONE(0,0,0,0); +#endif diff --git a/api/IPAddress.h b/api/IPAddress.h index 31a2d06d..a395c29b 100644 --- a/api/IPAddress.h +++ b/api/IPAddress.h @@ -1,122 +1,236 @@ /* - IPAddress.h - Base class that provides IPAddress - Copyright (c) 2011 Adrian McEwen. All right reserved. + IPAddress.h - Base class that provides IPAddress + Copyright (c) 2011 Adrian McEwen. 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 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. + 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 -*/ + 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 + */ #pragma once #include -#include "Printable.h" -#include "String.h" +#include +#include + +#include +#include +#include -#define IPADDRESS_V4_BYTES_INDEX 12 -#define IPADDRESS_V4_DWORD_INDEX 3 // forward declarations of global name space friend classes class EthernetClass; class DhcpClass; class DNSClient; + namespace arduino { +// to display a netif id with printf: +#define NETIFID_STR "%c%c%u" +#define NETIFID_VAL(netif) \ + ((netif)? (netif)->name[0]: '-'), \ + ((netif)? (netif)->name[1]: '-'), \ + ((netif)? netif_get_index(netif): 42) + // A class to make it easier to handle and pass around IP addresses +// IPv6 update: +// IPAddress is now a decorator class for lwIP's ip_addr_t +// fully backward compatible with legacy IPv4-only Arduino's +// with unchanged footprint when IPv6 is disabled + +class IPAddress: public Printable { + private: +#if !LWIP_IPV6 + // Ugly hack to allow Arduino Ethernet library to twiddle internal bits. + // This can only work in IPv4-only mode, of course. + union { + ip_addr_t _ip; + struct { + uint8_t bytes[4]; + } _address; + }; + static_assert(sizeof(_ip) == sizeof(_address), "IP_ADDR_T size != _ADDRESS size"); +#else + ip_addr_t _ip; +#endif + + // Access the raw byte array containing the address. Because this returns a pointer + // to the internal structure rather than a copy of the address this function should only + // be used when you know that the usage of the returned uint8_t* will be transient and not + // stored. + uint8_t* raw_address() { + return reinterpret_cast(&v4()); + } + const uint8_t* raw_address() const { + return reinterpret_cast(&v4()); + } + + void ctor32 (uint32_t); + + public: + // Constructors + IPAddress(); + IPAddress(const IPAddress& from); + IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); + IPAddress(uint32_t address) { ctor32(address); } +// IPAddress(unsigned long address) { ctor32(address); } + IPAddress(int address) { ctor32(address); } + IPAddress(const uint8_t *address); + + bool fromString(const char *address); + bool fromString(const String &address) { return fromString(address.c_str()); } + + // Overloaded cast operator to allow IPAddress objects to be used where a pointer + // to a four-byte uint8_t array is expected + operator uint32_t() const { return isV4()? v4(): (uint32_t)0; } + operator uint32_t() { return isV4()? v4(): (uint32_t)0; } + + bool isSet () const; + operator bool () const { return isSet(); } // <- + operator bool () { return isSet(); } // <- both are needed + + // generic IPv4 wrapper to uint32-view like arduino loves to see it + const uint32_t& v4() const { return ip_2_ip4(&_ip)->addr; } // for raw_address(const) + uint32_t& v4() { return ip_2_ip4(&_ip)->addr; } + + bool operator==(const IPAddress& addr) const { + return ip_addr_cmp(&_ip, &addr._ip); + } + bool operator!=(const IPAddress& addr) const { + return !ip_addr_cmp(&_ip, &addr._ip); + } + bool operator==(uint32_t addr) const { + return isV4() && v4() == addr; + } +// bool operator==(unsigned long addr) const { +// return isV4() && v4() == (uint32_t)addr; +// } + bool operator!=(uint32_t addr) const { + return !(isV4() && v4() == addr); + } +// bool operator!=(unsigned long addr) const { +// return isV4() && v4() != (uint32_t)addr; +// } + bool operator==(const uint8_t* addr) const; + + int operator>>(int n) const { + return isV4()? v4() >> n: 0; + } + + // Overloaded index operator to allow getting and setting individual octets of the address + uint8_t operator[](int index) const { + return isV4()? *(raw_address() + index): 0; + } + uint8_t& operator[](int index) { + setV4(); + return *(raw_address() + index); + } + + // Overloaded copy operators to allow initialisation of IPAddress objects from other types + IPAddress& operator=(const uint8_t *address); + IPAddress& operator=(uint32_t address); + IPAddress& operator=(const IPAddress&) = default; + + virtual size_t printTo(Print& p) const; + String toString() const; + + void clear(); + + /* + check if input string(arg) is a valid IPV4 address or not. + return true on valid. + return false on invalid. + */ + static bool isValid(const String& arg); + static bool isValid(const char* arg); + + friend class WiFiClass; + friend class EthernetClass; + friend class UDP; + friend class Client; + friend class Server; + friend class DhcpClass; + friend class DNSClient; + + friend ::EthernetClass; + friend ::DhcpClass; + friend ::DNSClient; + + /* + lwIP address compatibility + */ + //IPAddress(const ipv4_addr& fw_addr) { setV4(); v4() = fw_addr.addr; } + //IPAddress(const ipv4_addr* fw_addr) { setV4(); v4() = fw_addr->addr; } + + //IPAddress& operator=(const ipv4_addr& fw_addr) { setV4(); v4() = fw_addr.addr; return *this; } + //IPAddress& operator=(const ipv4_addr* fw_addr) { setV4(); v4() = fw_addr->addr; return *this; } + + operator ip_addr_t () const { return _ip; } + operator const ip_addr_t*() const { return &_ip; } + operator ip_addr_t*() { return &_ip; } + + bool isV4() const { return IP_IS_V4_VAL(_ip); } + void setV4() { IP_SET_TYPE_VAL(_ip, IPADDR_TYPE_V4); } + + bool isLocal () const { return ip_addr_islinklocal(&_ip); } + + + IPAddress(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); } + IPAddress(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); } + + IPAddress& operator=(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); return *this; } + IPAddress& operator=(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); return *this; } + +#if LWIP_IPV6 + uint16_t* raw6() + { + setV6(); + return reinterpret_cast(ip_2_ip6(&_ip)); + } + + const uint16_t* raw6() const + { + return isV6()? reinterpret_cast(ip_2_ip6(&_ip)): nullptr; + } + + // when not IPv6, ip_addr_t == ip4_addr_t so this one would be ambiguous + // required otherwise + operator const ip4_addr_t*() const { return isV4()? ip_2_ip4(&_ip): nullptr; } + + bool isV6() const { return IP_IS_V6_VAL(_ip); } + void setV6() { IP_SET_TYPE_VAL(_ip, IPADDR_TYPE_V6); } + + protected: + bool fromString6(const char *address); + +#else + + // allow portable code when IPv6 is not enabled -enum IPType { - IPv4, - IPv6 -}; + uint16_t* raw6() { return nullptr; } + const uint16_t* raw6() const { return nullptr; } + bool isV6() const { return false; } + void setV6() { } + +#endif + + protected: + bool fromString4(const char *address); -class IPAddress : public Printable { -private: - union { - uint8_t bytes[16]; - uint32_t dword[4]; - } _address; - IPType _type; - - // Access the raw byte array containing the address. Because this returns a pointer - // to the internal structure rather than a copy of the address this function should only - // be used when you know that the usage of the returned uint8_t* will be transient and not - // stored. - uint8_t* raw_address() { return _type == IPv4 ? &_address.bytes[IPADDRESS_V4_BYTES_INDEX] : _address.bytes; } - -public: - // Constructors - - // Default IPv4 - IPAddress(); - IPAddress(IPType ip_type); - IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); - IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16); - // IPv4; see implementation note - IPAddress(uint32_t address); - // Default IPv4 - IPAddress(const uint8_t *address); - IPAddress(IPType ip_type, const uint8_t *address); - // If IPv4 fails tries IPv6 see fromString function - IPAddress(const char *address); - - bool fromString(const char *address); - bool fromString(const String &address) { return fromString(address.c_str()); } - - // Overloaded cast operator to allow IPAddress objects to be used where a uint32_t is expected - // NOTE: IPv4 only; see implementation note - operator uint32_t() const { return _type == IPv4 ? _address.dword[IPADDRESS_V4_DWORD_INDEX] : 0; }; - - bool operator==(const IPAddress& addr) const; - bool operator!=(const IPAddress& addr) const { return !(*this == addr); }; - - // NOTE: IPv4 only; we don't know the length of the pointer - bool operator==(const uint8_t* addr) const; - - // Overloaded index operator to allow getting and setting individual octets of the address - uint8_t operator[](int index) const; - uint8_t& operator[](int index); - - // Overloaded copy operators to allow initialisation of IPAddress objects from other types - // NOTE: IPv4 only - IPAddress& operator=(const uint8_t *address); - // NOTE: IPv4 only; see implementation note - IPAddress& operator=(uint32_t address); - // If IPv4 fails tries IPv6 see fromString function - IPAddress& operator=(const char *address); - - virtual size_t printTo(Print& p) const; - String toString() const; - - IPType type() const { return _type; } - - friend class UDP; - friend class Client; - friend class Server; - - friend ::EthernetClass; - friend ::DhcpClass; - friend ::DNSClient; - -protected: - bool fromString4(const char *address); - bool fromString6(const char *address); - String toString4() const; - String toString6() const; }; -extern const IPAddress IN6ADDR_ANY; +extern const IPAddress INADDR_ANY; extern const IPAddress INADDR_NONE; -} -using arduino::IPAddress; \ No newline at end of file +} From 82928635c893189343cf8eb78569f0c4136fded0 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 8 Feb 2025 18:42:51 -0800 Subject: [PATCH 7/9] HardwareSerial to be exported --- api/HardwareSerial.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/HardwareSerial.h b/api/HardwareSerial.h index b687cdf1..f5f9d64f 100644 --- a/api/HardwareSerial.h +++ b/api/HardwareSerial.h @@ -103,4 +103,6 @@ class HardwareSerial : public Stream // XXX: Are we keeping the serialEvent API? extern void serialEventRun(void) __attribute__((weak)); -} \ No newline at end of file +} + +using arduino::HardwareSerial; From 81d77a9428b409c34b2c38e723266b5d855dcc09 Mon Sep 17 00:00:00 2001 From: anotherSimpleCoder Date: Tue, 2 Dec 2025 23:00:33 +0100 Subject: [PATCH 8/9] Replaced C-casts with C++ casts --- api/api/ArduinoAPI.h | 57 ++ api/api/Binary.h | 552 +++++++++++++ api/api/CanMsg.cpp | 46 ++ api/api/CanMsg.h | 156 ++++ api/api/CanMsgRingbuffer.cpp | 74 ++ api/api/CanMsgRingbuffer.h | 72 ++ api/api/Client.h | 46 ++ api/api/Common.cpp | 29 + api/api/Common.h | 190 +++++ api/api/Compat.h | 35 + api/api/DMAPool.h | 316 ++++++++ api/api/HardwareCAN.h | 118 +++ api/api/HardwareI2C.h | 48 ++ api/api/HardwareSPI.h | 145 ++++ api/api/HardwareSerial.h | 106 +++ api/api/IPAddress.cpp | 368 +++++++++ api/api/IPAddress.h | 122 +++ api/api/Interrupts.h | 67 ++ api/api/PluggableUSB.cpp | 103 +++ api/api/PluggableUSB.h | 78 ++ api/api/Print.cpp | 388 +++++++++ api/api/Print.h | 97 +++ api/api/Printable.h | 40 + api/api/RingBuffer.h | 142 ++++ api/api/Server.h | 31 + api/api/Stream.cpp | 321 ++++++++ api/api/Stream.h | 133 ++++ api/api/String.cpp | 750 ++++++++++++++++++ api/api/String.h | 255 ++++++ api/api/USBAPI.h | 64 ++ api/api/Udp.h | 92 +++ api/api/WCharacter.h | 171 ++++ .../deprecated-avr-comp/avr/dtostrf.c.impl | 40 + api/api/deprecated-avr-comp/avr/dtostrf.h | 34 + api/api/deprecated-avr-comp/avr/interrupt.h | 23 + api/api/deprecated-avr-comp/avr/pgmspace.h | 124 +++ api/api/deprecated/Client.h | 25 + api/api/deprecated/HardwareSerial.h | 25 + api/api/deprecated/IPAddress.h | 25 + api/api/deprecated/Print.h | 24 + api/api/deprecated/Printable.h | 24 + api/api/deprecated/Server.h | 25 + api/api/deprecated/Stream.h | 25 + api/api/deprecated/Udp.h | 25 + api/api/deprecated/WString.h | 24 + api/api/itoa.h | 38 + 46 files changed, 5693 insertions(+) create mode 100644 api/api/ArduinoAPI.h create mode 100644 api/api/Binary.h create mode 100644 api/api/CanMsg.cpp create mode 100644 api/api/CanMsg.h create mode 100644 api/api/CanMsgRingbuffer.cpp create mode 100644 api/api/CanMsgRingbuffer.h create mode 100644 api/api/Client.h create mode 100644 api/api/Common.cpp create mode 100644 api/api/Common.h create mode 100644 api/api/Compat.h create mode 100644 api/api/DMAPool.h create mode 100644 api/api/HardwareCAN.h create mode 100644 api/api/HardwareI2C.h create mode 100644 api/api/HardwareSPI.h create mode 100644 api/api/HardwareSerial.h create mode 100644 api/api/IPAddress.cpp create mode 100644 api/api/IPAddress.h create mode 100644 api/api/Interrupts.h create mode 100644 api/api/PluggableUSB.cpp create mode 100644 api/api/PluggableUSB.h create mode 100644 api/api/Print.cpp create mode 100644 api/api/Print.h create mode 100644 api/api/Printable.h create mode 100644 api/api/RingBuffer.h create mode 100644 api/api/Server.h create mode 100644 api/api/Stream.cpp create mode 100644 api/api/Stream.h create mode 100644 api/api/String.cpp create mode 100644 api/api/String.h create mode 100644 api/api/USBAPI.h create mode 100644 api/api/Udp.h create mode 100644 api/api/WCharacter.h create mode 100644 api/api/deprecated-avr-comp/avr/dtostrf.c.impl create mode 100644 api/api/deprecated-avr-comp/avr/dtostrf.h create mode 100644 api/api/deprecated-avr-comp/avr/interrupt.h create mode 100644 api/api/deprecated-avr-comp/avr/pgmspace.h create mode 100644 api/api/deprecated/Client.h create mode 100644 api/api/deprecated/HardwareSerial.h create mode 100644 api/api/deprecated/IPAddress.h create mode 100644 api/api/deprecated/Print.h create mode 100644 api/api/deprecated/Printable.h create mode 100644 api/api/deprecated/Server.h create mode 100644 api/api/deprecated/Stream.h create mode 100644 api/api/deprecated/Udp.h create mode 100644 api/api/deprecated/WString.h create mode 100644 api/api/itoa.h diff --git a/api/api/ArduinoAPI.h b/api/api/ArduinoAPI.h new file mode 100644 index 00000000..a7d8c0b8 --- /dev/null +++ b/api/api/ArduinoAPI.h @@ -0,0 +1,57 @@ +/* + Arduino API main include + Copyright (c) 2016 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 +*/ + +#ifndef ARDUINO_API_H +#define ARDUINO_API_H + +// version 1.5.2 +#define ARDUINO_API_VERSION 10502 + +#include "Binary.h" + +#ifdef __cplusplus +#include "Interrupts.h" +#include "IPAddress.h" +#include "Print.h" +#include "Printable.h" +#include "PluggableUSB.h" +#include "Server.h" +#include "String.h" +#include "Stream.h" +#include "Udp.h" +#include "USBAPI.h" +#include "WCharacter.h" +#endif + +/* Standard C library includes */ +#include +#include +#include +#include +#include + +// Misc Arduino core functions +#include "Common.h" + +#ifdef __cplusplus +// Compatibility layer for older code +#include "Compat.h" +#endif + +#endif diff --git a/api/api/Binary.h b/api/api/Binary.h new file mode 100644 index 00000000..947542e3 --- /dev/null +++ b/api/api/Binary.h @@ -0,0 +1,552 @@ +/* + binary.h - Definitions for binary constants + Deprecated -- use 0b binary literals instead + Copyright (c) 2006 David A. Mellis. 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 +*/ + +#ifndef Binary_h +#define Binary_h + +/* If supported, 0b binary literals are preferable to these constants. + * In that case, warn the user about these being deprecated (if possible). */ +#if __cplusplus >= 201402L + /* C++14 introduces binary literals; C++11 introduces [[deprecated()]] */ + #define DEPRECATED(x) [[deprecated("use " #x " instead")]] +#elif __GNUC__ >= 6 + /* GCC 4.3 supports binary literals; GCC 6 supports __deprecated__ on enums*/ + #define DEPRECATED(x) __attribute__ ((__deprecated__ ("use " #x " instead"))) +#else + /* binary literals not supported, or "deprecated" warning not displayable */ + #define DEPRECATED(x) +#endif + +enum { + B0 DEPRECATED(0b0 ) = 0, + B00 DEPRECATED(0b00 ) = 0, + B000 DEPRECATED(0b000 ) = 0, + B0000 DEPRECATED(0b0000 ) = 0, + B00000 DEPRECATED(0b00000 ) = 0, + B000000 DEPRECATED(0b000000 ) = 0, + B0000000 DEPRECATED(0b0000000 ) = 0, + B00000000 DEPRECATED(0b00000000) = 0, + B1 DEPRECATED(0b1 ) = 1, + B01 DEPRECATED(0b01 ) = 1, + B001 DEPRECATED(0b001 ) = 1, + B0001 DEPRECATED(0b0001 ) = 1, + B00001 DEPRECATED(0b00001 ) = 1, + B000001 DEPRECATED(0b000001 ) = 1, + B0000001 DEPRECATED(0b0000001 ) = 1, + B00000001 DEPRECATED(0b00000001) = 1, + B10 DEPRECATED(0b10 ) = 2, + B010 DEPRECATED(0b010 ) = 2, + B0010 DEPRECATED(0b0010 ) = 2, + B00010 DEPRECATED(0b00010 ) = 2, + B000010 DEPRECATED(0b000010 ) = 2, + B0000010 DEPRECATED(0b0000010 ) = 2, + B00000010 DEPRECATED(0b00000010) = 2, + B11 DEPRECATED(0b11 ) = 3, + B011 DEPRECATED(0b011 ) = 3, + B0011 DEPRECATED(0b0011 ) = 3, + B00011 DEPRECATED(0b00011 ) = 3, + B000011 DEPRECATED(0b000011 ) = 3, + B0000011 DEPRECATED(0b0000011 ) = 3, + B00000011 DEPRECATED(0b00000011) = 3, + B100 DEPRECATED(0b100 ) = 4, + B0100 DEPRECATED(0b0100 ) = 4, + B00100 DEPRECATED(0b00100 ) = 4, + B000100 DEPRECATED(0b000100 ) = 4, + B0000100 DEPRECATED(0b0000100 ) = 4, + B00000100 DEPRECATED(0b00000100) = 4, + B101 DEPRECATED(0b101 ) = 5, + B0101 DEPRECATED(0b0101 ) = 5, + B00101 DEPRECATED(0b00101 ) = 5, + B000101 DEPRECATED(0b000101 ) = 5, + B0000101 DEPRECATED(0b0000101 ) = 5, + B00000101 DEPRECATED(0b00000101) = 5, + B110 DEPRECATED(0b110 ) = 6, + B0110 DEPRECATED(0b0110 ) = 6, + B00110 DEPRECATED(0b00110 ) = 6, + B000110 DEPRECATED(0b000110 ) = 6, + B0000110 DEPRECATED(0b0000110 ) = 6, + B00000110 DEPRECATED(0b00000110) = 6, + B111 DEPRECATED(0b111 ) = 7, + B0111 DEPRECATED(0b0111 ) = 7, + B00111 DEPRECATED(0b00111 ) = 7, + B000111 DEPRECATED(0b000111 ) = 7, + B0000111 DEPRECATED(0b0000111 ) = 7, + B00000111 DEPRECATED(0b00000111) = 7, + B1000 DEPRECATED(0b1000 ) = 8, + B01000 DEPRECATED(0b01000 ) = 8, + B001000 DEPRECATED(0b001000 ) = 8, + B0001000 DEPRECATED(0b0001000 ) = 8, + B00001000 DEPRECATED(0b00001000) = 8, + B1001 DEPRECATED(0b1001 ) = 9, + B01001 DEPRECATED(0b01001 ) = 9, + B001001 DEPRECATED(0b001001 ) = 9, + B0001001 DEPRECATED(0b0001001 ) = 9, + B00001001 DEPRECATED(0b00001001) = 9, + B1010 DEPRECATED(0b1010 ) = 10, + B01010 DEPRECATED(0b01010 ) = 10, + B001010 DEPRECATED(0b001010 ) = 10, + B0001010 DEPRECATED(0b0001010 ) = 10, + B00001010 DEPRECATED(0b00001010) = 10, + B1011 DEPRECATED(0b1011 ) = 11, + B01011 DEPRECATED(0b01011 ) = 11, + B001011 DEPRECATED(0b001011 ) = 11, + B0001011 DEPRECATED(0b0001011 ) = 11, + B00001011 DEPRECATED(0b00001011) = 11, + B1100 DEPRECATED(0b1100 ) = 12, + B01100 DEPRECATED(0b01100 ) = 12, + B001100 DEPRECATED(0b001100 ) = 12, + B0001100 DEPRECATED(0b0001100 ) = 12, + B00001100 DEPRECATED(0b00001100) = 12, + B1101 DEPRECATED(0b1101 ) = 13, + B01101 DEPRECATED(0b01101 ) = 13, + B001101 DEPRECATED(0b001101 ) = 13, + B0001101 DEPRECATED(0b0001101 ) = 13, + B00001101 DEPRECATED(0b00001101) = 13, + B1110 DEPRECATED(0b1110 ) = 14, + B01110 DEPRECATED(0b01110 ) = 14, + B001110 DEPRECATED(0b001110 ) = 14, + B0001110 DEPRECATED(0b0001110 ) = 14, + B00001110 DEPRECATED(0b00001110) = 14, + B1111 DEPRECATED(0b1111 ) = 15, + B01111 DEPRECATED(0b01111 ) = 15, + B001111 DEPRECATED(0b001111 ) = 15, + B0001111 DEPRECATED(0b0001111 ) = 15, + B00001111 DEPRECATED(0b00001111) = 15, + B10000 DEPRECATED(0b10000 ) = 16, + B010000 DEPRECATED(0b010000 ) = 16, + B0010000 DEPRECATED(0b0010000 ) = 16, + B00010000 DEPRECATED(0b00010000) = 16, + B10001 DEPRECATED(0b10001 ) = 17, + B010001 DEPRECATED(0b010001 ) = 17, + B0010001 DEPRECATED(0b0010001 ) = 17, + B00010001 DEPRECATED(0b00010001) = 17, + B10010 DEPRECATED(0b10010 ) = 18, + B010010 DEPRECATED(0b010010 ) = 18, + B0010010 DEPRECATED(0b0010010 ) = 18, + B00010010 DEPRECATED(0b00010010) = 18, + B10011 DEPRECATED(0b10011 ) = 19, + B010011 DEPRECATED(0b010011 ) = 19, + B0010011 DEPRECATED(0b0010011 ) = 19, + B00010011 DEPRECATED(0b00010011) = 19, + B10100 DEPRECATED(0b10100 ) = 20, + B010100 DEPRECATED(0b010100 ) = 20, + B0010100 DEPRECATED(0b0010100 ) = 20, + B00010100 DEPRECATED(0b00010100) = 20, + B10101 DEPRECATED(0b10101 ) = 21, + B010101 DEPRECATED(0b010101 ) = 21, + B0010101 DEPRECATED(0b0010101 ) = 21, + B00010101 DEPRECATED(0b00010101) = 21, + B10110 DEPRECATED(0b10110 ) = 22, + B010110 DEPRECATED(0b010110 ) = 22, + B0010110 DEPRECATED(0b0010110 ) = 22, + B00010110 DEPRECATED(0b00010110) = 22, + B10111 DEPRECATED(0b10111 ) = 23, + B010111 DEPRECATED(0b010111 ) = 23, + B0010111 DEPRECATED(0b0010111 ) = 23, + B00010111 DEPRECATED(0b00010111) = 23, + B11000 DEPRECATED(0b11000 ) = 24, + B011000 DEPRECATED(0b011000 ) = 24, + B0011000 DEPRECATED(0b0011000 ) = 24, + B00011000 DEPRECATED(0b00011000) = 24, + B11001 DEPRECATED(0b11001 ) = 25, + B011001 DEPRECATED(0b011001 ) = 25, + B0011001 DEPRECATED(0b0011001 ) = 25, + B00011001 DEPRECATED(0b00011001) = 25, + B11010 DEPRECATED(0b11010 ) = 26, + B011010 DEPRECATED(0b011010 ) = 26, + B0011010 DEPRECATED(0b0011010 ) = 26, + B00011010 DEPRECATED(0b00011010) = 26, + B11011 DEPRECATED(0b11011 ) = 27, + B011011 DEPRECATED(0b011011 ) = 27, + B0011011 DEPRECATED(0b0011011 ) = 27, + B00011011 DEPRECATED(0b00011011) = 27, + B11100 DEPRECATED(0b11100 ) = 28, + B011100 DEPRECATED(0b011100 ) = 28, + B0011100 DEPRECATED(0b0011100 ) = 28, + B00011100 DEPRECATED(0b00011100) = 28, + B11101 DEPRECATED(0b11101 ) = 29, + B011101 DEPRECATED(0b011101 ) = 29, + B0011101 DEPRECATED(0b0011101 ) = 29, + B00011101 DEPRECATED(0b00011101) = 29, + B11110 DEPRECATED(0b11110 ) = 30, + B011110 DEPRECATED(0b011110 ) = 30, + B0011110 DEPRECATED(0b0011110 ) = 30, + B00011110 DEPRECATED(0b00011110) = 30, + B11111 DEPRECATED(0b11111 ) = 31, + B011111 DEPRECATED(0b011111 ) = 31, + B0011111 DEPRECATED(0b0011111 ) = 31, + B00011111 DEPRECATED(0b00011111) = 31, + B100000 DEPRECATED(0b100000 ) = 32, + B0100000 DEPRECATED(0b0100000 ) = 32, + B00100000 DEPRECATED(0b00100000) = 32, + B100001 DEPRECATED(0b100001 ) = 33, + B0100001 DEPRECATED(0b0100001 ) = 33, + B00100001 DEPRECATED(0b00100001) = 33, + B100010 DEPRECATED(0b100010 ) = 34, + B0100010 DEPRECATED(0b0100010 ) = 34, + B00100010 DEPRECATED(0b00100010) = 34, + B100011 DEPRECATED(0b100011 ) = 35, + B0100011 DEPRECATED(0b0100011 ) = 35, + B00100011 DEPRECATED(0b00100011) = 35, + B100100 DEPRECATED(0b100100 ) = 36, + B0100100 DEPRECATED(0b0100100 ) = 36, + B00100100 DEPRECATED(0b00100100) = 36, + B100101 DEPRECATED(0b100101 ) = 37, + B0100101 DEPRECATED(0b0100101 ) = 37, + B00100101 DEPRECATED(0b00100101) = 37, + B100110 DEPRECATED(0b100110 ) = 38, + B0100110 DEPRECATED(0b0100110 ) = 38, + B00100110 DEPRECATED(0b00100110) = 38, + B100111 DEPRECATED(0b100111 ) = 39, + B0100111 DEPRECATED(0b0100111 ) = 39, + B00100111 DEPRECATED(0b00100111) = 39, + B101000 DEPRECATED(0b101000 ) = 40, + B0101000 DEPRECATED(0b0101000 ) = 40, + B00101000 DEPRECATED(0b00101000) = 40, + B101001 DEPRECATED(0b101001 ) = 41, + B0101001 DEPRECATED(0b0101001 ) = 41, + B00101001 DEPRECATED(0b00101001) = 41, + B101010 DEPRECATED(0b101010 ) = 42, + B0101010 DEPRECATED(0b0101010 ) = 42, + B00101010 DEPRECATED(0b00101010) = 42, + B101011 DEPRECATED(0b101011 ) = 43, + B0101011 DEPRECATED(0b0101011 ) = 43, + B00101011 DEPRECATED(0b00101011) = 43, + B101100 DEPRECATED(0b101100 ) = 44, + B0101100 DEPRECATED(0b0101100 ) = 44, + B00101100 DEPRECATED(0b00101100) = 44, + B101101 DEPRECATED(0b101101 ) = 45, + B0101101 DEPRECATED(0b0101101 ) = 45, + B00101101 DEPRECATED(0b00101101) = 45, + B101110 DEPRECATED(0b101110 ) = 46, + B0101110 DEPRECATED(0b0101110 ) = 46, + B00101110 DEPRECATED(0b00101110) = 46, + B101111 DEPRECATED(0b101111 ) = 47, + B0101111 DEPRECATED(0b0101111 ) = 47, + B00101111 DEPRECATED(0b00101111) = 47, + B110000 DEPRECATED(0b110000 ) = 48, + B0110000 DEPRECATED(0b0110000 ) = 48, + B00110000 DEPRECATED(0b00110000) = 48, + B110001 DEPRECATED(0b110001 ) = 49, + B0110001 DEPRECATED(0b0110001 ) = 49, + B00110001 DEPRECATED(0b00110001) = 49, + B110010 DEPRECATED(0b110010 ) = 50, + B0110010 DEPRECATED(0b0110010 ) = 50, + B00110010 DEPRECATED(0b00110010) = 50, + B110011 DEPRECATED(0b110011 ) = 51, + B0110011 DEPRECATED(0b0110011 ) = 51, + B00110011 DEPRECATED(0b00110011) = 51, + B110100 DEPRECATED(0b110100 ) = 52, + B0110100 DEPRECATED(0b0110100 ) = 52, + B00110100 DEPRECATED(0b00110100) = 52, + B110101 DEPRECATED(0b110101 ) = 53, + B0110101 DEPRECATED(0b0110101 ) = 53, + B00110101 DEPRECATED(0b00110101) = 53, + B110110 DEPRECATED(0b110110 ) = 54, + B0110110 DEPRECATED(0b0110110 ) = 54, + B00110110 DEPRECATED(0b00110110) = 54, + B110111 DEPRECATED(0b110111 ) = 55, + B0110111 DEPRECATED(0b0110111 ) = 55, + B00110111 DEPRECATED(0b00110111) = 55, + B111000 DEPRECATED(0b111000 ) = 56, + B0111000 DEPRECATED(0b0111000 ) = 56, + B00111000 DEPRECATED(0b00111000) = 56, + B111001 DEPRECATED(0b111001 ) = 57, + B0111001 DEPRECATED(0b0111001 ) = 57, + B00111001 DEPRECATED(0b00111001) = 57, + B111010 DEPRECATED(0b111010 ) = 58, + B0111010 DEPRECATED(0b0111010 ) = 58, + B00111010 DEPRECATED(0b00111010) = 58, + B111011 DEPRECATED(0b111011 ) = 59, + B0111011 DEPRECATED(0b0111011 ) = 59, + B00111011 DEPRECATED(0b00111011) = 59, + B111100 DEPRECATED(0b111100 ) = 60, + B0111100 DEPRECATED(0b0111100 ) = 60, + B00111100 DEPRECATED(0b00111100) = 60, + B111101 DEPRECATED(0b111101 ) = 61, + B0111101 DEPRECATED(0b0111101 ) = 61, + B00111101 DEPRECATED(0b00111101) = 61, + B111110 DEPRECATED(0b111110 ) = 62, + B0111110 DEPRECATED(0b0111110 ) = 62, + B00111110 DEPRECATED(0b00111110) = 62, + B111111 DEPRECATED(0b111111 ) = 63, + B0111111 DEPRECATED(0b0111111 ) = 63, + B00111111 DEPRECATED(0b00111111) = 63, + B1000000 DEPRECATED(0b1000000 ) = 64, + B01000000 DEPRECATED(0b01000000) = 64, + B1000001 DEPRECATED(0b1000001 ) = 65, + B01000001 DEPRECATED(0b01000001) = 65, + B1000010 DEPRECATED(0b1000010 ) = 66, + B01000010 DEPRECATED(0b01000010) = 66, + B1000011 DEPRECATED(0b1000011 ) = 67, + B01000011 DEPRECATED(0b01000011) = 67, + B1000100 DEPRECATED(0b1000100 ) = 68, + B01000100 DEPRECATED(0b01000100) = 68, + B1000101 DEPRECATED(0b1000101 ) = 69, + B01000101 DEPRECATED(0b01000101) = 69, + B1000110 DEPRECATED(0b1000110 ) = 70, + B01000110 DEPRECATED(0b01000110) = 70, + B1000111 DEPRECATED(0b1000111 ) = 71, + B01000111 DEPRECATED(0b01000111) = 71, + B1001000 DEPRECATED(0b1001000 ) = 72, + B01001000 DEPRECATED(0b01001000) = 72, + B1001001 DEPRECATED(0b1001001 ) = 73, + B01001001 DEPRECATED(0b01001001) = 73, + B1001010 DEPRECATED(0b1001010 ) = 74, + B01001010 DEPRECATED(0b01001010) = 74, + B1001011 DEPRECATED(0b1001011 ) = 75, + B01001011 DEPRECATED(0b01001011) = 75, + B1001100 DEPRECATED(0b1001100 ) = 76, + B01001100 DEPRECATED(0b01001100) = 76, + B1001101 DEPRECATED(0b1001101 ) = 77, + B01001101 DEPRECATED(0b01001101) = 77, + B1001110 DEPRECATED(0b1001110 ) = 78, + B01001110 DEPRECATED(0b01001110) = 78, + B1001111 DEPRECATED(0b1001111 ) = 79, + B01001111 DEPRECATED(0b01001111) = 79, + B1010000 DEPRECATED(0b1010000 ) = 80, + B01010000 DEPRECATED(0b01010000) = 80, + B1010001 DEPRECATED(0b1010001 ) = 81, + B01010001 DEPRECATED(0b01010001) = 81, + B1010010 DEPRECATED(0b1010010 ) = 82, + B01010010 DEPRECATED(0b01010010) = 82, + B1010011 DEPRECATED(0b1010011 ) = 83, + B01010011 DEPRECATED(0b01010011) = 83, + B1010100 DEPRECATED(0b1010100 ) = 84, + B01010100 DEPRECATED(0b01010100) = 84, + B1010101 DEPRECATED(0b1010101 ) = 85, + B01010101 DEPRECATED(0b01010101) = 85, + B1010110 DEPRECATED(0b1010110 ) = 86, + B01010110 DEPRECATED(0b01010110) = 86, + B1010111 DEPRECATED(0b1010111 ) = 87, + B01010111 DEPRECATED(0b01010111) = 87, + B1011000 DEPRECATED(0b1011000 ) = 88, + B01011000 DEPRECATED(0b01011000) = 88, + B1011001 DEPRECATED(0b1011001 ) = 89, + B01011001 DEPRECATED(0b01011001) = 89, + B1011010 DEPRECATED(0b1011010 ) = 90, + B01011010 DEPRECATED(0b01011010) = 90, + B1011011 DEPRECATED(0b1011011 ) = 91, + B01011011 DEPRECATED(0b01011011) = 91, + B1011100 DEPRECATED(0b1011100 ) = 92, + B01011100 DEPRECATED(0b01011100) = 92, + B1011101 DEPRECATED(0b1011101 ) = 93, + B01011101 DEPRECATED(0b01011101) = 93, + B1011110 DEPRECATED(0b1011110 ) = 94, + B01011110 DEPRECATED(0b01011110) = 94, + B1011111 DEPRECATED(0b1011111 ) = 95, + B01011111 DEPRECATED(0b01011111) = 95, + B1100000 DEPRECATED(0b1100000 ) = 96, + B01100000 DEPRECATED(0b01100000) = 96, + B1100001 DEPRECATED(0b1100001 ) = 97, + B01100001 DEPRECATED(0b01100001) = 97, + B1100010 DEPRECATED(0b1100010 ) = 98, + B01100010 DEPRECATED(0b01100010) = 98, + B1100011 DEPRECATED(0b1100011 ) = 99, + B01100011 DEPRECATED(0b01100011) = 99, + B1100100 DEPRECATED(0b1100100 ) = 100, + B01100100 DEPRECATED(0b01100100) = 100, + B1100101 DEPRECATED(0b1100101 ) = 101, + B01100101 DEPRECATED(0b01100101) = 101, + B1100110 DEPRECATED(0b1100110 ) = 102, + B01100110 DEPRECATED(0b01100110) = 102, + B1100111 DEPRECATED(0b1100111 ) = 103, + B01100111 DEPRECATED(0b01100111) = 103, + B1101000 DEPRECATED(0b1101000 ) = 104, + B01101000 DEPRECATED(0b01101000) = 104, + B1101001 DEPRECATED(0b1101001 ) = 105, + B01101001 DEPRECATED(0b01101001) = 105, + B1101010 DEPRECATED(0b1101010 ) = 106, + B01101010 DEPRECATED(0b01101010) = 106, + B1101011 DEPRECATED(0b1101011 ) = 107, + B01101011 DEPRECATED(0b01101011) = 107, + B1101100 DEPRECATED(0b1101100 ) = 108, + B01101100 DEPRECATED(0b01101100) = 108, + B1101101 DEPRECATED(0b1101101 ) = 109, + B01101101 DEPRECATED(0b01101101) = 109, + B1101110 DEPRECATED(0b1101110 ) = 110, + B01101110 DEPRECATED(0b01101110) = 110, + B1101111 DEPRECATED(0b1101111 ) = 111, + B01101111 DEPRECATED(0b01101111) = 111, + B1110000 DEPRECATED(0b1110000 ) = 112, + B01110000 DEPRECATED(0b01110000) = 112, + B1110001 DEPRECATED(0b1110001 ) = 113, + B01110001 DEPRECATED(0b01110001) = 113, + B1110010 DEPRECATED(0b1110010 ) = 114, + B01110010 DEPRECATED(0b01110010) = 114, + B1110011 DEPRECATED(0b1110011 ) = 115, + B01110011 DEPRECATED(0b01110011) = 115, + B1110100 DEPRECATED(0b1110100 ) = 116, + B01110100 DEPRECATED(0b01110100) = 116, + B1110101 DEPRECATED(0b1110101 ) = 117, + B01110101 DEPRECATED(0b01110101) = 117, + B1110110 DEPRECATED(0b1110110 ) = 118, + B01110110 DEPRECATED(0b01110110) = 118, + B1110111 DEPRECATED(0b1110111 ) = 119, + B01110111 DEPRECATED(0b01110111) = 119, + B1111000 DEPRECATED(0b1111000 ) = 120, + B01111000 DEPRECATED(0b01111000) = 120, + B1111001 DEPRECATED(0b1111001 ) = 121, + B01111001 DEPRECATED(0b01111001) = 121, + B1111010 DEPRECATED(0b1111010 ) = 122, + B01111010 DEPRECATED(0b01111010) = 122, + B1111011 DEPRECATED(0b1111011 ) = 123, + B01111011 DEPRECATED(0b01111011) = 123, + B1111100 DEPRECATED(0b1111100 ) = 124, + B01111100 DEPRECATED(0b01111100) = 124, + B1111101 DEPRECATED(0b1111101 ) = 125, + B01111101 DEPRECATED(0b01111101) = 125, + B1111110 DEPRECATED(0b1111110 ) = 126, + B01111110 DEPRECATED(0b01111110) = 126, + B1111111 DEPRECATED(0b1111111 ) = 127, + B01111111 DEPRECATED(0b01111111) = 127, + B10000000 DEPRECATED(0b10000000) = 128, + B10000001 DEPRECATED(0b10000001) = 129, + B10000010 DEPRECATED(0b10000010) = 130, + B10000011 DEPRECATED(0b10000011) = 131, + B10000100 DEPRECATED(0b10000100) = 132, + B10000101 DEPRECATED(0b10000101) = 133, + B10000110 DEPRECATED(0b10000110) = 134, + B10000111 DEPRECATED(0b10000111) = 135, + B10001000 DEPRECATED(0b10001000) = 136, + B10001001 DEPRECATED(0b10001001) = 137, + B10001010 DEPRECATED(0b10001010) = 138, + B10001011 DEPRECATED(0b10001011) = 139, + B10001100 DEPRECATED(0b10001100) = 140, + B10001101 DEPRECATED(0b10001101) = 141, + B10001110 DEPRECATED(0b10001110) = 142, + B10001111 DEPRECATED(0b10001111) = 143, + B10010000 DEPRECATED(0b10010000) = 144, + B10010001 DEPRECATED(0b10010001) = 145, + B10010010 DEPRECATED(0b10010010) = 146, + B10010011 DEPRECATED(0b10010011) = 147, + B10010100 DEPRECATED(0b10010100) = 148, + B10010101 DEPRECATED(0b10010101) = 149, + B10010110 DEPRECATED(0b10010110) = 150, + B10010111 DEPRECATED(0b10010111) = 151, + B10011000 DEPRECATED(0b10011000) = 152, + B10011001 DEPRECATED(0b10011001) = 153, + B10011010 DEPRECATED(0b10011010) = 154, + B10011011 DEPRECATED(0b10011011) = 155, + B10011100 DEPRECATED(0b10011100) = 156, + B10011101 DEPRECATED(0b10011101) = 157, + B10011110 DEPRECATED(0b10011110) = 158, + B10011111 DEPRECATED(0b10011111) = 159, + B10100000 DEPRECATED(0b10100000) = 160, + B10100001 DEPRECATED(0b10100001) = 161, + B10100010 DEPRECATED(0b10100010) = 162, + B10100011 DEPRECATED(0b10100011) = 163, + B10100100 DEPRECATED(0b10100100) = 164, + B10100101 DEPRECATED(0b10100101) = 165, + B10100110 DEPRECATED(0b10100110) = 166, + B10100111 DEPRECATED(0b10100111) = 167, + B10101000 DEPRECATED(0b10101000) = 168, + B10101001 DEPRECATED(0b10101001) = 169, + B10101010 DEPRECATED(0b10101010) = 170, + B10101011 DEPRECATED(0b10101011) = 171, + B10101100 DEPRECATED(0b10101100) = 172, + B10101101 DEPRECATED(0b10101101) = 173, + B10101110 DEPRECATED(0b10101110) = 174, + B10101111 DEPRECATED(0b10101111) = 175, + B10110000 DEPRECATED(0b10110000) = 176, + B10110001 DEPRECATED(0b10110001) = 177, + B10110010 DEPRECATED(0b10110010) = 178, + B10110011 DEPRECATED(0b10110011) = 179, + B10110100 DEPRECATED(0b10110100) = 180, + B10110101 DEPRECATED(0b10110101) = 181, + B10110110 DEPRECATED(0b10110110) = 182, + B10110111 DEPRECATED(0b10110111) = 183, + B10111000 DEPRECATED(0b10111000) = 184, + B10111001 DEPRECATED(0b10111001) = 185, + B10111010 DEPRECATED(0b10111010) = 186, + B10111011 DEPRECATED(0b10111011) = 187, + B10111100 DEPRECATED(0b10111100) = 188, + B10111101 DEPRECATED(0b10111101) = 189, + B10111110 DEPRECATED(0b10111110) = 190, + B10111111 DEPRECATED(0b10111111) = 191, + B11000000 DEPRECATED(0b11000000) = 192, + B11000001 DEPRECATED(0b11000001) = 193, + B11000010 DEPRECATED(0b11000010) = 194, + B11000011 DEPRECATED(0b11000011) = 195, + B11000100 DEPRECATED(0b11000100) = 196, + B11000101 DEPRECATED(0b11000101) = 197, + B11000110 DEPRECATED(0b11000110) = 198, + B11000111 DEPRECATED(0b11000111) = 199, + B11001000 DEPRECATED(0b11001000) = 200, + B11001001 DEPRECATED(0b11001001) = 201, + B11001010 DEPRECATED(0b11001010) = 202, + B11001011 DEPRECATED(0b11001011) = 203, + B11001100 DEPRECATED(0b11001100) = 204, + B11001101 DEPRECATED(0b11001101) = 205, + B11001110 DEPRECATED(0b11001110) = 206, + B11001111 DEPRECATED(0b11001111) = 207, + B11010000 DEPRECATED(0b11010000) = 208, + B11010001 DEPRECATED(0b11010001) = 209, + B11010010 DEPRECATED(0b11010010) = 210, + B11010011 DEPRECATED(0b11010011) = 211, + B11010100 DEPRECATED(0b11010100) = 212, + B11010101 DEPRECATED(0b11010101) = 213, + B11010110 DEPRECATED(0b11010110) = 214, + B11010111 DEPRECATED(0b11010111) = 215, + B11011000 DEPRECATED(0b11011000) = 216, + B11011001 DEPRECATED(0b11011001) = 217, + B11011010 DEPRECATED(0b11011010) = 218, + B11011011 DEPRECATED(0b11011011) = 219, + B11011100 DEPRECATED(0b11011100) = 220, + B11011101 DEPRECATED(0b11011101) = 221, + B11011110 DEPRECATED(0b11011110) = 222, + B11011111 DEPRECATED(0b11011111) = 223, + B11100000 DEPRECATED(0b11100000) = 224, + B11100001 DEPRECATED(0b11100001) = 225, + B11100010 DEPRECATED(0b11100010) = 226, + B11100011 DEPRECATED(0b11100011) = 227, + B11100100 DEPRECATED(0b11100100) = 228, + B11100101 DEPRECATED(0b11100101) = 229, + B11100110 DEPRECATED(0b11100110) = 230, + B11100111 DEPRECATED(0b11100111) = 231, + B11101000 DEPRECATED(0b11101000) = 232, + B11101001 DEPRECATED(0b11101001) = 233, + B11101010 DEPRECATED(0b11101010) = 234, + B11101011 DEPRECATED(0b11101011) = 235, + B11101100 DEPRECATED(0b11101100) = 236, + B11101101 DEPRECATED(0b11101101) = 237, + B11101110 DEPRECATED(0b11101110) = 238, + B11101111 DEPRECATED(0b11101111) = 239, + B11110000 DEPRECATED(0b11110000) = 240, + B11110001 DEPRECATED(0b11110001) = 241, + B11110010 DEPRECATED(0b11110010) = 242, + B11110011 DEPRECATED(0b11110011) = 243, + B11110100 DEPRECATED(0b11110100) = 244, + B11110101 DEPRECATED(0b11110101) = 245, + B11110110 DEPRECATED(0b11110110) = 246, + B11110111 DEPRECATED(0b11110111) = 247, + B11111000 DEPRECATED(0b11111000) = 248, + B11111001 DEPRECATED(0b11111001) = 249, + B11111010 DEPRECATED(0b11111010) = 250, + B11111011 DEPRECATED(0b11111011) = 251, + B11111100 DEPRECATED(0b11111100) = 252, + B11111101 DEPRECATED(0b11111101) = 253, + B11111110 DEPRECATED(0b11111110) = 254, + B11111111 DEPRECATED(0b11111111) = 255 +}; + +#undef DEPRECATED + +#endif diff --git a/api/api/CanMsg.cpp b/api/api/CanMsg.cpp new file mode 100644 index 00000000..f4f93ce8 --- /dev/null +++ b/api/api/CanMsg.cpp @@ -0,0 +1,46 @@ +/* + CanMsg.cpp - Library for CAN message handling + Copyright (c) 2023 Arduino. 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 +*/ + +/************************************************************************************** + * INCLUDE + **************************************************************************************/ + +#include "CanMsg.h" + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +namespace arduino +{ + +/************************************************************************************** + * STATIC CONST DEFINITION + **************************************************************************************/ + +uint8_t const CanMsg::MAX_DATA_LENGTH; +uint32_t const CanMsg::CAN_EFF_FLAG; +uint32_t const CanMsg::CAN_SFF_MASK; +uint32_t const CanMsg::CAN_EFF_MASK; + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +} /* arduino */ diff --git a/api/api/CanMsg.h b/api/api/CanMsg.h new file mode 100644 index 00000000..a8e32e5b --- /dev/null +++ b/api/api/CanMsg.h @@ -0,0 +1,156 @@ +/* + CanMsg.h - Library for CAN message handling + Copyright (c) 2023 Arduino. 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 +*/ + +#ifndef ARDUINOCORE_API_CAN_MSG_H_ +#define ARDUINOCORE_API_CAN_MSG_H_ + +/************************************************************************************** + * INCLUDE + **************************************************************************************/ + +#include +#include + +#include "Print.h" +#include "Printable.h" +#include "Common.h" + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +namespace arduino +{ + +/************************************************************************************** + * CLASS DECLARATION + **************************************************************************************/ + +class CanMsg : public Printable +{ +public: + static uint8_t constexpr MAX_DATA_LENGTH = 8; + + static uint32_t constexpr CAN_EFF_FLAG = 0x80000000U; + static uint32_t constexpr CAN_SFF_MASK = 0x000007FFU; /* standard frame format (SFF) */ + static uint32_t constexpr CAN_EFF_MASK = 0x1FFFFFFFU; /* extended frame format (EFF) */ + + + CanMsg(uint32_t const can_id, uint8_t const can_data_len, uint8_t const * can_data_ptr) + : id{can_id} + , data_length{min(can_data_len, MAX_DATA_LENGTH)} + , data{0} + { + if (data_length && can_data_ptr) + memcpy(data, can_data_ptr, data_length); + } + + CanMsg() : CanMsg(0, 0, nullptr) { } + + CanMsg(CanMsg const & other) + { + id = other.id; + data_length = other.data_length; + if (data_length > 0) + memcpy(data, other.data, data_length); + } + + virtual ~CanMsg() { } + + CanMsg & operator = (CanMsg const & other) + { + if (this != &other) + { + id = other.id; + data_length = other.data_length; + if (data_length > 0) + memcpy(data, other.data, data_length); + } + return (*this); + } + + virtual size_t printTo(Print & p) const override + { + char buf[20] = {0}; + size_t len = 0; + + /* Print the header. */ + if (isStandardId()) + len = snprintf(buf, sizeof(buf), "[%03" PRIX32 "] (%d) : ", getStandardId(), data_length); + else + len = snprintf(buf, sizeof(buf), "[%08" PRIX32 "] (%d) : ", getExtendedId(), data_length); + size_t n = p.write(buf, len); + + /* Print the data. */ + for (size_t d = 0; d < data_length; d++) + { + len = snprintf(buf, sizeof(buf), "%02X", data[d]); + n += p.write(buf, len); + } + + /* Wrap up. */ + return n; + } + + + uint32_t getStandardId() const { + return (id & CAN_SFF_MASK); + } + uint32_t getExtendedId() const { + return (id & CAN_EFF_MASK); + } + bool isStandardId() const { + return ((id & CAN_EFF_FLAG) == 0); + } + bool isExtendedId() const { + return ((id & CAN_EFF_FLAG) == CAN_EFF_FLAG); + } + + + /* + * CAN ID semantics (mirroring definition by linux/can.h): + * |- Bit 31 : frame format flag (0 = standard 11 bit, 1 = extended 29 bit) + * |- Bit 30 : reserved (future remote transmission request flag) + * |- Bit 29 : reserved (future error frame flag) + * |- Bit 0-28 : CAN identifier (11/29 bit) + */ + uint32_t id; + uint8_t data_length; + uint8_t data[MAX_DATA_LENGTH]; +}; + +/************************************************************************************** + * FREE FUNCTIONS + **************************************************************************************/ + +inline uint32_t CanStandardId(uint32_t const id) { + return (id & CanMsg::CAN_SFF_MASK); +} + +inline uint32_t CanExtendedId(uint32_t const id) { + return (CanMsg::CAN_EFF_FLAG | (id & CanMsg::CAN_EFF_MASK)); +} + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +} /* arduino */ + +#endif /* ARDUINOCORE_API_CAN_MSG_H_ */ diff --git a/api/api/CanMsgRingbuffer.cpp b/api/api/CanMsgRingbuffer.cpp new file mode 100644 index 00000000..56abbac4 --- /dev/null +++ b/api/api/CanMsgRingbuffer.cpp @@ -0,0 +1,74 @@ +/* + CanMsgRingbuffer.cpp - Library for CAN message handling + Copyright (c) 2023 Arduino. 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 +*/ + +/************************************************************************************** + * INCLUDE + **************************************************************************************/ + +#include "CanMsgRingbuffer.h" + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +namespace arduino +{ + +/************************************************************************************** + * CTOR/DTOR + **************************************************************************************/ + +CanMsgRingbuffer::CanMsgRingbuffer() +: _head{0} +, _tail{0} +, _num_elems{0} +{ +} + +/************************************************************************************** + * PUBLIC MEMBER FUNCTIONS + **************************************************************************************/ + +void CanMsgRingbuffer::enqueue(CanMsg const & msg) +{ + if (isFull()) + return; + + _buf[_head] = msg; + _head = next(_head); + _num_elems = _num_elems + 1; +} + +CanMsg CanMsgRingbuffer::dequeue() +{ + if (isEmpty()) + return CanMsg(); + + CanMsg const msg = _buf[_tail]; + _tail = next(_tail); + _num_elems = _num_elems - 1; + + return msg; +} + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +} /* arduino */ diff --git a/api/api/CanMsgRingbuffer.h b/api/api/CanMsgRingbuffer.h new file mode 100644 index 00000000..9eb6bafc --- /dev/null +++ b/api/api/CanMsgRingbuffer.h @@ -0,0 +1,72 @@ +/* + CanMsgRingbuffer.h - Library for CAN message handling + Copyright (c) 2023 Arduino. 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 +*/ + +#ifndef ARDUINOCORE_API_CAN_MSG_RING_BUFFER_H_ +#define ARDUINOCORE_API_CAN_MSG_RING_BUFFER_H_ + +/************************************************************************************** + * INCLUDE + **************************************************************************************/ + +#include + +#include "CanMsg.h" + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +namespace arduino +{ + +/************************************************************************************** + * CLASS DECLARATION + **************************************************************************************/ + +class CanMsgRingbuffer +{ +public: + static size_t constexpr RING_BUFFER_SIZE = 32U; + + CanMsgRingbuffer(); + + inline bool isFull() const { return (_num_elems == RING_BUFFER_SIZE); } + void enqueue(CanMsg const & msg); + + inline bool isEmpty() const { return (_num_elems == 0); } + CanMsg dequeue(); + + inline size_t available() const { return _num_elems; } + +private: + CanMsg _buf[RING_BUFFER_SIZE]; + volatile size_t _head; + volatile size_t _tail; + volatile size_t _num_elems; + + inline size_t next(size_t const idx) const { return ((idx + 1) % RING_BUFFER_SIZE); } +}; + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +} /* arduino */ + +#endif /* ARDUINOCORE_API_CAN_MSG_RING_BUFFER_H_ */ diff --git a/api/api/Client.h b/api/api/Client.h new file mode 100644 index 00000000..5a1d99fe --- /dev/null +++ b/api/api/Client.h @@ -0,0 +1,46 @@ +/* + Client.h - Base class that provides Client + Copyright (c) 2011 Adrian McEwen. 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 +*/ + +#pragma once + +#include "Stream.h" +#include "IPAddress.h" + +namespace arduino { + +class Client : public Stream { + +public: + virtual int connect(IPAddress ip, uint16_t port) =0; + virtual int connect(const char *host, uint16_t port) =0; + virtual size_t write(uint8_t) =0; + virtual size_t write(const uint8_t *buf, size_t size) =0; + virtual int available() = 0; + virtual int read() = 0; + virtual int read(uint8_t *buf, size_t size) = 0; + virtual int peek() = 0; + virtual void flush() = 0; + virtual void stop() = 0; + virtual uint8_t connected() = 0; + virtual operator bool() = 0; +protected: + uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); }; +}; + +} \ No newline at end of file diff --git a/api/api/Common.cpp b/api/api/Common.cpp new file mode 100644 index 00000000..8299247a --- /dev/null +++ b/api/api/Common.cpp @@ -0,0 +1,29 @@ +/* + Common.cpp - Common function implementations + Copyright (c) 2017 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 +*/ + +#include "Common.h" + +/* C++ prototypes */ +long map(long x, long in_min, long in_max, long out_min, long out_max) +{ + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; +} + +uint16_t makeWord(uint16_t w) { return w; } +uint16_t makeWord(uint8_t h, uint8_t l) { return (h << 8) | l; } \ No newline at end of file diff --git a/api/api/Common.h b/api/api/Common.h new file mode 100644 index 00000000..9b28f40a --- /dev/null +++ b/api/api/Common.h @@ -0,0 +1,190 @@ +/* + Common.h - Common definitions for Arduino core + Copyright (c) 2017 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 +*/ + +#pragma once +#include +#include + +#ifdef __cplusplus +extern "C"{ +#endif + +void yield(void); + +typedef enum { + LOW = 0, + HIGH = 1, + CHANGE = 2, + FALLING = 3, + RISING = 4, +} PinStatus; + +typedef enum { + INPUT = 0x0, + OUTPUT = 0x1, + INPUT_PULLUP = 0x2, + INPUT_PULLDOWN = 0x3, + OUTPUT_OPENDRAIN = 0x4, +} PinMode; + +typedef enum { + LSBFIRST = 0, + MSBFIRST = 1, +} BitOrder; + +#define PI 3.1415926535897932384626433832795 +#define HALF_PI 1.5707963267948966192313216916398 +#define TWO_PI 6.283185307179586476925286766559 +#define DEG_TO_RAD 0.017453292519943295769236907684886 +#define RAD_TO_DEG 57.295779513082320876798154814105 +#define EULER 2.718281828459045235360287471352 + +#define SERIAL 0x0 +#define DISPLAY 0x1 + +#ifndef constrain +#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt))) +#endif + +#ifndef radians +#define radians(deg) ((deg)*DEG_TO_RAD) +#endif + +#ifndef degrees +#define degrees(rad) ((rad)*RAD_TO_DEG) +#endif + +#ifndef sq +#define sq(x) ((x)*(x)) +#endif + +typedef void (*voidFuncPtr)(void); +typedef void (*voidFuncPtrParam)(void*); + +// interrupts() / noInterrupts() must be defined by the core + +#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 bitToggle(value, bit) ((value) ^= (1UL << (bit))) +#define bitWrite(value, bit, bitvalue) ((bitvalue) ? bitSet((value), (bit)) : bitClear((value), (bit))) + +#ifndef bit +#define bit(b) (1UL << (b)) +#endif + +/* TODO: request for removal */ +typedef bool boolean; +typedef uint8_t byte; +typedef uint16_t word; + +void init(void); +void initVariant(void); + +#ifndef HOST +int atexit(void (*func)()) __attribute__((weak)); +#endif +int main() __attribute__((weak)); + +#ifdef EXTENDED_PIN_MODE +// Platforms who want to declare more than 256 pins need to define EXTENDED_PIN_MODE globally +typedef uint32_t pin_size_t; +#else +typedef uint8_t pin_size_t; +#endif + +void pinMode(pin_size_t pinNumber, PinMode pinMode); +void digitalWrite(pin_size_t pinNumber, PinStatus status); +PinStatus digitalRead(pin_size_t pinNumber); +int analogRead(pin_size_t pinNumber); +void analogReference(uint8_t mode); +void analogWrite(pin_size_t pinNumber, int value); + +unsigned long millis(void); +unsigned long micros(void); +void delay(unsigned long); +void delayMicroseconds(unsigned int us); +unsigned long pulseIn(pin_size_t pin, uint8_t state, unsigned long timeout); +unsigned long pulseInLong(pin_size_t pin, uint8_t state, unsigned long timeout); + +void shiftOut(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder, uint8_t val); +uint8_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder); + +void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus mode); +void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback, PinStatus mode, void* param); +void detachInterrupt(pin_size_t interruptNumber); + +void setup(void); +void loop(void); + +#ifdef __cplusplus +} // extern "C" +#endif + +#ifdef __cplusplus + template + auto min(const T& a, const L& b) -> decltype((b < a) ? b : a) + { + return (b < a) ? b : a; + } + + template + auto max(const T& a, const L& b) -> decltype((b < a) ? b : a) + { + return (a < b) ? b : a; + } +#else +#ifndef min +#define min(a,b) \ + ({ __typeof__ (a) _a = (a); \ + __typeof__ (b) _b = (b); \ + _a < _b ? _a : _b; }) +#endif +#ifndef max +#define max(a,b) \ + ({ __typeof__ (a) _a = (a); \ + __typeof__ (b) _b = (b); \ + _a > _b ? _a : _b; }) +#endif +#endif + +#ifdef __cplusplus + +/* C++ prototypes */ +uint16_t makeWord(uint16_t w); +uint16_t makeWord(byte h, byte l); + +#define word(...) makeWord(__VA_ARGS__) + +unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L); +unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L); + +void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0); +void noTone(uint8_t _pin); + +// WMath prototypes +long random(long); +long random(long, long); +void randomSeed(unsigned long); +long map(long, long, long, long, long); + +#endif // __cplusplus diff --git a/api/api/Compat.h b/api/api/Compat.h new file mode 100644 index 00000000..564170c6 --- /dev/null +++ b/api/api/Compat.h @@ -0,0 +1,35 @@ +/* + Compat.h - Compatibility layer for Arduino API + Copyright (c) 2018 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 +*/ + +#ifndef __COMPAT_H__ +#define __COMPAT_H__ + +namespace arduino { + +inline void pinMode(pin_size_t pinNumber, int mode) { + pinMode(pinNumber, (PinMode)mode); +}; + +inline void digitalWrite(pin_size_t pinNumber, int status) { + digitalWrite(pinNumber, (PinStatus)status); +}; + +} + +#endif \ No newline at end of file diff --git a/api/api/DMAPool.h b/api/api/DMAPool.h new file mode 100644 index 00000000..815f5d3e --- /dev/null +++ b/api/api/DMAPool.h @@ -0,0 +1,316 @@ +/* + This file is part of the Arduino_AdvancedAnalog library. + Copyright (c) 2023-2024 Arduino SA. 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 + 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 Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#ifndef __DMA_POOL_H__ +#define __DMA_POOL_H__ + +#include +#include + +namespace arduino { + +#if defined(__DCACHE_PRESENT) +#define __CACHE_LINE_SIZE__ __SCB_DCACHE_LINE_SIZE +#elif defined(__cpp_lib_hardware_interference_size) +#define __CACHE_LINE_SIZE__ std::hardware_constructive_interference_size +#else // No cache. +#define __CACHE_LINE_SIZE__ alignof(int) +#endif + +// Single-producer, single-consumer, lock-free bounded Queue. +template class SPSCQueue { + private: + size_t capacity; + std::atomic head; + std::atomic tail; + std::unique_ptr buff; + + public: + SPSCQueue(size_t size=0): + capacity(0), tail(0), head(0), buff(nullptr) { + if (size) { + T *mem = new T[size + 1]; + if (mem) { + buff.reset(mem); + capacity = size + 1; + } + } + } + + void reset() { + tail = head = 0; + } + + size_t empty() { + return tail == head; + } + + operator bool() const { + return buff.get() != nullptr; + } + + bool push(T data) { + size_t curr = head.load(std::memory_order_relaxed); + size_t next = (curr + 1) % capacity; + if (!buff || (next == tail.load(std::memory_order_acquire))) { + return false; + } + buff[curr] = data; + head.store(next, std::memory_order_release); + return true; + } + + T pop(bool peek=false) { + size_t curr = tail.load(std::memory_order_relaxed); + if (!buff || (curr == head.load(std::memory_order_acquire))) { + return nullptr; + } + T data = buff[curr]; + if (!peek) { + size_t next = (curr + 1) % capacity; + tail.store(next, std::memory_order_release); + } + return data; + } +}; + +enum { + DMA_BUFFER_READ = (1 << 0), + DMA_BUFFER_WRITE = (1 << 1), + DMA_BUFFER_DISCONT = (1 << 2), + DMA_BUFFER_INTRLVD = (1 << 3), +} DMABufferFlags; + +// Forward declaration of DMAPool class. +template class DMAPool; + +template class DMABuffer { + private: + DMAPool *pool; + size_t n_samples; + size_t n_channels; + T *ptr; + uint32_t ts; + uint32_t flags; + + public: + DMABuffer(DMAPool *pool=nullptr, size_t samples=0, size_t channels=0, T *mem=nullptr): + pool(pool), n_samples(samples), n_channels(channels), ptr(mem), ts(0), flags(0) { + } + + T *data() { + return ptr; + } + + size_t size() { + return n_samples * n_channels; + } + + size_t bytes() { + return n_samples * n_channels * sizeof(T); + } + + void flush() { + #if __DCACHE_PRESENT + if (ptr) { + SCB_CleanDCache_by_Addr(data(), bytes()); + } + #endif + } + + void invalidate() { + #if __DCACHE_PRESENT + if (ptr) { + SCB_InvalidateDCache_by_Addr(data(), bytes()); + } + #endif + } + + uint32_t timestamp() { + return ts; + } + + void timestamp(uint32_t ts) { + this->ts = ts; + } + + uint32_t channels() { + return n_channels; + } + + void release() { + if (pool && ptr) { + pool->free(this, flags); + } + } + + void set_flags(uint32_t f) { + flags |= f; + } + + bool get_flags(uint32_t f=0xFFFFFFFFU) { + return flags & f; + } + + void clr_flags(uint32_t f=0xFFFFFFFFU) { + flags &= (~f); + } + + T& operator[](size_t i) { + assert(ptr && i < size()); + return ptr[i]; + } + + const T& operator[](size_t i) const { + assert(ptr && i < size()); + return ptr[i]; + } + + operator bool() const { + return (ptr != nullptr); + } +}; + +template class DMAPool { + private: + uint8_t *mem; + bool managed; + SPSCQueue*> wqueue; + SPSCQueue*> rqueue; + + // Allocates dynamic aligned memory. + // Note this memory must be free'd with aligned_free. + static void *aligned_malloc(size_t size) { + void **ptr, *stashed; + size_t offset = A - 1 + sizeof(void *); + if ((A % 2) || !((stashed = ::malloc(size + offset)))) { + return nullptr; + } + ptr = (void **) (((uintptr_t) stashed + offset) & ~(A - 1)); + ptr[-1] = stashed; + return ptr; + } + + // Frees dynamic aligned memory allocated with aligned_malloc. + static void aligned_free(void *ptr) { + if (ptr != nullptr) { + ::free(((void **) ptr)[-1]); + } + } + + public: + DMAPool(size_t n_samples, size_t n_channels, size_t n_buffers, void *mem_in=nullptr): + mem((uint8_t *) mem_in), managed(mem_in==nullptr), wqueue(n_buffers), rqueue(n_buffers) { + // Round up to the next multiple of the alignment. + size_t bufsize = (((n_samples * n_channels * sizeof(T)) + (A-1)) & ~(A-1)); + if (bufsize && rqueue && wqueue) { + if (mem == nullptr) { + // Allocate an aligned memory block for the DMA buffers' memory. + mem = (uint8_t *) aligned_malloc(n_buffers * bufsize); + if (!mem) { + // Failed to allocate memory. + return; + } + } + // Allocate the DMA buffers, initialize them using aligned + // pointers from the pool, and add them to the write queue. + for (size_t i=0; i *buf = new DMABuffer( + this, n_samples, n_channels, (T *) &mem[i * bufsize] + ); + if (buf == nullptr) { + break; + } + wqueue.push(buf); + } + } + } + + ~DMAPool() { + while (readable()) { + delete alloc(DMA_BUFFER_READ); + } + + while (writable()) { + delete alloc(DMA_BUFFER_WRITE); + } + + if (mem && managed) { + aligned_free(mem); + } + } + + bool writable() { + return !(wqueue.empty()); + } + + bool readable() { + return !(rqueue.empty()); + } + + void flush() { + while (readable()) { + DMABuffer *buf = alloc(DMA_BUFFER_READ); + if (buf) { + buf->release(); + } + } + } + + DMABuffer *alloc(uint32_t flags) { + DMABuffer *buf = nullptr; + if (flags & DMA_BUFFER_READ) { + // Get a DMA buffer from the read/ready queue. + buf = rqueue.pop(); + } else { + // Get a DMA buffer from the write/free queue. + buf = wqueue.pop(); + } + if (buf) { + buf->clr_flags(DMA_BUFFER_READ | DMA_BUFFER_WRITE); + buf->set_flags(flags); + } + return buf; + } + + void free(DMABuffer *buf, uint32_t flags=0) { + if (buf == nullptr) { + return; + } + if (flags == 0) { + flags = buf->get_flags(); + } + if (flags & DMA_BUFFER_READ) { + // Return the DMA buffer to the write/free queue. + buf->clr_flags(); + wqueue.push(buf); + } else { + // Return the DMA buffer to the read/ready queue. + rqueue.push(buf); + } + } + +}; + +} // namespace arduino + +using arduino::DMAPool; +using arduino::DMABuffer; +using arduino::SPSCQueue; +#endif //__DMA_POOL_H__ diff --git a/api/api/HardwareCAN.h b/api/api/HardwareCAN.h new file mode 100644 index 00000000..57d9d582 --- /dev/null +++ b/api/api/HardwareCAN.h @@ -0,0 +1,118 @@ +/* + HardwareCAN.h - CAN bus interface for Arduino core + Copyright (c) 2023 Arduino. 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 +*/ + +#ifndef ARDUINOCORE_API_HARDWARECAN_H +#define ARDUINOCORE_API_HARDWARECAN_H + +/************************************************************************************** + * INCLUDE + **************************************************************************************/ + +#include "CanMsg.h" +#include "CanMsgRingbuffer.h" + +/************************************************************************************** + * TYPEDEF + **************************************************************************************/ + +enum class CanBitRate : int +{ + BR_125k = 125000, + BR_250k = 250000, + BR_500k = 500000, + BR_1000k = 1000000, +}; + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +namespace arduino +{ + +/************************************************************************************** + * CLASS DECLARATION + **************************************************************************************/ + +class HardwareCAN +{ +public: + virtual ~HardwareCAN() {} + + + /** + * Initialize the CAN controller. + * + * @param can_bitrate the bus bit rate + * @return true if initialization succeeded and the controller is operational + */ + virtual bool begin(CanBitRate const can_bitrate) = 0; + + /** + * Disable the CAN controller. + * + * Whether any messages that are buffered will be sent is _implementation defined_. + */ + virtual void end() = 0; + + /** + * Enqueue a message for transmission to the CAN bus. + * + * This call returns when the message has been enqueued for transmission. + * Due to bus arbitration and error recovery there may be a substantial delay + * before the message is actually sent. + * + * An implementation must ensure that all messages with the same CAN priority + * are sent in the order in which they are enqueued. + * + * It is _implementation defined_ whether multiple messages can be enqueued + * for transmission, and if messages with higher CAN priority can preempt the + * transmission of previously enqueued messages. The default configuration for + * and implementation should not allow multiple messages to be enqueued. + * + * @param msg the message to send + * @return 1 if the message was enqueued, an _implementation defined_ error code < 0 if there was an error + * @todo define specific error codes, especially "message already pending" + */ + virtual int write(CanMsg const &msg) = 0; + + /** + * Determine if any messages have been received and buffered. + * + * @return the number of unread messages that have been received + */ + virtual size_t available() = 0; + + /** + * Returns the first message received, or an empty message if none are available. + * + * Messages must be returned in the order received. + * + * @return the first message in the receive buffer + */ + virtual CanMsg read() = 0; +}; + +/************************************************************************************** + * NAMESPACE + **************************************************************************************/ + +} /* arduino */ + +#endif /* ARDUINOCORE_API_HARDWARECAN_H */ diff --git a/api/api/HardwareI2C.h b/api/api/HardwareI2C.h new file mode 100644 index 00000000..98c6bfd7 --- /dev/null +++ b/api/api/HardwareI2C.h @@ -0,0 +1,48 @@ +/* + HardwareI2C.h - Hardware I2C interface for Arduino + Copyright (c) 2016 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 +*/ + +#pragma once + +#include +#include "Stream.h" + +namespace arduino { + +class HardwareI2C : public Stream +{ + public: + virtual void begin() = 0; + virtual void begin(uint8_t address) = 0; + virtual void end() = 0; + + virtual void setClock(uint32_t freq) = 0; + + virtual void beginTransmission(uint8_t address) = 0; + virtual uint8_t endTransmission(bool stopBit) = 0; + virtual uint8_t endTransmission(void) = 0; + + virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit) = 0; + virtual size_t requestFrom(uint8_t address, size_t len) = 0; + + virtual void onReceive(void(*)(int)) = 0; + virtual void onRequest(void(*)(void)) = 0; +}; + +} + diff --git a/api/api/HardwareSPI.h b/api/api/HardwareSPI.h new file mode 100644 index 00000000..7ce833ca --- /dev/null +++ b/api/api/HardwareSPI.h @@ -0,0 +1,145 @@ +/* + HardwareSPI.h - Hardware SPI interface for Arduino + Copyright (c) 2018 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 +*/ + +#pragma once + +#include "Common.h" +#include +#include "Stream.h" + +#define SPI_HAS_TRANSACTION + +namespace arduino { + +typedef enum { + SPI_MODE0 = 0, + SPI_MODE1 = 1, + SPI_MODE2 = 2, + SPI_MODE3 = 3, +} SPIMode; + +// Platforms should define SPI_HAS_PERIPHERAL_MODE if SPI peripheral +// mode is supported, to allow applications to check whether peripheral +// mode is available or not. +typedef enum { + SPI_CONTROLLER = 0, + SPI_PERIPHERAL = 1, +} SPIBusMode; + + +class SPISettings { + public: + SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode = SPI_CONTROLLER) { + if (__builtin_constant_p(clock)) { + init_AlwaysInline(clock, bitOrder, dataMode, busMode); + } else { + init_MightInline(clock, bitOrder, dataMode, busMode); + } + } + + SPISettings(uint32_t clock, BitOrder bitOrder, int dataMode, SPIBusMode busMode = SPI_CONTROLLER) { + if (__builtin_constant_p(clock)) { + init_AlwaysInline(clock, bitOrder, static_cast(dataMode), busMode); + } else { + init_MightInline(clock, bitOrder, static_cast(dataMode), busMode); + } + } + + // Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first. + SPISettings() { init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0, SPI_CONTROLLER); } + + bool operator==(const SPISettings& rhs) const + { + if ((this->clockFreq == rhs.clockFreq) && + (this->bitOrder == rhs.bitOrder) && + (this->dataMode == rhs.dataMode) && + (this->busMode == rhs.busMode)) { + return true; + } + return false; + } + + bool operator!=(const SPISettings& rhs) const + { + return !(*this == rhs); + } + + uint32_t getClockFreq() const { + return clockFreq; + } + SPIMode getDataMode() const { + return dataMode; + } + BitOrder getBitOrder() const { + return (bitOrder); + } + SPIBusMode getBusMode() const { + return busMode; + } + + private: + void init_MightInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) { + init_AlwaysInline(clock, bitOrder, dataMode, busMode); + } + + // Core developer MUST use an helper function in beginTransaction() to use this data + void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) __attribute__((__always_inline__)) { + this->clockFreq = clock; + this->dataMode = dataMode; + this->bitOrder = bitOrder; + this->busMode = busMode; + } + + uint32_t clockFreq; + SPIMode dataMode; + BitOrder bitOrder; + SPIBusMode busMode; + + friend class HardwareSPI; +}; + +const SPISettings DEFAULT_SPI_SETTINGS = SPISettings(); + +class HardwareSPI +{ + public: + virtual ~HardwareSPI() { } + + virtual uint8_t transfer(uint8_t data) = 0; + virtual uint16_t transfer16(uint16_t data) = 0; + virtual void transfer(void *buf, size_t count) = 0; + + // Transaction Functions + virtual void usingInterrupt(int interruptNumber) = 0; + virtual void notUsingInterrupt(int interruptNumber) = 0; + virtual void beginTransaction(SPISettings settings) = 0; + virtual void endTransaction(void) = 0; + + // SPI Configuration methods + virtual void attachInterrupt() = 0; + virtual void detachInterrupt() = 0; + + virtual void begin() = 0; + virtual void end() = 0; +}; + +// Alias SPIClass to HardwareSPI since it's already the defacto standard for SPI class name +typedef HardwareSPI SPIClass; + +} diff --git a/api/api/HardwareSerial.h b/api/api/HardwareSerial.h new file mode 100644 index 00000000..b687cdf1 --- /dev/null +++ b/api/api/HardwareSerial.h @@ -0,0 +1,106 @@ +/* + HardwareSerial.h - Hardware serial interface for Arduino + Copyright (c) 2016 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 +*/ + +#pragma once + +#include +#include "Stream.h" + +namespace arduino { + +// XXX: Those constants should be defined as const int / enums? +// XXX: shall we use namespaces too? +#define SERIAL_PARITY_EVEN (0x1ul) +#define SERIAL_PARITY_ODD (0x2ul) +#define SERIAL_PARITY_NONE (0x3ul) +#define SERIAL_PARITY_MARK (0x4ul) +#define SERIAL_PARITY_SPACE (0x5ul) +#define SERIAL_PARITY_MASK (0xFul) + +#define SERIAL_STOP_BIT_1 (0x10ul) +#define SERIAL_STOP_BIT_1_5 (0x20ul) +#define SERIAL_STOP_BIT_2 (0x30ul) +#define SERIAL_STOP_BIT_MASK (0xF0ul) + +#define SERIAL_DATA_5 (0x100ul) +#define SERIAL_DATA_6 (0x200ul) +#define SERIAL_DATA_7 (0x300ul) +#define SERIAL_DATA_8 (0x400ul) +#define SERIAL_DATA_MASK (0xF00ul) + +#define SERIAL_5N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_5) +#define SERIAL_6N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_6) +#define SERIAL_7N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_7) +#define SERIAL_8N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_8) +#define SERIAL_5N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_5) +#define SERIAL_6N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_6) +#define SERIAL_7N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_7) +#define SERIAL_8N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_8) +#define SERIAL_5E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_5) +#define SERIAL_6E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_6) +#define SERIAL_7E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_7) +#define SERIAL_8E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_8) +#define SERIAL_5E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_5) +#define SERIAL_6E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_6) +#define SERIAL_7E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_7) +#define SERIAL_8E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_8) +#define SERIAL_5O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_5) +#define SERIAL_6O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_6) +#define SERIAL_7O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_7) +#define SERIAL_8O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_8) +#define SERIAL_5O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_5) +#define SERIAL_6O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_6) +#define SERIAL_7O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_7) +#define SERIAL_8O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_8) +#define SERIAL_5M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_5) +#define SERIAL_6M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_6) +#define SERIAL_7M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_7) +#define SERIAL_8M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_8) +#define SERIAL_5M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_5) +#define SERIAL_6M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_6) +#define SERIAL_7M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_7) +#define SERIAL_8M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_8) +#define SERIAL_5S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_5) +#define SERIAL_6S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_6) +#define SERIAL_7S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_7) +#define SERIAL_8S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_8) +#define SERIAL_5S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_5) +#define SERIAL_6S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_6) +#define SERIAL_7S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_7) +#define SERIAL_8S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_8) + +class HardwareSerial : public Stream +{ + public: + virtual void begin(unsigned long) = 0; + virtual void begin(unsigned long baudrate, uint16_t config) = 0; + virtual void end() = 0; + virtual int available(void) = 0; + virtual int peek(void) = 0; + virtual int read(void) = 0; + virtual void flush(void) = 0; + virtual size_t write(uint8_t) = 0; + using Print::write; // pull in write(str) and write(buf, size) from Print + virtual operator bool() = 0; +}; + +// XXX: Are we keeping the serialEvent API? +extern void serialEventRun(void) __attribute__((weak)); + +} \ No newline at end of file diff --git a/api/api/IPAddress.cpp b/api/api/IPAddress.cpp new file mode 100644 index 00000000..05b41bc1 --- /dev/null +++ b/api/api/IPAddress.cpp @@ -0,0 +1,368 @@ +/* + IPAddress.cpp - Base class that provides IPAddress + Copyright (c) 2011 Adrian McEwen. 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 +*/ + +#include "IPAddress.h" +#include "Print.h" + +using namespace arduino; + +IPAddress::IPAddress() : IPAddress(IPv4) {} + +IPAddress::IPAddress(IPType ip_type) +{ + _type = ip_type; + memset(_address.bytes, 0, sizeof(_address.bytes)); +} + +IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) +{ + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + _address.bytes[IPADDRESS_V4_BYTES_INDEX] = first_octet; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1] = second_octet; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2] = third_octet; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = fourth_octet; +} + +IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16) { + _type = IPv6; + _address.bytes[0] = o1; + _address.bytes[1] = o2; + _address.bytes[2] = o3; + _address.bytes[3] = o4; + _address.bytes[4] = o5; + _address.bytes[5] = o6; + _address.bytes[6] = o7; + _address.bytes[7] = o8; + _address.bytes[8] = o9; + _address.bytes[9] = o10; + _address.bytes[10] = o11; + _address.bytes[11] = o12; + _address.bytes[12] = o13; + _address.bytes[13] = o14; + _address.bytes[14] = o15; + _address.bytes[15] = o16; +} + +IPAddress::IPAddress(uint32_t address) +{ + // IPv4 only + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; + + // NOTE on conversion/comparison and uint32_t: + // These conversions are host platform dependent. + // There is a defined integer representation of IPv4 addresses, + // based on network byte order (will be the value on big endian systems), + // e.g. http://2398766798 is the same as http://142.250.70.206, + // However on little endian systems the octets 0x83, 0xFA, 0x46, 0xCE, + // in that order, will form the integer (uint32_t) 3460758158 . +} + +IPAddress::IPAddress(const uint8_t *address) : IPAddress(IPv4, address) {} + +IPAddress::IPAddress(IPType ip_type, const uint8_t *address) +{ + _type = ip_type; + if (ip_type == IPv4) { + memset(_address.bytes, 0, sizeof(_address.bytes)); + memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); + } else { + memcpy(_address.bytes, address, sizeof(_address.bytes)); + } +} + +IPAddress::IPAddress(const char *address) +{ + fromString(address); +} + +String IPAddress::toString4() const +{ + char szRet[16]; + snprintf(szRet, sizeof(szRet), "%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]); + return String(szRet); +} + +String IPAddress::toString6() const +{ + char szRet[40]; + snprintf(szRet, sizeof(szRet), "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", + _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3], + _address.bytes[4], _address.bytes[5], _address.bytes[6], _address.bytes[7], + _address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11], + _address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]); + return String(szRet); +} + +String IPAddress::toString() const +{ + if (_type == IPv4) { + return toString4(); + } else { + return toString6(); + } +} + +bool IPAddress::fromString(const char *address) { + if (!fromString4(address)) { + return fromString6(address); + } + return true; +} + +bool IPAddress::fromString4(const char *address) +{ + // TODO: add support for "a", "a.b", "a.b.c" formats + + int16_t acc = -1; // Accumulator + uint8_t dots = 0; + + memset(_address.bytes, 0, sizeof(_address.bytes)); + while (*address) + { + char c = *address++; + if (c >= '0' && c <= '9') + { + acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0'); + if (acc > 255) { + // Value out of [0..255] range + return false; + } + } + else if (c == '.') + { + if (dots == 3) { + // Too many dots (there must be 3 dots) + return false; + } + if (acc < 0) { + /* No value between dots, e.g. '1..' */ + return false; + } + _address.bytes[IPADDRESS_V4_BYTES_INDEX + dots++] = acc; + acc = -1; + } + else + { + // Invalid char + return false; + } + } + + if (dots != 3) { + // Too few dots (there must be 3 dots) + return false; + } + if (acc < 0) { + /* No value between dots, e.g. '1..' */ + return false; + } + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = acc; + _type = IPv4; + return true; +} + +bool IPAddress::fromString6(const char *address) { + uint32_t acc = 0; // Accumulator + int colons = 0, double_colons = -1; + + while (*address) + { + char c = tolower(*address++); + if (isalnum(c) && c <= 'f') { + if (c >= 'a') + c -= 'a' - '0' - 10; + acc = acc * 16 + (c - '0'); + if (acc > 0xffff) + // Value out of range + return false; + } + else if (c == ':') { + if (*address == ':') { + if (double_colons >= 0) { + // :: allowed once + return false; + } + if (*address != '\0' && *(address + 1) == ':') { + // ::: not allowed + return false; + } + // remember location + double_colons = colons + !!acc; + address++; + } else if (*address == '\0') { + // can't end with a single colon + return false; + } + if (colons == 7) + // too many separators + return false; + _address.bytes[colons * 2] = acc >> 8; + _address.bytes[colons * 2 + 1] = acc & 0xff; + colons++; + acc = 0; + } + else + // Invalid char + return false; + } + + if (double_colons == -1 && colons != 7) { + // Too few separators + return false; + } + if (double_colons > -1 && colons > 6) { + // Too many segments (double colon must be at least one zero field) + return false; + } + _address.bytes[colons * 2] = acc >> 8; + _address.bytes[colons * 2 + 1] = acc & 0xff; + colons++; + + if (double_colons != -1) { + for (int i = colons * 2 - double_colons * 2 - 1; i >= 0; i--) + _address.bytes[16 - colons * 2 + double_colons * 2 + i] = _address.bytes[double_colons * 2 + i]; + for (int i = double_colons * 2; i < 16 - colons * 2 + double_colons * 2; i++) + _address.bytes[i] = 0; + } + + _type = IPv6; + return true; +} + +IPAddress& IPAddress::operator=(const uint8_t *address) +{ + // IPv4 only conversion from byte pointer + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); + return *this; +} + +IPAddress& IPAddress::operator=(const char *address) +{ + fromString(address); + return *this; +} + +IPAddress& IPAddress::operator=(uint32_t address) +{ + // IPv4 conversion + // See note on conversion/comparison and uint32_t + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; + return *this; +} + +bool IPAddress::operator==(const IPAddress& addr) const { + return (addr._type == _type) + && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0); +} + +bool IPAddress::operator==(const uint8_t* addr) const +{ + // IPv4 only comparison to byte pointer + // Can't support IPv6 as we know our type, but not the length of the pointer + return _type == IPv4 && memcmp(addr, &_address.bytes[IPADDRESS_V4_BYTES_INDEX], sizeof(uint32_t)) == 0; +} + +uint8_t IPAddress::operator[](int index) const { + if (_type == IPv4) { + return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; + } + return _address.bytes[index]; +} + +uint8_t& IPAddress::operator[](int index) { + if (_type == IPv4) { + return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; + } + return _address.bytes[index]; +} + +size_t IPAddress::printTo(Print& p) const +{ + size_t n = 0; + + if (_type == IPv6) { + // IPv6 IETF canonical format: compress left-most longest run of two or more zero fields, lower case + int8_t longest_start = -1; + int8_t longest_length = 1; + int8_t current_start = -1; + int8_t current_length = 0; + for (int8_t f = 0; f < 8; f++) { + if (_address.bytes[f * 2] == 0 && _address.bytes[f * 2 + 1] == 0) { + if (current_start == -1) { + current_start = f; + current_length = 1; + } else { + current_length++; + } + if (current_length > longest_length) { + longest_start = current_start; + longest_length = current_length; + } + } else { + current_start = -1; + } + } + for (int f = 0; f < 8; f++) { + if (f < longest_start || f >= longest_start + longest_length) { + uint8_t c1 = _address.bytes[f * 2] >> 4; + uint8_t c2 = _address.bytes[f * 2] & 0xf; + uint8_t c3 = _address.bytes[f * 2 + 1] >> 4; + uint8_t c4 = _address.bytes[f * 2 + 1] & 0xf; + if (c1 > 0) { + n += p.print((char)(c1 < 10 ? '0' + c1 : 'a' + c1 - 10)); + } + if (c1 > 0 || c2 > 0) { + n += p.print((char)(c2 < 10 ? '0' + c2 : 'a' + c2 - 10)); + } + if (c1 > 0 || c2 > 0 || c3 > 0) { + n += p.print((char)(c3 < 10 ? '0' + c3 : 'a' + c3 - 10)); + } + n += p.print((char)(c4 < 10 ? '0' + c4 : 'a' + c4 - 10)); + if (f < 7) { + n += p.print(':'); + } + } else if (f == longest_start) { + if (longest_start == 0) { + n += p.print(':'); + } + n += p.print(':'); + } + } + return n; + } + + // IPv4 + for (int i =0; i < 3; i++) + { + n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + i], DEC); + n += p.print('.'); + } + n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + 3], DEC); + return n; +} + +const IPAddress arduino::IN6ADDR_ANY(IPv6); +const IPAddress arduino::INADDR_NONE(0,0,0,0); diff --git a/api/api/IPAddress.h b/api/api/IPAddress.h new file mode 100644 index 00000000..31a2d06d --- /dev/null +++ b/api/api/IPAddress.h @@ -0,0 +1,122 @@ +/* + IPAddress.h - Base class that provides IPAddress + Copyright (c) 2011 Adrian McEwen. 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 +*/ + +#pragma once + +#include +#include "Printable.h" +#include "String.h" + +#define IPADDRESS_V4_BYTES_INDEX 12 +#define IPADDRESS_V4_DWORD_INDEX 3 + +// forward declarations of global name space friend classes +class EthernetClass; +class DhcpClass; +class DNSClient; + +namespace arduino { + +// A class to make it easier to handle and pass around IP addresses + +enum IPType { + IPv4, + IPv6 +}; + +class IPAddress : public Printable { +private: + union { + uint8_t bytes[16]; + uint32_t dword[4]; + } _address; + IPType _type; + + // Access the raw byte array containing the address. Because this returns a pointer + // to the internal structure rather than a copy of the address this function should only + // be used when you know that the usage of the returned uint8_t* will be transient and not + // stored. + uint8_t* raw_address() { return _type == IPv4 ? &_address.bytes[IPADDRESS_V4_BYTES_INDEX] : _address.bytes; } + +public: + // Constructors + + // Default IPv4 + IPAddress(); + IPAddress(IPType ip_type); + IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); + IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16); + // IPv4; see implementation note + IPAddress(uint32_t address); + // Default IPv4 + IPAddress(const uint8_t *address); + IPAddress(IPType ip_type, const uint8_t *address); + // If IPv4 fails tries IPv6 see fromString function + IPAddress(const char *address); + + bool fromString(const char *address); + bool fromString(const String &address) { return fromString(address.c_str()); } + + // Overloaded cast operator to allow IPAddress objects to be used where a uint32_t is expected + // NOTE: IPv4 only; see implementation note + operator uint32_t() const { return _type == IPv4 ? _address.dword[IPADDRESS_V4_DWORD_INDEX] : 0; }; + + bool operator==(const IPAddress& addr) const; + bool operator!=(const IPAddress& addr) const { return !(*this == addr); }; + + // NOTE: IPv4 only; we don't know the length of the pointer + bool operator==(const uint8_t* addr) const; + + // Overloaded index operator to allow getting and setting individual octets of the address + uint8_t operator[](int index) const; + uint8_t& operator[](int index); + + // Overloaded copy operators to allow initialisation of IPAddress objects from other types + // NOTE: IPv4 only + IPAddress& operator=(const uint8_t *address); + // NOTE: IPv4 only; see implementation note + IPAddress& operator=(uint32_t address); + // If IPv4 fails tries IPv6 see fromString function + IPAddress& operator=(const char *address); + + virtual size_t printTo(Print& p) const; + String toString() const; + + IPType type() const { return _type; } + + friend class UDP; + friend class Client; + friend class Server; + + friend ::EthernetClass; + friend ::DhcpClass; + friend ::DNSClient; + +protected: + bool fromString4(const char *address); + bool fromString6(const char *address); + String toString4() const; + String toString6() const; +}; + +extern const IPAddress IN6ADDR_ANY; +extern const IPAddress INADDR_NONE; +} + +using arduino::IPAddress; \ No newline at end of file diff --git a/api/api/Interrupts.h b/api/api/Interrupts.h new file mode 100644 index 00000000..b397eb7d --- /dev/null +++ b/api/api/Interrupts.h @@ -0,0 +1,67 @@ +/* + Interrupts.h - Arduino interrupt management functions + Copyright (c) 2018 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 +*/ + +#ifndef W_INTERRUPTS_CPP +#define W_INTERRUPTS_CPP +#ifdef __cplusplus + +#include +#include +#include +#include "Common.h" + +namespace arduino { + +template +using voidTemplateFuncPtrParam = void (*)(T param); + +template struct __container__ { + void* param; + voidTemplateFuncPtrParam function; +}; + +// C++ only overloaded version of attachInterrupt function +template void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam userFunc, PinStatus mode, T& param) { + + struct __container__ *cont = new __container__(); + cont->param = ¶m; + cont->function = userFunc; + + // TODO: check lambda scope + // TODO: add structure to delete(__container__) when detachInterrupt() is called + auto f = [](void* a) -> void + { + T param = *(static_cast((static_cast*>(a))->param)); + //T param = *(T*) ((struct __container__*)a)->param; + (static_cast*>)(a)->function(param); + + //(((struct __container__*)a)->function)(param); + }; + + attachInterruptParam(interruptNum, f, mode, cont); +} + +template void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam userFunc, PinStatus mode, T* param) { + //attachInterruptParam(interruptNum, (voidFuncPtrParam)userFunc, mode, (void*)param); + attachInterruptParam(interruptNum, static_cast(userFunc), mode, static_cast(param)) +} + +} +#endif +#endif diff --git a/api/api/PluggableUSB.cpp b/api/api/PluggableUSB.cpp new file mode 100644 index 00000000..977b4df4 --- /dev/null +++ b/api/api/PluggableUSB.cpp @@ -0,0 +1,103 @@ +/* + PluggableUSB.cpp + Copyright (c) 2015 Arduino LLC + + 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 +*/ + +#include "USBAPI.h" +#include "PluggableUSB.h" + +using namespace arduino; + +int PluggableUSB_::getInterface(uint8_t* interfaceCount) +{ + int sent = 0; + PluggableUSBModule* node; + for (node = rootNode; node; node = node->next) { + int res = node->getInterface(interfaceCount); + if (res < 0) + return -1; + sent += res; + } + return sent; +} + +int PluggableUSB_::getDescriptor(USBSetup& setup) +{ + PluggableUSBModule* node; + for (node = rootNode; node; node = node->next) { + int ret = node->getDescriptor(setup); + // ret!=0 -> request has been processed + if (ret) + return ret; + } + return 0; +} + +void PluggableUSB_::getShortName(char *iSerialNum) +{ + PluggableUSBModule* node; + for (node = rootNode; node; node = node->next) { + iSerialNum += node->getShortName(iSerialNum); + } + *iSerialNum = 0; +} + +bool PluggableUSB_::setup(USBSetup& setup) +{ + PluggableUSBModule* node; + for (node = rootNode; node; node = node->next) { + if (node->setup(setup)) { + return true; + } + } + return false; +} + +bool PluggableUSB_::plug(PluggableUSBModule *node) +{ + if ((lastEp + node->numEndpoints) > totalEP) { + return false; + } + + if (!rootNode) { + rootNode = node; + } else { + PluggableUSBModule *current = rootNode; + while (current->next) { + current = current->next; + } + current->next = node; + } + + node->pluggedInterface = lastIf; + node->pluggedEndpoint = lastEp; + lastIf += node->numInterfaces; + for (uint8_t i = 0; i < node->numEndpoints; i++) { + *(static_cast(epBuffer(lastEp))) = node->endpointType[i]; + + //*(unsigned int*)(epBuffer(lastEp)) = node->endpointType[i]; + lastEp++; + } + return true; + // restart USB layer??? +} + +PluggableUSB_& PluggableUSB() +{ + static PluggableUSB_ obj; + return obj; +} \ No newline at end of file diff --git a/api/api/PluggableUSB.h b/api/api/PluggableUSB.h new file mode 100644 index 00000000..9018f6ce --- /dev/null +++ b/api/api/PluggableUSB.h @@ -0,0 +1,78 @@ +/* + PluggableUSB.h + Copyright (c) 2015 Arduino LLC + + 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 +*/ + +#ifndef PUSB_h +#define PUSB_h + +#include "USBAPI.h" +#include +#include + +namespace arduino { + +class PluggableUSBModule { +public: + PluggableUSBModule(uint8_t numEps, uint8_t numIfs, unsigned int *epType) : + numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType) + { } + +protected: + virtual bool setup(USBSetup& setup) = 0; + virtual int getInterface(uint8_t* interfaceCount) = 0; + virtual int getDescriptor(USBSetup& setup) = 0; + virtual uint8_t getShortName(char *name) { name[0] = 'A'+pluggedInterface; return 1; } + + uint8_t pluggedInterface; + uint8_t pluggedEndpoint; + + const uint8_t numEndpoints; + const uint8_t numInterfaces; + const unsigned int *endpointType; + + PluggableUSBModule *next = NULL; + + friend class PluggableUSB_; +}; + +class PluggableUSB_ { +public: + PluggableUSB_(); + bool plug(PluggableUSBModule *node); + int getInterface(uint8_t* interfaceCount); + int getDescriptor(USBSetup& setup); + bool setup(USBSetup& setup); + void getShortName(char *iSerialNum); + +private: + uint8_t lastIf; + uint8_t lastEp; + PluggableUSBModule* rootNode; + uint8_t totalEP; +}; +} + +// core need to define +void* epBuffer(unsigned int n); // -> returns a pointer to the Nth element of the EP buffer structure + +// Replacement for global singleton. +// This function prevents static-initialization-order-fiasco +// https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use +arduino::PluggableUSB_& PluggableUSB(); + +#endif \ No newline at end of file diff --git a/api/api/Print.cpp b/api/api/Print.cpp new file mode 100644 index 00000000..603fc468 --- /dev/null +++ b/api/api/Print.cpp @@ -0,0 +1,388 @@ +/* + Print.cpp - Base class that provides print() and println() + Copyright (c) 2014 Arduino. 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 +*/ + +#include +#include +#include +#include + +#include "Print.h" + +using namespace arduino; + +// Public Methods ////////////////////////////////////////////////////////////// + +/* default implementation: may be overridden */ +size_t Print::write(const uint8_t *buffer, size_t size) +{ + size_t n = 0; + while (size--) { + if (write(*buffer++)) n++; + else break; + } + return n; +} + +size_t Print::print(const __FlashStringHelper *ifsh) +{ +#if defined(__AVR__) + PGM_P p = reinterpret_cast(ifsh); + size_t n = 0; + while (1) { + unsigned char c = pgm_read_byte(p++); + if (c == 0) break; + if (write(c)) n++; + else break; + } + return n; +#else + return print(reinterpret_cast(ifsh)); +#endif +} + +size_t Print::print(const String &s) +{ + return write(s.c_str(), s.length()); +} + +size_t Print::print(const char str[]) +{ + return write(str); +} + +size_t Print::print(char c) +{ + return write(c); +} + +size_t Print::print(unsigned char b, int base) +{ + return print(static_cast(b), base); +} + +size_t Print::print(int n, int base) +{ + return print(static_cast(n), base); +} + +size_t Print::print(unsigned int n, int base) +{ + return print(static_cast(n), base); +} + +size_t Print::print(long n, int base) +{ + if (base == 0) { + return write(n); + } else if (base == 10) { + if (n < 0) { + int t = print('-'); + n = -n; + return printNumber(n, 10) + t; + } + return printNumber(n, 10); + } else { + return printNumber(n, base); + } +} + +size_t Print::print(unsigned long n, int base) +{ + if (base == 0) return write(n); + else return printNumber(n, base); +} + +size_t Print::print(long long n, int base) +{ + if (base == 0) { + return write(n); + } else if (base == 10) { + if (n < 0) { + int t = print('-'); + n = -n; + return printULLNumber(n, 10) + t; + } + return printULLNumber(n, 10); + } else { + return printULLNumber(n, base); + } +} + +size_t Print::print(unsigned long long n, int base) +{ + if (base == 0) return write(n); + else return printULLNumber(n, base); +} + +size_t Print::print(double n, int digits) +{ + return printFloat(n, digits); +} + +size_t Print::println(const __FlashStringHelper *ifsh) +{ + size_t n = print(ifsh); + n += println(); + return n; +} + +size_t Print::print(const Printable& x) +{ + return x.printTo(*this); +} + +size_t Print::println(void) +{ + return write("\r\n"); +} + +size_t Print::println(const String &s) +{ + size_t n = print(s); + n += println(); + return n; +} + +size_t Print::println(const char c[]) +{ + size_t n = print(c); + n += println(); + return n; +} + +size_t Print::println(char c) +{ + size_t n = print(c); + n += println(); + return n; +} + +size_t Print::println(unsigned char b, int base) +{ + size_t n = print(b, base); + n += println(); + return n; +} + +size_t Print::println(int num, int base) +{ + size_t n = print(num, base); + n += println(); + return n; +} + +size_t Print::println(unsigned int num, int base) +{ + size_t n = print(num, base); + n += println(); + return n; +} + +size_t Print::println(long num, int base) +{ + size_t n = print(num, base); + n += println(); + return n; +} + +size_t Print::println(unsigned long num, int base) +{ + size_t n = print(num, base); + n += println(); + return n; +} + +size_t Print::println(long long num, int base) +{ + size_t n = print(num, base); + n += println(); + return n; +} + +size_t Print::println(unsigned long long num, int base) +{ + size_t n = print(num, base); + n += println(); + return n; +} + +size_t Print::println(double num, int digits) +{ + size_t n = print(num, digits); + n += println(); + return n; +} + +size_t Print::println(const Printable& x) +{ + size_t n = print(x); + n += println(); + return n; +} + +// Private Methods ///////////////////////////////////////////////////////////// + +size_t Print::printNumber(unsigned long n, uint8_t base) +{ + char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte. + char *str = &buf[sizeof(buf) - 1]; + + *str = '\0'; + + // prevent crash if called with base == 1 + if (base < 2) base = 10; + + do { + char c = n % base; + n /= base; + + *--str = c < 10 ? c + '0' : c + 'A' - 10; + } while(n); + + return write(str); +} + +// REFERENCE IMPLEMENTATION FOR ULL +// size_t Print::printULLNumber(unsigned long long n, uint8_t base) +// { + // // if limited to base 10 and 16 the bufsize can be smaller + // char buf[65]; + // char *str = &buf[64]; + + // *str = '\0'; + + // // prevent crash if called with base == 1 + // if (base < 2) base = 10; + + // do { + // unsigned long long t = n / base; + // char c = n - t * base; // faster than c = n%base; + // n = t; + // *--str = c < 10 ? c + '0' : c + 'A' - 10; + // } while(n); + + // return write(str); +// } + +// FAST IMPLEMENTATION FOR ULL +size_t Print::printULLNumber(unsigned long long n64, uint8_t base) +{ + // if limited to base 10 and 16 the bufsize can be 20 + char buf[64]; + uint8_t i = 0; + uint8_t innerLoops = 0; + + // Special case workaround https://github.com/arduino/ArduinoCore-API/issues/178 + if (n64 == 0) { + write('0'); + return 1; + } + + // prevent crash if called with base == 1 + if (base < 2) base = 10; + + // process chunks that fit in "16 bit math". + uint16_t top = 0xFFFF / base; + uint16_t th16 = 1; + while (th16 < top) + { + th16 *= base; + innerLoops++; + } + + while (n64 > th16) + { + // 64 bit math part + uint64_t q = n64 / th16; + uint16_t r = n64 - q*th16; + n64 = q; + + // 16 bit math loop to do remainder. (note buffer is filled reverse) + for (uint8_t j=0; j < innerLoops; j++) + { + uint16_t qq = r/base; + buf[i++] = r - qq*base; + r = qq; + } + } + + uint16_t n16 = n64; + while (n16 > 0) + { + uint16_t qq = n16/base; + buf[i++] = n16 - qq*base; + n16 = qq; + } + + size_t bytes = i; + for (; i > 0; i--) + write((char) (buf[i - 1] < 10 ? + '0' + buf[i - 1] : + 'A' + buf[i - 1] - 10)); + + return bytes; +} + +size_t Print::printFloat(double number, int digits) +{ + if (digits < 0) + digits = 2; + + size_t n = 0; + + if (isnan(number)) return print("nan"); + if (isinf(number)) return print("inf"); + if (number > 4294967040.0) return print ("ovf"); // constant determined empirically + if (number <-4294967040.0) return print ("ovf"); // constant determined empirically + + // Handle negative numbers + if (number < 0.0) + { + n += print('-'); + number = -number; + } + + // Round correctly so that print(1.999, 2) prints as "2.00" + double rounding = 0.5; + for (uint8_t i=0; i(number); + double remainder = number - static_cast(int_part); + n += print(int_part); + + // Print the decimal point, but only if there are digits beyond + if (digits > 0) { + n += print("."); + } + + // Extract digits from the remainder one at a time + while (digits-- > 0) + { + remainder *= 10.0; + unsigned int toPrint = static_cast(remainder); + n += print(toPrint); + remainder -= toPrint; + } + + return n; +} diff --git a/api/api/Print.h b/api/api/Print.h new file mode 100644 index 00000000..89e857ed --- /dev/null +++ b/api/api/Print.h @@ -0,0 +1,97 @@ +/* + Print.h - Base class that provides print() and println() + Copyright (c) 2016 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 +*/ + +#pragma once + +#include +#include // for size_t + +#include "String.h" +#include "Printable.h" + +#define DEC 10 +#define HEX 16 +#define OCT 8 +#define BIN 2 + +namespace arduino { + +class Print +{ + private: + int write_error; + size_t printNumber(unsigned long, uint8_t); + size_t printULLNumber(unsigned long long, uint8_t); + size_t printFloat(double, int); + protected: + void setWriteError(int err = 1) { write_error = err; } + public: + Print() : write_error(0) {} + + int getWriteError() { return write_error; } + void clearWriteError() { setWriteError(0); } + + virtual size_t write(uint8_t) = 0; + size_t write(const char *str) { + if (str == NULL) return 0; + return write(reinterpret_cast(str), strlen(str)); + } + virtual size_t write(const uint8_t *buffer, size_t size); + size_t write(const char *buffer, size_t size) { + return write(reinterpret_cast(buffer), size); + } + + // default to zero, meaning "a single write may block" + // should be overridden by subclasses with buffering + virtual int availableForWrite() { return 0; } + + size_t print(const __FlashStringHelper *); + size_t print(const String &); + size_t print(const char[]); + size_t print(char); + size_t print(unsigned char, int = DEC); + size_t print(int, int = DEC); + size_t print(unsigned int, int = DEC); + size_t print(long, int = DEC); + size_t print(unsigned long, int = DEC); + size_t print(long long, int = DEC); + size_t print(unsigned long long, int = DEC); + size_t print(double, int = 2); + size_t print(const Printable&); + + size_t println(const __FlashStringHelper *); + size_t println(const String &s); + size_t println(const char[]); + size_t println(char); + size_t println(unsigned char, int = DEC); + size_t println(int, int = DEC); + size_t println(unsigned int, int = DEC); + size_t println(long, int = DEC); + size_t println(unsigned long, int = DEC); + size_t println(long long, int = DEC); + size_t println(unsigned long long, int = DEC); + size_t println(double, int = 2); + size_t println(const Printable&); + size_t println(void); + + virtual void flush() { /* Empty implementation for backward compatibility */ } +}; + +} +using arduino::Print; \ No newline at end of file diff --git a/api/api/Printable.h b/api/api/Printable.h new file mode 100644 index 00000000..850c8d21 --- /dev/null +++ b/api/api/Printable.h @@ -0,0 +1,40 @@ +/* + Printable.h - Interface for classes that can be printed via Print + Copyright (c) 2016 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 +*/ + +#pragma once + +#include + +namespace arduino { + +class Print; + +/** The Printable class provides a way for new classes to allow themselves to be printed. + By deriving from Printable and implementing the printTo method, it will then be possible + for users to print out instances of this class by passing them into the usual + Print::print and Print::println methods. +*/ + +class Printable +{ + public: + virtual size_t printTo(Print& p) const = 0; +}; + +} \ No newline at end of file diff --git a/api/api/RingBuffer.h b/api/api/RingBuffer.h new file mode 100644 index 00000000..b1ad1cae --- /dev/null +++ b/api/api/RingBuffer.h @@ -0,0 +1,142 @@ +/* + RingBuffer.h - Ring buffer implementation + Copyright (c) 2014 Arduino. 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 +*/ + +#ifdef __cplusplus + +#ifndef _RING_BUFFER_ +#define _RING_BUFFER_ + +#include +#include + +namespace arduino { + +// Define constants and variables for buffering incoming serial data. We're +// using a ring buffer (I think), in which head is the index of the location +// to which to write the next incoming character and tail is the index of the +// location from which to read. +#define SERIAL_BUFFER_SIZE 64 + +template +class RingBufferN +{ + public: + uint8_t _aucBuffer[N] ; + volatile int _iHead ; + volatile int _iTail ; + volatile int _numElems; + + public: + RingBufferN( void ) ; + void store_char( uint8_t c ) ; + void clear(); + int read_char(); + int available(); + int availableForStore(); + int peek(); + bool isFull(); + + private: + int nextIndex(int index); + inline bool isEmpty() const { return (_numElems == 0); } +}; + +typedef RingBufferN RingBuffer; + + +template +RingBufferN::RingBufferN( void ) +{ + memset( _aucBuffer, 0, N ) ; + clear(); +} + +template +void RingBufferN::store_char( uint8_t c ) +{ + // if we should be storing the received character into the location + // just before the tail (meaning that the head would advance to the + // current location of the tail), we're about to overflow the buffer + // and so we don't write the character or advance the head. + if (!isFull()) + { + _aucBuffer[_iHead] = c ; + _iHead = nextIndex(_iHead); + _numElems = _numElems + 1; + } +} + +template +void RingBufferN::clear() +{ + _iHead = 0; + _iTail = 0; + _numElems = 0; +} + +template +int RingBufferN::read_char() +{ + if (isEmpty()) + return -1; + + uint8_t value = _aucBuffer[_iTail]; + _iTail = nextIndex(_iTail); + _numElems = _numElems - 1; + + return value; +} + +template +int RingBufferN::available() +{ + return _numElems; +} + +template +int RingBufferN::availableForStore() +{ + return (N - _numElems); +} + +template +int RingBufferN::peek() +{ + if (isEmpty()) + return -1; + + return _aucBuffer[_iTail]; +} + +template +int RingBufferN::nextIndex(int index) +{ + return static_cast(index + 1) % N; +} + +template +bool RingBufferN::isFull() +{ + return (_numElems == N); +} + +} + +#endif /* _RING_BUFFER_ */ +#endif /* __cplusplus */ diff --git a/api/api/Server.h b/api/api/Server.h new file mode 100644 index 00000000..83d0cd3b --- /dev/null +++ b/api/api/Server.h @@ -0,0 +1,31 @@ +/* + Server.h - Base class that provides Server + Copyright (c) 2011 Adrian McEwen. 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 +*/ + +#pragma once + +#include "Print.h" + +namespace arduino { + +class Server : public Print { + public: + virtual void begin() = 0; +}; + +} \ No newline at end of file diff --git a/api/api/Stream.cpp b/api/api/Stream.cpp new file mode 100644 index 00000000..f6f9bda6 --- /dev/null +++ b/api/api/Stream.cpp @@ -0,0 +1,321 @@ +/* + Stream.cpp - adds parsing methods to Stream class + Copyright (c) 2008 David A. Mellis. 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 + + Created July 2011 + parsing functions based on TextFinder library by Michael Margolis + + findMulti/findUntil routines written by Jim Leonard/Xuth + */ + +#include "Common.h" +#include "Stream.h" + +#define PARSE_TIMEOUT 1000 // default number of milli-seconds to wait + +using namespace arduino; + +// private method to read stream with timeout +int Stream::timedRead() +{ + int c; + _startMillis = millis(); + do { + c = read(); + if (c >= 0) return c; + } while(millis() - _startMillis < _timeout); + return -1; // -1 indicates timeout +} + +// private method to peek stream with timeout +int Stream::timedPeek() +{ + int c; + _startMillis = millis(); + do { + c = peek(); + if (c >= 0) return c; + } while(millis() - _startMillis < _timeout); + return -1; // -1 indicates timeout +} + +// returns peek of the next digit in the stream or -1 if timeout +// discards non-numeric characters +int Stream::peekNextDigit(LookaheadMode lookahead, bool detectDecimal) +{ + int c; + while (1) { + c = timedPeek(); + + if( c < 0 || + c == '-' || + (c >= '0' && c <= '9') || + (detectDecimal && c == '.')) return c; + + switch( lookahead ){ + case SKIP_NONE: return -1; // Fail code. + case SKIP_WHITESPACE: + switch( c ){ + case ' ': + case '\t': + case '\r': + case '\n': break; + default: return -1; // Fail code. + } + case SKIP_ALL: + break; + } + read(); // discard non-numeric + } +} + +// Public Methods +////////////////////////////////////////////////////////////// + +void Stream::setTimeout(unsigned long timeout) // sets the maximum number of milliseconds to wait +{ + _timeout = timeout; +} + + // find returns true if the target string is found +bool Stream::find(const char *target) +{ + return findUntil(target, strlen(target), NULL, 0); +} + +// reads data from the stream until the target string of given length is found +// returns true if target string is found, false if timed out +bool Stream::find(const char *target, size_t length) +{ + return findUntil(target, length, NULL, 0); +} + +// as find but search ends if the terminator string is found +bool Stream::findUntil(const char *target, const char *terminator) +{ + return findUntil(target, strlen(target), terminator, strlen(terminator)); +} + +// reads data from the stream until the target string of the given length is found +// search terminated if the terminator string is found +// returns true if target string is found, false if terminated or timed out +bool Stream::findUntil(const char *target, size_t targetLen, const char *terminator, size_t termLen) +{ + if (terminator == NULL) { + MultiTarget t[1] = {{target, targetLen, 0}}; + return findMulti(t, 1) == 0; + } else { + MultiTarget t[2] = {{target, targetLen, 0}, {terminator, termLen, 0}}; + return findMulti(t, 2) == 0; + } +} + +// returns the first valid (long) integer value from the current position. +// lookahead determines how parseInt looks ahead in the stream. +// See LookaheadMode enumeration at the top of the file. +// Lookahead is terminated by the first character that is not a valid part of an integer. +// Once parsing commences, 'ignore' will be skipped in the stream. +long Stream::parseInt(LookaheadMode lookahead, char ignore) +{ + bool isNegative = false; + long value = 0; + int c; + + c = peekNextDigit(lookahead, false); + // ignore non numeric leading characters + if(c < 0) + return 0; // zero returned if timeout + + do{ + if((char)c == ignore) + ; // ignore this character + else if(c == '-') + isNegative = true; + else if(c >= '0' && c <= '9') // is c a digit? + value = value * 10 + c - '0'; + read(); // consume the character we got with peek + c = timedPeek(); + } + while( (c >= '0' && c <= '9') || (char)c == ignore ); + + if(isNegative) + value = -value; + return value; +} + +// as parseInt but returns a floating point value +float Stream::parseFloat(LookaheadMode lookahead, char ignore) +{ + bool isNegative = false; + bool isFraction = false; + double value = 0.0; + int c; + double fraction = 1.0; + + c = peekNextDigit(lookahead, true); + // ignore non numeric leading characters + if(c < 0) + return 0; // zero returned if timeout + + do{ + if((char)c == ignore) + ; // ignore + else if(c == '-') + isNegative = true; + else if (c == '.') + isFraction = true; + else if(c >= '0' && c <= '9') { // is c a digit? + if(isFraction) { + fraction *= 0.1; + value = value + fraction * (c - '0'); + } else { + value = value * 10 + c - '0'; + } + } + read(); // consume the character we got with peek + c = timedPeek(); + } + while( (c >= '0' && c <= '9') || (c == '.' && !isFraction) || (char)c == ignore ); + + if(isNegative) + value = -value; + + return value; +} + +// read characters from stream into buffer +// terminates if length characters have been read, or timeout (see setTimeout) +// returns the number of characters placed in the buffer +// the buffer is NOT null terminated. +// +size_t Stream::readBytes(char *buffer, size_t length) +{ + size_t count = 0; + while (count < length) { + int c = timedRead(); + if (c < 0) break; + *buffer++ = (char)c; + count++; + } + return count; +} + + +// as readBytes with terminator character +// terminates if length characters have been read, timeout, or if the terminator character detected +// returns the number of characters placed in the buffer (0 means no valid data found) + +size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length) +{ + size_t index = 0; + while (index < length) { + int c = timedRead(); + if (c < 0 || (char)c == terminator) break; + *buffer++ = (char)c; + index++; + } + return index; // return number of characters, not including null terminator +} + +String Stream::readString() +{ + String ret; + int c = timedRead(); + while (c >= 0) + { + ret += (char)c; + c = timedRead(); + } + return ret; +} + +String Stream::readStringUntil(char terminator) +{ + String ret; + int c = timedRead(); + while (c >= 0 && (char)c != terminator) + { + ret += (char)c; + c = timedRead(); + } + return ret; +} + +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) { + if (t->len <= 0) + return t - targets; + } + + 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 ((char)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; + + int origIndex = t->index; + do { + --t->index; + // first check if current char works against the new current index + if ((char)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; +} diff --git a/api/api/Stream.h b/api/api/Stream.h new file mode 100644 index 00000000..10b42852 --- /dev/null +++ b/api/api/Stream.h @@ -0,0 +1,133 @@ +/* + Stream.h - base class for character-based streams. + Copyright (c) 2010 David A. Mellis. 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 + + parsing functions based on TextFinder library by Michael Margolis +*/ + +#pragma once + +#include +#include "Print.h" + +// compatibility macros for testing +/* +#define getInt() parseInt() +#define getInt(ignore) parseInt(ignore) +#define getFloat() parseFloat() +#define getFloat(ignore) parseFloat(ignore) +#define getString( pre_string, post_string, buffer, length) +readBytesBetween( pre_string, terminator, buffer, length) +*/ + +namespace arduino { + +// This enumeration provides the lookahead options for parseInt(), parseFloat() +// The rules set out here are used until either the first valid character is found +// or a time out occurs due to lack of input. +enum LookaheadMode{ + SKIP_ALL, // All invalid characters are ignored. + SKIP_NONE, // Nothing is skipped, and the stream is not touched unless the first waiting character is valid. + SKIP_WHITESPACE // Only tabs, spaces, line feeds & carriage returns are skipped. +}; + +#define NO_IGNORE_CHAR '\x01' // a char not found in a valid ASCII numeric field + +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 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; + + Stream() {_timeout=1000;} + +// 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(const char *target); // reads data from the stream until the target string is found + bool find(const uint8_t *target) { return find (reinterpret_cast(target)); } + // returns true if target string is found, false if timed out (see setTimeout) + + bool find(const char *target, size_t length); // reads data from the stream until the target string of given length is found + bool find(const uint8_t *target, size_t length) { return find (reinterpret_cast(target), length); } + // returns true if target string is found, false if timed out + + bool find(char target) { return find (&target, 1); } + + bool findUntil(const char *target, const char *terminator); // as find but search ends if the terminator string is found + bool findUntil(const uint8_t *target, const char *terminator) { return findUntil(reinterpret_cast(target), terminator); } + + bool findUntil(const char *target, size_t targetLen, const char *terminate, size_t termLen); // as above but search ends if the terminate string is found + bool findUntil(const uint8_t *target, size_t targetLen, const char *terminate, size_t termLen) {return findUntil(reinterpret_cast(target), targetLen, terminate, termLen); } + + long parseInt(LookaheadMode lookahead = SKIP_ALL, char ignore = NO_IGNORE_CHAR); + // returns the first valid (long) integer value from the current position. + // lookahead determines how parseInt looks ahead in the stream. + // See LookaheadMode enumeration at the top of the file. + // Lookahead is terminated by the first character that is not a valid part of an integer. + // Once parsing commences, 'ignore' will be skipped in the stream. + + float parseFloat(LookaheadMode lookahead = SKIP_ALL, char ignore = NO_IGNORE_CHAR); + // float version of parseInt + + size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer + size_t readBytes( uint8_t *buffer, size_t length) { return readBytes(reinterpret_cast(buffer), length); } + // terminates if length characters have been read or timeout (see setTimeout) + // returns the number of characters placed in the buffer (0 means no valid data found) + + size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character + size_t readBytesUntil( char terminator, uint8_t *buffer, size_t length) { return readBytesUntil(terminator, reinterpret_cast(buffer), length); } + // terminates if length characters have been read, timeout, or if the terminator character detected + // returns the number of characters placed in the buffer (0 means no valid data found) + + // Arduino String functions to be added here + String readString(); + String readStringUntil(char terminator); + + protected: + long parseInt(char ignore) { return parseInt(SKIP_ALL, ignore); } + float parseFloat(char ignore) { return parseFloat(SKIP_ALL, ignore); } + // These overload exists for compatibility with any class that has derived + // Stream and used parseFloat/Int with a custom ignore character. To keep + // the public API simple, these overload remains protected. + + struct MultiTarget { + const char *str; // string you're searching for + size_t len; // length of string you're searching for + size_t index; // index used by the search routine. + }; + + // This allows you to search for an arbitrary number of strings. + // Returns index of the target that is found first or -1 if timeout occurs. + int findMulti(struct MultiTarget *targets, int tCount); +}; + +#undef NO_IGNORE_CHAR + +} + +using arduino::Stream; \ No newline at end of file diff --git a/api/api/String.cpp b/api/api/String.cpp new file mode 100644 index 00000000..8b995cfa --- /dev/null +++ b/api/api/String.cpp @@ -0,0 +1,750 @@ +/* + String library for Wiring & Arduino + ...mostly rewritten by Paul Stoffregen... + Copyright (c) 2009-10 Hernando Barragan. All rights reserved. + Copyright 2011, Paul Stoffregen, paul@pjrc.com + + 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 +*/ + +#include "String.h" +#include "Common.h" +#include "itoa.h" +#include "deprecated-avr-comp/avr/dtostrf.h" + +#include + +namespace arduino { + +/*********************************************/ +/* Static Member Initialisation */ +/*********************************************/ + +size_t const String::FLT_MAX_DECIMAL_PLACES; +size_t const String::DBL_MAX_DECIMAL_PLACES; + +/*********************************************/ +/* Constructors */ +/*********************************************/ + +String::String(const char *cstr) +{ + init(); + if (cstr) copy(cstr, strlen(cstr)); +} + +String::String(const char *cstr, unsigned int length) +{ + init(); + if (cstr) copy(cstr, length); +} + +String::String(const String &value) +{ + init(); + *this = value; +} + +String::String(const __FlashStringHelper *pstr) +{ + init(); + *this = pstr; +} + +String::String(String &&rval) + : buffer(rval.buffer) + , capacity(rval.capacity) + , len(rval.len) +{ + rval.buffer = NULL; + rval.capacity = 0; + rval.len = 0; +} + +String::String(char c) +{ + init(); + char buf[2]; + buf[0] = c; + buf[1] = 0; + *this = buf; +} + +String::String(unsigned char value, unsigned char base) +{ + init(); + char buf[1 + 8 * sizeof(unsigned char)]; + utoa(value, buf, base); + *this = buf; +} + +String::String(int value, unsigned char base) +{ + init(); + char buf[2 + 8 * sizeof(int)]; + itoa(value, buf, base); + *this = buf; +} + +String::String(unsigned int value, unsigned char base) +{ + init(); + char buf[1 + 8 * sizeof(unsigned int)]; + utoa(value, buf, base); + *this = buf; +} + +String::String(long value, unsigned char base) +{ + init(); + char buf[2 + 8 * sizeof(long)]; + ltoa(value, buf, base); + *this = buf; +} + +String::String(unsigned long value, unsigned char base) +{ + init(); + char buf[1 + 8 * sizeof(unsigned long)]; + ultoa(value, buf, base); + *this = buf; +} + +String::String(float value, unsigned char decimalPlaces) +{ + static size_t const FLOAT_BUF_SIZE = FLT_MAX_10_EXP + FLT_MAX_DECIMAL_PLACES + 1 /* '-' */ + 1 /* '.' */ + 1 /* '\0' */; + init(); + char buf[FLOAT_BUF_SIZE]; + decimalPlaces = min(decimalPlaces, FLT_MAX_DECIMAL_PLACES); + *this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf); +} + +String::String(double value, unsigned char decimalPlaces) +{ + static size_t const DOUBLE_BUF_SIZE = DBL_MAX_10_EXP + DBL_MAX_DECIMAL_PLACES + 1 /* '-' */ + 1 /* '.' */ + 1 /* '\0' */; + init(); + char buf[DOUBLE_BUF_SIZE]; + decimalPlaces = min(decimalPlaces, DBL_MAX_DECIMAL_PLACES); + *this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf); +} + +String::~String() +{ + if (buffer) free(buffer); +} + +/*********************************************/ +/* Memory Management */ +/*********************************************/ + +inline void String::init(void) +{ + buffer = NULL; + capacity = 0; + len = 0; +} + +void String::invalidate(void) +{ + if (buffer) free(buffer); + buffer = NULL; + capacity = len = 0; +} + +bool String::reserve(unsigned int size) +{ + if (buffer && capacity >= size) return 1; + if (changeBuffer(size)) { + if (len == 0) buffer[0] = 0; + return true; + } + return false; +} + +bool String::changeBuffer(unsigned int maxStrLen) +{ + char *newbuffer = static_cast(realloc(buffer, maxStrLen + 1)); + if (newbuffer) { + buffer = newbuffer; + capacity = maxStrLen; + return true; + } + return false; +} + +/*********************************************/ +/* Copy and Move */ +/*********************************************/ + +String & String::copy(const char *cstr, unsigned int length) +{ + if (!reserve(length)) { + invalidate(); + return *this; + } + len = length; + memcpy(buffer, cstr, length); + buffer[len] = '\0'; + return *this; +} + +String & String::copy(const __FlashStringHelper *pstr, unsigned int length) +{ + if (!reserve(length)) { + invalidate(); + return *this; + } + len = length; + strcpy_P(buffer, reinterpret_cast(pstr)); + return *this; +} + +void String::move(String &rhs) +{ + if (this != &rhs) + { + free(buffer); + + buffer = rhs.buffer; + len = rhs.len; + capacity = rhs.capacity; + + rhs.buffer = NULL; + rhs.len = 0; + rhs.capacity = 0; + } +} + +String & String::operator = (const String &rhs) +{ + if (this == &rhs) return *this; + + if (rhs.buffer) copy(rhs.buffer, rhs.len); + else invalidate(); + + return *this; +} + +String & String::operator = (String &&rval) +{ + move(rval); + return *this; +} + +String & String::operator = (const char *cstr) +{ + if (cstr) copy(cstr, strlen(cstr)); + else invalidate(); + + return *this; +} + +String & String::operator = (const __FlashStringHelper *pstr) +{ + if (pstr) copy(pstr, strlen_P(reinterpret_cast(pstr))); + else invalidate(); + + return *this; +} + +/*********************************************/ +/* concat */ +/*********************************************/ + +bool String::concat(const String &s) +{ + return concat(s.buffer, s.len); +} + +bool String::concat(const char *cstr, unsigned int length) +{ + unsigned int newlen = len + length; + if (!cstr) return false; + if (length == 0) return true; + if (!reserve(newlen)) return false; + memcpy(buffer + len, cstr, length); + len = newlen; + buffer[len] = '\0'; + return true; +} + +bool String::concat(const char *cstr) +{ + if (!cstr) return false; + return concat(cstr, strlen(cstr)); +} + +bool String::concat(char c) +{ + return concat(&c, 1); +} + +bool String::concat(unsigned char num) +{ + char buf[1 + 3 * sizeof(unsigned char)]; + itoa(num, buf, 10); + return concat(buf); +} + +bool String::concat(int num) +{ + char buf[2 + 3 * sizeof(int)]; + itoa(num, buf, 10); + return concat(buf); +} + +bool String::concat(unsigned int num) +{ + char buf[1 + 3 * sizeof(unsigned int)]; + utoa(num, buf, 10); + return concat(buf); +} + +bool String::concat(long num) +{ + char buf[2 + 3 * sizeof(long)]; + ltoa(num, buf, 10); + return concat(buf); +} + +bool String::concat(unsigned long num) +{ + char buf[1 + 3 * sizeof(unsigned long)]; + ultoa(num, buf, 10); + return concat(buf); +} + +bool String::concat(float num) +{ + char buf[20]; + char* string = dtostrf(num, 4, 2, buf); + return concat(string); +} + +bool String::concat(double num) +{ + char buf[20]; + char* string = dtostrf(num, 4, 2, buf); + return concat(string); +} + +bool String::concat(const __FlashStringHelper * str) +{ + if (!str) return false; + int length = strlen_P(reinterpret_cast(str)); + if (length == 0) return true; + unsigned int newlen = len + length; + if (!reserve(newlen)) return false; + strcpy_P(buffer + len, reinterpret_cast(str)); + len = newlen; + return true; +} + +/*********************************************/ +/* Concatenate */ +/*********************************************/ + +StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(rhs.buffer, rhs.len)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr) +{ + StringSumHelper &a = const_cast(lhs); + if (!cstr || !a.concat(cstr)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, char c) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(c)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, int num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, long num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, float num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, double num) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(num)) a.invalidate(); + return a; +} + +StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs) +{ + StringSumHelper &a = const_cast(lhs); + if (!a.concat(rhs)) a.invalidate(); + return a; +} + +/*********************************************/ +/* Comparison */ +/*********************************************/ + +int String::compareTo(const String &s) const +{ + if (!buffer || !s.buffer) { + if (s.buffer && s.len > 0) return 0 - *(reinterpret_cast(s.buffer)); + if (buffer && len > 0) return *(reinterpret_cast(buffer)); + return 0; + } + return strcmp(buffer, s.buffer); +} + +int String::compareTo(const char *cstr) const +{ + if (!buffer || !cstr) { + if (cstr && *cstr) return 0 - *(const_cast(reinterpret_cast(cstr))); + if (buffer && len > 0) return *(reinterpret_cast(buffer)); + return 0; + } + return strcmp(buffer, cstr); +} + +bool String::equals(const String &s2) const +{ + return (len == s2.len && compareTo(s2) == 0); +} + +bool String::equals(const char *cstr) const +{ + if (len == 0) return (cstr == NULL || *cstr == 0); + if (cstr == NULL) return buffer[0] == 0; + return strcmp(buffer, cstr) == 0; +} + +bool String::equalsIgnoreCase( const String &s2 ) const +{ + if (this == &s2) return true; + if (len != s2.len) return false; + if (len == 0) return true; + const char *p1 = buffer; + const char *p2 = s2.buffer; + while (*p1) { + if (tolower(*p1++) != tolower(*p2++)) return false; + } + return true; +} + +bool String::startsWith( const String &s2 ) const +{ + if (len < s2.len) return false; + return startsWith(s2, 0); +} + +bool String::startsWith( const String &s2, unsigned int offset ) const +{ + if (offset > len - s2.len || !buffer || !s2.buffer) return false; + return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0; +} + +bool String::endsWith( const String &s2 ) const +{ + if ( len < s2.len || !buffer || !s2.buffer) return false; + return strcmp(&buffer[len - s2.len], s2.buffer) == 0; +} + +/*********************************************/ +/* Character Access */ +/*********************************************/ + +char String::charAt(unsigned int loc) const +{ + return operator[](loc); +} + +void String::setCharAt(unsigned int loc, char c) +{ + if (loc < len) buffer[loc] = c; +} + +char & String::operator[](unsigned int index) +{ + static char dummy_writable_char; + if (index >= len || !buffer) { + dummy_writable_char = 0; + return dummy_writable_char; + } + return buffer[index]; +} + +char String::operator[]( unsigned int index ) const +{ + if (index >= len || !buffer) return 0; + return buffer[index]; +} + +void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const +{ + if (!bufsize || !buf) return; + if (index >= len) { + buf[0] = 0; + return; + } + unsigned int n = bufsize - 1; + if (n > len - index) n = len - index; + strncpy(reinterpret_cast(buf), buffer + index, n); + buf[n] = 0; +} + +/*********************************************/ +/* Search */ +/*********************************************/ + +int String::indexOf(char c) const +{ + return indexOf(c, 0); +} + +int String::indexOf( char ch, unsigned int fromIndex ) const +{ + if (fromIndex >= len) return -1; + const char* temp = strchr(buffer + fromIndex, ch); + if (temp == NULL) return -1; + return temp - buffer; +} + +int String::indexOf(const String &s2) const +{ + return indexOf(s2, 0); +} + +int String::indexOf(const String &s2, unsigned int fromIndex) const +{ + if (fromIndex >= len) return -1; + const char *found = strstr(buffer + fromIndex, s2.buffer); + if (found == NULL) return -1; + return found - buffer; +} + +int String::lastIndexOf( char theChar ) const +{ + return lastIndexOf(theChar, len - 1); +} + +int String::lastIndexOf(char ch, unsigned int fromIndex) const +{ + if (fromIndex >= len) return -1; + char tempchar = buffer[fromIndex + 1]; + buffer[fromIndex + 1] = '\0'; + char* temp = strrchr( buffer, ch ); + buffer[fromIndex + 1] = tempchar; + if (temp == NULL) return -1; + return temp - buffer; +} + +int String::lastIndexOf(const String &s2) const +{ + return lastIndexOf(s2, len - s2.len); +} + +int String::lastIndexOf(const String &s2, unsigned int fromIndex) const +{ + if (s2.len == 0 || len == 0 || s2.len > len) return -1; + if (fromIndex >= len) fromIndex = len - 1; + int found = -1; + for (char *p = buffer; p <= buffer + fromIndex; p++) { + p = strstr(p, s2.buffer); + if (!p) break; + if (static_cast(p - buffer) <= fromIndex) found = p - buffer; + } + return found; +} + +String String::substring(unsigned int left, unsigned int right) const +{ + if (left > right) { + unsigned int temp = right; + right = left; + left = temp; + } + String out; + if (left >= len) return out; + if (right > len) right = len; + out.copy(buffer + left, right - left); + return out; +} + +/*********************************************/ +/* Modification */ +/*********************************************/ + +void String::replace(char find, char replace) +{ + if (!buffer) return; + for (char *p = buffer; *p; p++) { + if (*p == find) *p = replace; + } +} + +void String::replace(const String& find, const String& replace) +{ + if (len == 0 || find.len == 0) return; + int diff = replace.len - find.len; + char *readFrom = buffer; + char *foundAt; + if (diff == 0) { + while ((foundAt = strstr(readFrom, find.buffer)) != NULL) { + memcpy(foundAt, replace.buffer, replace.len); + readFrom = foundAt + replace.len; + } + } else if (diff < 0) { + unsigned int size = len; // compute size needed for result + diff = 0 - diff; + while ((foundAt = strstr(readFrom, find.buffer)) != NULL) { + readFrom = foundAt + find.len; + size -= diff; + } + if (size == len) return; + int index = len - 1; + while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) { + readFrom = buffer + index + find.len; + memmove(readFrom - diff, readFrom, len - (readFrom - buffer)); + len -= diff; + buffer[len] = 0; + memcpy(buffer + index, replace.buffer, replace.len); + index--; + } + } else { + unsigned int size = len; // compute size needed for result + while ((foundAt = strstr(readFrom, find.buffer)) != NULL) { + readFrom = foundAt + find.len; + size += diff; + } + if (size == len) return; + if (size > capacity && !changeBuffer(size)) return; // XXX: tell user! + int index = len - 1; + while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) { + readFrom = buffer + index + find.len; + memmove(readFrom + diff, readFrom, len - (readFrom - buffer)); + len += diff; + buffer[len] = 0; + memcpy(buffer + index, replace.buffer, replace.len); + index--; + } + } +} + +void String::remove(unsigned int index){ + // Pass the biggest integer as the count. The remove method + // below will take care of truncating it at the end of the + // string. + remove(index, static_cast(-1)); +} + +void String::remove(unsigned int index, unsigned int count){ + if (index >= len) { return; } + if (count <= 0) { return; } + if (count > len - index) { count = len - index; } + char *writeTo = buffer + index; + len = len - count; + memmove(writeTo, buffer + index + count,len - index); + buffer[len] = 0; +} + +void String::toLowerCase(void) +{ + if (!buffer) return; + for (char *p = buffer; *p; p++) { + *p = tolower(*p); + } +} + +void String::toUpperCase(void) +{ + if (!buffer) return; + for (char *p = buffer; *p; p++) { + *p = toupper(*p); + } +} + +void String::trim(void) +{ + if (!buffer || len == 0) return; + char *begin = buffer; + while (isspace(*begin)) begin++; + char *end = buffer + len - 1; + while (isspace(*end) && end >= begin) end--; + len = end + 1 - begin; + if (begin > buffer) memmove(buffer, begin, len); + buffer[len] = 0; +} + +/*********************************************/ +/* Parsing / Conversion */ +/*********************************************/ + +long String::toInt(void) const +{ + if (buffer) return atol(buffer); + return 0; +} + +float String::toFloat(void) const +{ + return float(toDouble()); +} + +double String::toDouble(void) const +{ + if (buffer) return atof(buffer); + return 0; +} + +} // namespace arduino diff --git a/api/api/String.h b/api/api/String.h new file mode 100644 index 00000000..0bafd35a --- /dev/null +++ b/api/api/String.h @@ -0,0 +1,255 @@ +/* + String library for Wiring & Arduino + ...mostly rewritten by Paul Stoffregen... + Copyright (c) 2009-10 Hernando Barragan. All right reserved. + Copyright 2011, Paul Stoffregen, paul@pjrc.com + + 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 +*/ + +#ifdef __cplusplus + +#ifndef __ARDUINO_STRINGS__ +#define __ARDUINO_STRINGS__ + +#include +#include +#include +#if defined(__AVR__) +#include "avr/pgmspace.h" +#else +#include "deprecated-avr-comp/avr/pgmspace.h" +#endif + +namespace arduino { + +// When compiling programs with this class, the following gcc parameters +// dramatically increase performance and memory (RAM) efficiency, typically +// with little or no increase in code size. +// -felide-constructors +// -std=c++0x + +class __FlashStringHelper; +#define F(string_literal) (reinterpret_cast(PSTR(string_literal))) + +// An inherited class for holding the result of a concatenation. These +// result objects are assumed to be writable by subsequent concatenations. +class StringSumHelper; + +// The string class +class String +{ + friend class StringSumHelper; + // use a function pointer to allow for "if (s)" without the + // complications of an operator bool(). for more information, see: + // http://www.artima.com/cppsource/safebool.html + typedef void (String::*StringIfHelperType)() const; + void StringIfHelper() const {} + + static size_t const FLT_MAX_DECIMAL_PLACES = 10; + static size_t const DBL_MAX_DECIMAL_PLACES = FLT_MAX_DECIMAL_PLACES; + +public: + // constructors + // creates a copy of the initial value. + // if the initial value is null or invalid, or if memory allocation + // fails, the string will be marked as invalid (i.e. "if (s)" will + // be false). + String(const char *cstr = ""); + String(const char *cstr, unsigned int length); + String(const uint8_t *cstr, unsigned int length) : String((const char*)cstr, length) {} + String(const String &str); + String(const __FlashStringHelper *str); + String(String &&rval); + explicit String(char c); + explicit String(unsigned char, unsigned char base=10); + explicit String(int, unsigned char base=10); + explicit String(unsigned int, unsigned char base=10); + explicit String(long, unsigned char base=10); + explicit String(unsigned long, unsigned char base=10); + explicit String(float, unsigned char decimalPlaces=2); + explicit String(double, unsigned char decimalPlaces=2); + ~String(void); + + // memory management + // return true on success, false on failure (in which case, the string + // is left unchanged). reserve(0), if successful, will validate an + // invalid string (i.e., "if (s)" will be true afterwards) + bool reserve(unsigned int size); + inline unsigned int length(void) const {return len;} + inline bool isEmpty(void) const { return length() == 0; } + + // creates a copy of the assigned value. if the value is null or + // invalid, or if the memory allocation fails, the string will be + // marked as invalid ("if (s)" will be false). + String & operator = (const String &rhs); + String & operator = (const char *cstr); + String & operator = (const __FlashStringHelper *str); + String & operator = (String &&rval); + + // concatenate (works w/ built-in types) + + // returns true on success, false on failure (in which case, the string + // is left unchanged). if the argument is null or invalid, the + // concatenation is considered unsuccessful. + bool concat(const String &str); + bool concat(const char *cstr); + bool concat(const char *cstr, unsigned int length); + bool concat(const uint8_t *cstr, unsigned int length) {return concat((const char*)cstr, length);} + bool concat(char c); + bool concat(unsigned char num); + bool concat(int num); + bool concat(unsigned int num); + bool concat(long num); + bool concat(unsigned long num); + bool concat(float num); + bool concat(double num); + bool concat(const __FlashStringHelper * str); + + // if there's not enough memory for the concatenated value, the string + // will be left unchanged (but this isn't signalled in any way) + String & operator += (const String &rhs) {concat(rhs); return (*this);} + String & operator += (const char *cstr) {concat(cstr); return (*this);} + String & operator += (char c) {concat(c); return (*this);} + String & operator += (unsigned char num) {concat(num); return (*this);} + String & operator += (int num) {concat(num); return (*this);} + String & operator += (unsigned int num) {concat(num); return (*this);} + String & operator += (long num) {concat(num); return (*this);} + String & operator += (unsigned long num) {concat(num); return (*this);} + String & operator += (float num) {concat(num); return (*this);} + String & operator += (double num) {concat(num); return (*this);} + String & operator += (const __FlashStringHelper *str){concat(str); return (*this);} + + friend StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs); + friend StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr); + friend StringSumHelper & operator + (const StringSumHelper &lhs, char c); + friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, int num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, long num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, float num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, double num); + friend StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs); + + // comparison (only works w/ Strings and "strings") + operator StringIfHelperType() const { return buffer ? &String::StringIfHelper : 0; } + int compareTo(const String &s) const; + int compareTo(const char *cstr) const; + bool equals(const String &s) const; + bool equals(const char *cstr) const; + + friend bool operator == (const String &a, const String &b) { return a.equals(b); } + friend bool operator == (const String &a, const char *b) { return a.equals(b); } + friend bool operator == (const char *a, const String &b) { return b == a; } + friend bool operator < (const String &a, const String &b) { return a.compareTo(b) < 0; } + friend bool operator < (const String &a, const char *b) { return a.compareTo(b) < 0; } + friend bool operator < (const char *a, const String &b) { return b.compareTo(a) > 0; } + + friend bool operator != (const String &a, const String &b) { return !(a == b); } + friend bool operator != (const String &a, const char *b) { return !(a == b); } + friend bool operator != (const char *a, const String &b) { return !(a == b); } + friend bool operator > (const String &a, const String &b) { return b < a; } + friend bool operator > (const String &a, const char *b) { return b < a; } + friend bool operator > (const char *a, const String &b) { return b < a; } + friend bool operator <= (const String &a, const String &b) { return !(b < a); } + friend bool operator <= (const String &a, const char *b) { return !(b < a); } + friend bool operator <= (const char *a, const String &b) { return !(b < a); } + friend bool operator >= (const String &a, const String &b) { return !(a < b); } + friend bool operator >= (const String &a, const char *b) { return !(a < b); } + friend bool operator >= (const char *a, const String &b) { return !(a < b); } + + bool equalsIgnoreCase(const String &s) const; + bool startsWith( const String &prefix) const; + bool startsWith(const String &prefix, unsigned int offset) const; + bool endsWith(const String &suffix) const; + + // character access + char charAt(unsigned int index) const; + void setCharAt(unsigned int index, char c); + char operator [] (unsigned int index) const; + 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; } + 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; + int indexOf( char ch, unsigned int fromIndex ) const; + int indexOf( const String &str ) const; + int indexOf( const String &str, unsigned int fromIndex ) const; + int lastIndexOf( char ch ) const; + int lastIndexOf( char ch, unsigned int fromIndex ) const; + int lastIndexOf( const String &str ) const; + int lastIndexOf( const String &str, unsigned int fromIndex ) const; + String substring( unsigned int beginIndex ) const { return substring(beginIndex, len); }; + String substring( unsigned int beginIndex, unsigned int endIndex ) const; + + // modification + void replace(char find, char replace); + void replace(const String& find, const String& replace); + void remove(unsigned int index); + void remove(unsigned int index, unsigned int count); + void toLowerCase(void); + void toUpperCase(void); + void trim(void); + + // parsing/conversion + long toInt(void) const; + float toFloat(void) const; + double toDouble(void) const; + +protected: + char *buffer; // the actual char array + unsigned int capacity; // the array length minus one (for the '\0') + unsigned int len; // the String length (not counting the '\0') +protected: + void init(void); + void invalidate(void); + bool changeBuffer(unsigned int maxStrLen); + + // copy and move + String & copy(const char *cstr, unsigned int length); + String & copy(const __FlashStringHelper *pstr, unsigned int length); + void move(String &rhs); +}; + +class StringSumHelper : public String +{ +public: + StringSumHelper(const String &s) : String(s) {} + StringSumHelper(const char *p) : String(p) {} + StringSumHelper(char c) : String(c) {} + StringSumHelper(unsigned char num) : String(num) {} + StringSumHelper(int num) : String(num) {} + StringSumHelper(unsigned int num) : String(num) {} + StringSumHelper(long num) : String(num) {} + StringSumHelper(unsigned long num) : String(num) {} + StringSumHelper(float num) : String(num) {} + StringSumHelper(double num) : String(num) {} +}; + +} // namespace arduino + +using arduino::__FlashStringHelper; +using arduino::String; + +#endif // __cplusplus +#endif // __ARDUINO_STRINGS__ diff --git a/api/api/USBAPI.h b/api/api/USBAPI.h new file mode 100644 index 00000000..ba5e87ce --- /dev/null +++ b/api/api/USBAPI.h @@ -0,0 +1,64 @@ +/* + USBAPI.h + Copyright (c) 2005-2014 Arduino. 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 +*/ + +#ifndef __USBAPI__ +#define __USBAPI__ + +#include + +namespace arduino { +//================================================================================ +//================================================================================ +// Low level API + +typedef struct __attribute__((packed)) +{ + union { + uint8_t bmRequestType; + struct { + uint8_t direction : 5; + uint8_t type : 2; + uint8_t transferDirection : 1; + }; + }; + uint8_t bRequest; + uint8_t wValueL; + uint8_t wValueH; + uint16_t wIndex; + uint16_t wLength; +} USBSetup; + +} + +//================================================================================ +// USB APIs (C scope) +//================================================================================ + +int USB_SendControl(uint8_t flags, const void* d, int len); +int USB_RecvControl(void* d, int len); +int USB_RecvControlLong(void* d, int len); + +uint8_t USB_Available(uint8_t ep); +uint8_t USB_SendSpace(uint8_t ep); +int USB_Send(uint8_t ep, const void* data, int len); // blocking +int USB_Recv(uint8_t ep, void* data, int len); // non-blocking +int USB_Recv(uint8_t ep); // non-blocking +void USB_Flush(uint8_t ep); + +#endif \ No newline at end of file diff --git a/api/api/Udp.h b/api/api/Udp.h new file mode 100644 index 00000000..20117a67 --- /dev/null +++ b/api/api/Udp.h @@ -0,0 +1,92 @@ +/* + * Udp.cpp: Library to send/receive UDP packets. + * + * NOTE: UDP is fast, but has some important limitations (thanks to Warren Gray for mentioning these) + * 1) UDP does not guarantee the order in which assembled UDP packets are received. This + * might not happen often in practice, but in larger network topologies, a UDP + * packet can be received out of sequence. + * 2) UDP does not guard against lost packets - so packets *can* disappear without the sender being + * aware of it. Again, this may not be a concern in practice on small local networks. + * For more information, see http://www.cafeaulait.org/course/week12/35.html + * + * MIT License: + * Copyright (c) 2008 Bjoern Hartmann + * 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. + * + * bjoern@cs.stanford.edu 12/30/2008 + */ + +#pragma once + +#include "Stream.h" +#include "IPAddress.h" + +namespace arduino { + +class UDP : public Stream { + +public: + virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use + virtual uint8_t beginMulticast(IPAddress, uint16_t) { return 0; } // initialize, start listening on specified multicast IP address and port. Returns 1 if successful, 0 on failure + virtual void stop() =0; // Finish with the UDP socket + + // Sending UDP packets + + // Start building up a packet to send to the remote host specified in ip and port + // Returns 1 if successful, 0 if there was a problem with the supplied IP address or port + virtual int beginPacket(IPAddress ip, uint16_t port) =0; + // Start building up a packet to send to the remote host specified in host and port + // Returns 1 if successful, 0 if there was a problem resolving the hostname or port + virtual int beginPacket(const char *host, uint16_t port) =0; + // Finish off this packet and send it + // Returns 1 if the packet was sent successfully, 0 if there was an error + virtual int endPacket() =0; + // Write a single byte into the packet + virtual size_t write(uint8_t) =0; + // Write size bytes from buffer into the packet + virtual size_t write(const uint8_t *buffer, size_t size) =0; + + // Start processing the next available incoming packet + // Returns the size of the packet in bytes, or 0 if no packets are available + virtual int parsePacket() =0; + // Number of bytes remaining in the current packet + virtual int available() =0; + // Read a single byte from the current packet + virtual int read() =0; + // Read up to len bytes from the current packet and place them into buffer + // Returns the number of bytes read, or 0 if none are available + virtual int read(unsigned char* buffer, size_t len) =0; + // Read up to len characters from the current packet and place them into buffer + // Returns the number of characters read, or 0 if none are available + virtual int read(char* buffer, size_t len) =0; + // Return the next byte from the current packet without moving on to the next byte + virtual int peek() =0; + virtual void flush() =0; // Finish reading the current packet + + // Return the IP address of the host who sent the current incoming packet + virtual IPAddress remoteIP() =0; + // Return the port of the host who sent the current incoming packet + virtual uint16_t remotePort() =0; +protected: + uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); }; +}; + +} + +using arduino::UDP; \ No newline at end of file diff --git a/api/api/WCharacter.h b/api/api/WCharacter.h new file mode 100644 index 00000000..d0508424 --- /dev/null +++ b/api/api/WCharacter.h @@ -0,0 +1,171 @@ +/* + WCharacter.h - Character utility functions for Wiring & Arduino + Copyright (c) 2010 Hernando Barragan. 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 + */ + +#ifndef Character_h +#define Character_h + +#include + +namespace arduino { + +// WCharacter.h prototypes +inline bool isAlphaNumeric(int c) __attribute__((always_inline)); +inline bool isAlpha(int c) __attribute__((always_inline)); +inline bool isAscii(int c) __attribute__((always_inline)); +inline bool isWhitespace(int c) __attribute__((always_inline)); +inline bool isControl(int c) __attribute__((always_inline)); +inline bool isDigit(int c) __attribute__((always_inline)); +inline bool isGraph(int c) __attribute__((always_inline)); +inline bool isLowerCase(int c) __attribute__((always_inline)); +inline bool isPrintable(int c) __attribute__((always_inline)); +inline bool isPunct(int c) __attribute__((always_inline)); +inline bool isSpace(int c) __attribute__((always_inline)); +inline bool isUpperCase(int c) __attribute__((always_inline)); +inline bool isHexadecimalDigit(int c) __attribute__((always_inline)); +inline int toAscii(int c) __attribute__((always_inline)); +inline int toLowerCase(int c) __attribute__((always_inline)); +inline int toUpperCase(int c)__attribute__((always_inline)); + + +// Checks for an alphanumeric character. +// It is equivalent to (isalpha(c) || isdigit(c)). +inline bool isAlphaNumeric(int c) +{ + return ( isalnum(c) == 0 ? false : true); +} + + +// Checks for an alphabetic character. +// It is equivalent to (isupper(c) || islower(c)). +inline bool isAlpha(int c) +{ + return ( isalpha(c) == 0 ? false : true); +} + + +// Checks whether c is a 7-bit unsigned char value +// that fits into the ASCII character set. +inline bool isAscii(int c) +{ + return ((c & ~0x7f) != 0 ? false : true ); +} + + +// Checks for a blank character, that is, a space or a tab. +inline bool isWhitespace(int c) +{ + return ( c == '\t' || c == ' '); +} + + +// Checks for a control character. +inline bool isControl(int c) +{ + return ( iscntrl (c) == 0 ? false : true); +} + + +// Checks for a digit (0 through 9). +inline bool isDigit(int c) +{ + return ( isdigit (c) == 0 ? false : true); +} + + +// Checks for any printable character except space. +inline bool isGraph(int c) +{ + return ( isgraph (c) == 0 ? false : true); +} + + +// Checks for a lower-case character. +inline bool isLowerCase(int c) +{ + return ( c >= 'a' && c <= 'z' ); +} + + +// Checks for any printable character including space. +inline bool isPrintable(int c) +{ + return ( isprint (c) == 0 ? false : true); +} + + +// Checks for any printable character which is not a space +// or an alphanumeric character. +inline bool isPunct(int c) +{ + return ( isPrintable(c) && !isSpace(c) && !isAlphaNumeric(c) ); +} + + +// Checks for white-space characters. For the avr-libc library, +// these are: space, formfeed ('\f'), newline ('\n'), carriage +// return ('\r'), horizontal tab ('\t'), and vertical tab ('\v'). +inline bool isSpace(int c) +{ + return ( isspace (c) == 0 ? false : true); +} + + +// Checks for an uppercase letter. +inline bool isUpperCase(int c) +{ + return ( isupper (c) == 0 ? false : true); +} + + +// Checks for a hexadecimal digits, i.e. one of 0 1 2 3 4 5 6 7 +// 8 9 a b c d e f A B C D E F. +inline bool isHexadecimalDigit(int c) +{ + return ( isxdigit (c) == 0 ? false : true); +} + + +// Converts c to a 7-bit unsigned char value that fits into the +// ASCII character set, by clearing the high-order bits. +inline int toAscii(int c) +{ + return (c & 0x7f); +} + + +// Warning: +// Many people will be unhappy if you use this function. +// This function will convert accented letters into random +// characters. + +// Converts the letter c to lower case, if possible. +inline int toLowerCase(int c) +{ + return tolower (c); +} + + +// Converts the letter c to upper case, if possible. +inline int toUpperCase(int c) +{ + return toupper (c); +} + +} +#endif \ No newline at end of file diff --git a/api/api/deprecated-avr-comp/avr/dtostrf.c.impl b/api/api/deprecated-avr-comp/avr/dtostrf.c.impl new file mode 100644 index 00000000..f410886c --- /dev/null +++ b/api/api/deprecated-avr-comp/avr/dtostrf.c.impl @@ -0,0 +1,40 @@ +/* + dtostrf - Emulation for dtostrf function from avr-libc + Copyright (c) 2016 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 + 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 +*/ + +// This is a default implementation for dtostrf function. +// This file should be used if the standard lib doesn't provide an +// implementation of dtostrf. + +// Create a file called "dtostrf.c" with the following include: +// #include "api/deprecated-avr-comp/avr/dtostrf.c.impl" + +#include + +char *dtostrf (double val, signed char width, unsigned char prec, char *sout) { + asm(".global _printf_float"); + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + char fmt[20]; + sprintf(fmt, "%%%d.%df", width, prec); + sprintf(sout, fmt, val); + return sout; +#pragma GCC diagnostic pop +} + diff --git a/api/api/deprecated-avr-comp/avr/dtostrf.h b/api/api/deprecated-avr-comp/avr/dtostrf.h new file mode 100644 index 00000000..2d287ca1 --- /dev/null +++ b/api/api/deprecated-avr-comp/avr/dtostrf.h @@ -0,0 +1,34 @@ +/* + dtostrf - Emulation for dtostrf function from avr-libc + 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 + 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 +*/ + +#pragma once + +#if !defined(ARDUINO_ARCH_AVR) + +#ifdef __cplusplus +extern "C" { +#endif + +char *dtostrf(double val, signed char width, unsigned char prec, char *sout); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/api/api/deprecated-avr-comp/avr/interrupt.h b/api/api/deprecated-avr-comp/avr/interrupt.h new file mode 100644 index 00000000..a2873cf9 --- /dev/null +++ b/api/api/deprecated-avr-comp/avr/interrupt.h @@ -0,0 +1,23 @@ +/* + 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 + 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 +*/ + +/* + Empty file. + This file is here to allow compatibility with sketches (made for AVR) + that include +*/ diff --git a/api/api/deprecated-avr-comp/avr/pgmspace.h b/api/api/deprecated-avr-comp/avr/pgmspace.h new file mode 100644 index 00000000..a80e4a51 --- /dev/null +++ b/api/api/deprecated-avr-comp/avr/pgmspace.h @@ -0,0 +1,124 @@ +/* + pgmspace.h - Definitions for compatibility with AVR pgmspace macros + + Copyright (c) 2015 Arduino LLC + + Based on work of Paul Stoffregen on Teensy 3 (http://pjrc.com) + + 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_ +#define __PGMSPACE_H_ 1 + +#include + +#define PROGMEM +#define __ATTR_PROGMEM__ +#define PGM_P const char * +#define PGM_VOID_P const void * +#define PSTR(str) (str) + +#define _SFR_BYTE(n) (n) + +typedef void prog_void; +typedef char prog_char; +typedef unsigned char prog_uchar; +typedef int8_t prog_int8_t; +typedef uint8_t prog_uint8_t; +typedef int16_t prog_int16_t; +typedef uint16_t prog_uint16_t; +typedef int32_t prog_int32_t; +typedef uint32_t prog_uint32_t; +typedef int64_t prog_int64_t; +typedef uint64_t prog_uint64_t; + +typedef const void* int_farptr_t; +typedef const void* uint_farptr_t; + +#define memchr_P(s, c, n) memchr((s), (c), (n)) +#define memcmp_P(s1, s2, n) memcmp((s1), (s2), (n)) +#define memccpy_P(dest, src, c, n) memccpy((dest), (src), (c), (n)) +#define memcpy_P(dest, src, n) memcpy((dest), (src), (n)) +#define memmem_P(haystack, haystacklen, needle, needlelen) memmem((haystack), (haystacklen), (needle), (needlelen)) +#define memrchr_P(s, c, n) memrchr((s), (c), (n)) +#define strcat_P(dest, src) strcat((dest), (src)) +#define strchr_P(s, c) strchr((s), (c)) +#define strchrnul_P(s, c) strchrnul((s), (c)) +#define strcmp_P(a, b) strcmp((a), (b)) +#define strcpy_P(dest, src) strcpy((dest), (src)) +#define strcasecmp_P(s1, s2) strcasecmp((s1), (s2)) +#define strcasestr_P(haystack, needle) strcasestr((haystack), (needle)) +#define strcspn_P(s, accept) strcspn((s), (accept)) +#define strlcat_P(s1, s2, n) strlcat((s1), (s2), (n)) +#define strlcpy_P(s1, s2, n) strlcpy((s1), (s2), (n)) +#define strlen_P(a) strlen((a)) +#define strnlen_P(s, n) strnlen((s), (n)) +#define strncmp_P(s1, s2, n) strncmp((s1), (s2), (n)) +#define strncasecmp_P(s1, s2, n) strncasecmp((s1), (s2), (n)) +#define strncat_P(s1, s2, n) strncat((s1), (s2), (n)) +#define strncpy_P(s1, s2, n) strncpy((s1), (s2), (n)) +#define strpbrk_P(s, accept) strpbrk((s), (accept)) +#define strrchr_P(s, c) strrchr((s), (c)) +#define strsep_P(sp, delim) strsep((sp), (delim)) +#define strspn_P(s, accept) strspn((s), (accept)) +#define strstr_P(a, b) strstr((a), (b)) +#define strtok_P(s, delim) strtok((s), (delim)) +#define strtok_rP(s, delim, last) strtok((s), (delim), (last)) + +#define strlen_PF(a) strlen((a)) +#define strnlen_PF(src, len) strnlen((src), (len)) +#define memcpy_PF(dest, src, len) memcpy((dest), (src), (len)) +#define strcpy_PF(dest, src) strcpy((dest), (src)) +#define strncpy_PF(dest, src, len) strncpy((dest), (src), (len)) +#define strcat_PF(dest, src) strcat((dest), (src)) +#define strlcat_PF(dest, src, len) strlcat((dest), (src), (len)) +#define strncat_PF(dest, src, len) strncat((dest), (src), (len)) +#define strcmp_PF(s1, s2) strcmp((s1), (s2)) +#define strncmp_PF(s1, s2, n) strncmp((s1), (s2), (n)) +#define strcasecmp_PF(s1, s2) strcasecmp((s1), (s2)) +#define strncasecmp_PF(s1, s2, n) strncasecmp((s1), (s2), (n)) +#define strstr_PF(s1, s2) strstr((s1), (s2)) +#define strlcpy_PF(dest, src, n) strlcpy((dest), (src), (n)) +#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)) +#define pgm_read_dword(addr) (*(const unsigned long *)(addr)) +#define pgm_read_float(addr) (*(const float *)(addr)) +#define pgm_read_ptr(addr) (*(void *const *)(addr)) + +#define pgm_read_byte_near(addr) pgm_read_byte(addr) +#define pgm_read_word_near(addr) pgm_read_word(addr) +#define pgm_read_dword_near(addr) pgm_read_dword(addr) +#define pgm_read_float_near(addr) pgm_read_float(addr) +#define pgm_read_ptr_near(addr) pgm_read_ptr(addr) + +#define pgm_read_byte_far(addr) pgm_read_byte(addr) +#define pgm_read_word_far(addr) pgm_read_word(addr) +#define pgm_read_dword_far(addr) pgm_read_dword(addr) +#define pgm_read_float_far(addr) pgm_read_float(addr) +#define pgm_read_ptr_far(addr) pgm_read_ptr(addr) + +#define pgm_get_far_address(addr) (&(addr)) + +#endif diff --git a/api/api/deprecated/Client.h b/api/api/deprecated/Client.h new file mode 100644 index 00000000..84981c71 --- /dev/null +++ b/api/api/deprecated/Client.h @@ -0,0 +1,25 @@ +/* + Copyright (c) 2016 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 +*/ + +// including Client.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../Client.h" + + diff --git a/api/api/deprecated/HardwareSerial.h b/api/api/deprecated/HardwareSerial.h new file mode 100644 index 00000000..0ed7d7a6 --- /dev/null +++ b/api/api/deprecated/HardwareSerial.h @@ -0,0 +1,25 @@ +/* + Copyright (c) 2016 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 +*/ + +// including HardwareSerial.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../HardwareSerial.h" + + diff --git a/api/api/deprecated/IPAddress.h b/api/api/deprecated/IPAddress.h new file mode 100644 index 00000000..4c03574d --- /dev/null +++ b/api/api/deprecated/IPAddress.h @@ -0,0 +1,25 @@ +/* + Copyright (c) 2016 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 +*/ + +// including IPAddress.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../IPAddress.h" + + diff --git a/api/api/deprecated/Print.h b/api/api/deprecated/Print.h new file mode 100644 index 00000000..a0d1bd14 --- /dev/null +++ b/api/api/deprecated/Print.h @@ -0,0 +1,24 @@ +/* + Copyright (c) 2016 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 +*/ + +// including Print.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../Print.h" + diff --git a/api/api/deprecated/Printable.h b/api/api/deprecated/Printable.h new file mode 100644 index 00000000..b6888c11 --- /dev/null +++ b/api/api/deprecated/Printable.h @@ -0,0 +1,24 @@ +/* + Copyright (c) 2016 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 +*/ + +// including Printable.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../Printable.h" + diff --git a/api/api/deprecated/Server.h b/api/api/deprecated/Server.h new file mode 100644 index 00000000..65b544bb --- /dev/null +++ b/api/api/deprecated/Server.h @@ -0,0 +1,25 @@ +/* + Copyright (c) 2016 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 +*/ + +// including Server.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../Server.h" + + diff --git a/api/api/deprecated/Stream.h b/api/api/deprecated/Stream.h new file mode 100644 index 00000000..4118ccb7 --- /dev/null +++ b/api/api/deprecated/Stream.h @@ -0,0 +1,25 @@ +/* + Copyright (c) 2016 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 +*/ + +// including Stream.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../Stream.h" + + diff --git a/api/api/deprecated/Udp.h b/api/api/deprecated/Udp.h new file mode 100644 index 00000000..f03a64b4 --- /dev/null +++ b/api/api/deprecated/Udp.h @@ -0,0 +1,25 @@ +/* + Copyright (c) 2016 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 +*/ + +// including Udp.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../Udp.h" + + diff --git a/api/api/deprecated/WString.h b/api/api/deprecated/WString.h new file mode 100644 index 00000000..1a3a79fc --- /dev/null +++ b/api/api/deprecated/WString.h @@ -0,0 +1,24 @@ +/* + Copyright 2016, 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 +*/ + +// including WString.h is deprecated, for all future projects use Arduino.h instead + +// This include is added for compatibility, it will be removed on the next +// major release of the API +#include "../String.h" + diff --git a/api/api/itoa.h b/api/api/itoa.h new file mode 100644 index 00000000..c2077833 --- /dev/null +++ b/api/api/itoa.h @@ -0,0 +1,38 @@ +/* + itoa.h - Integer to ASCII conversion + Copyright (c) 2016 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 +*/ + +#pragma once + +// Standard C functions required in Arduino API +// If these functions are not provided by the standard library, the +// core should supply an implementation of them. + +#ifdef __cplusplus +extern "C" { +#endif + +extern char* itoa(int value, char *string, int radix); +extern char* ltoa(long value, char *string, int radix); +extern char* utoa(unsigned value, char *string, int radix); +extern char* ultoa(unsigned long value, char *string, int radix); + +#ifdef __cplusplus +} // extern "C" +#endif + From 3b4ab19b1f700690ba5f151045135dacd1075737 Mon Sep 17 00:00:00 2001 From: anotherSimpleCoder Date: Tue, 2 Dec 2025 23:43:09 +0100 Subject: [PATCH 9/9] Fixed up wrong file copy --- README.md | 4 +- api/ArduinoAPI.h | 4 +- api/Common.h | 5 - api/HardwareSPI.h | 39 +- api/HardwareSerial.h | 4 +- api/IPAddress.cpp | 426 +- api/IPAddress.h | 310 +- api/Interrupts.h | 10 +- api/PluggableUSB.cpp | 4 +- api/Print.cpp | 60 +- api/Print.h | 10 +- api/RingBuffer.h | 2 +- api/Stream.h | 12 +- api/String.cpp | 24 +- api/api/ArduinoAPI.h | 57 - api/api/Binary.h | 552 - api/api/CanMsg.cpp | 46 - api/api/CanMsg.h | 156 - api/api/CanMsgRingbuffer.cpp | 74 - api/api/CanMsgRingbuffer.h | 72 - api/api/Client.h | 46 - api/api/Common.cpp | 29 - api/api/Common.h | 190 - api/api/Compat.h | 35 - api/api/DMAPool.h | 316 - api/api/HardwareCAN.h | 118 - api/api/HardwareI2C.h | 48 - api/api/HardwareSPI.h | 145 - api/api/HardwareSerial.h | 106 - api/api/IPAddress.cpp | 368 - api/api/IPAddress.h | 122 - api/api/Interrupts.h | 67 - api/api/PluggableUSB.cpp | 103 - api/api/PluggableUSB.h | 78 - api/api/Print.cpp | 388 - api/api/Print.h | 97 - api/api/Printable.h | 40 - api/api/RingBuffer.h | 142 - api/api/Server.h | 31 - api/api/Stream.cpp | 321 - api/api/Stream.h | 133 - api/api/String.cpp | 750 - api/api/String.h | 255 - api/api/USBAPI.h | 64 - api/api/Udp.h | 92 - api/api/WCharacter.h | 171 - .../deprecated-avr-comp/avr/dtostrf.c.impl | 40 - api/api/deprecated-avr-comp/avr/dtostrf.h | 34 - api/api/deprecated-avr-comp/avr/interrupt.h | 23 - api/api/deprecated-avr-comp/avr/pgmspace.h | 124 - api/api/deprecated/Client.h | 25 - api/api/deprecated/HardwareSerial.h | 25 - api/api/deprecated/IPAddress.h | 25 - api/api/deprecated/Print.h | 24 - api/api/deprecated/Printable.h | 24 - api/api/deprecated/Server.h | 25 - api/api/deprecated/Stream.h | 25 - api/api/deprecated/Udp.h | 25 - api/api/deprecated/WString.h | 24 - api/api/itoa.h | 38 - api/deprecated-avr-comp/avr/pgmspace.h | 36 - test/.gitignore | 20 +- test/CMakeLists.txt | 14 +- test/external/catch/v2.13.1/include/catch.hpp | 17802 --------------- test/external/catch/v2.13.9/include/catch.hpp | 17970 ---------------- test/src/CanMsg/test_CanExtendedId.cpp | 2 +- test/src/CanMsg/test_CanMsg.cpp | 2 +- test/src/CanMsg/test_CanMsg_CopyCtor.cpp | 2 +- test/src/CanMsg/test_CanStandardId.cpp | 2 +- test/src/CanMsg/test_isExtendedId.cpp | 2 +- test/src/CanMsg/test_isStandardId.cpp | 2 +- test/src/CanMsg/test_operator_assignment.cpp | 2 +- test/src/CanMsg/test_printTo.cpp | 2 +- test/src/CanMsgRingbuffer/test_available.cpp | 2 +- test/src/Common/test_makeWord.cpp | 2 +- test/src/Common/test_map.cpp | 2 +- test/src/Common/test_max.cpp | 2 +- test/src/Common/test_min.cpp | 2 +- test/src/IPAddress/test_IPAddress.cpp | 2 +- test/src/IPAddress/test_IPAddress6.cpp | 2 +- test/src/IPAddress/test_fromString.cpp | 2 +- test/src/IPAddress/test_fromString6.cpp | 2 +- .../IPAddress/test_operator_assignment.cpp | 2 +- .../IPAddress/test_operator_comparison.cpp | 2 +- .../IPAddress/test_operator_comparison6.cpp | 2 +- .../IPAddress/test_operator_parentheses.cpp | 2 +- .../IPAddress/test_operator_parentheses6.cpp | 2 +- test/src/IPAddress/test_printTo.cpp | 2 +- test/src/IPAddress/test_printTo6.cpp | 2 +- test/src/IPAddress/test_toString.cpp | 2 +- test/src/Print/test_availableForWrite.cpp | 2 +- test/src/Print/test_clearWriteError.cpp | 2 +- test/src/Print/test_getWriteError.cpp | 2 +- test/src/Print/test_print.cpp | 3 +- test/src/Print/test_println.cpp | 2 +- test/src/Ringbuffer/test_available.cpp | 2 +- .../src/Ringbuffer/test_availableForStore.cpp | 2 +- test/src/Ringbuffer/test_clear.cpp | 2 +- test/src/Ringbuffer/test_isFull.cpp | 2 +- test/src/Ringbuffer/test_peek.cpp | 2 +- test/src/Ringbuffer/test_read_char.cpp | 2 +- test/src/Ringbuffer/test_store_char.cpp | 2 +- test/src/Stream/test_find.cpp | 2 +- test/src/Stream/test_findUntil.cpp | 2 +- test/src/Stream/test_getTimeout.cpp | 2 +- test/src/Stream/test_parseFloat.cpp | 5 +- test/src/Stream/test_parseInt.cpp | 2 +- test/src/Stream/test_readBytes.cpp | 2 +- test/src/Stream/test_readBytesUntil.cpp | 2 +- test/src/Stream/test_readString.cpp | 2 +- test/src/Stream/test_readStringUntil.cpp | 2 +- test/src/Stream/test_setTimeout.cpp | 2 +- test/src/String/StringPrinter.h | 2 +- test/src/String/test_String.cpp | 2 +- test/src/String/test_characterAccessFunc.cpp | 6 +- test/src/String/test_compareTo.cpp | 2 +- test/src/String/test_comparisonFunc.cpp | 2 +- test/src/String/test_concat.cpp | 2 +- test/src/String/test_indexOf.cpp | 2 +- test/src/String/test_isEmpty.cpp | 2 +- test/src/String/test_lastIndexOf.cpp | 2 +- test/src/String/test_length.cpp | 2 +- test/src/String/test_move.cpp | 8 +- test/src/String/test_operators.cpp | 2 +- test/src/String/test_remove.cpp | 2 +- test/src/String/test_replace.cpp | 2 +- test/src/String/test_substring.cpp | 2 +- test/src/String/test_toDouble.cpp | 2 +- test/src/String/test_toFloat.cpp | 2 +- test/src/String/test_toInt.cpp | 2 +- test/src/String/test_toLowerCase.cpp | 2 +- test/src/String/test_toUpperCase.cpp | 2 +- test/src/String/test_trim.cpp | 2 +- test/src/WCharacter/test_isAscii.cpp | 3 +- test/src/WCharacter/test_isControl.cpp | 3 +- test/src/WCharacter/test_isDigit.cpp | 3 +- .../WCharacter/test_isHexadecimalDigit.cpp | 3 +- test/src/WCharacter/test_isLowerCase.cpp | 3 +- test/src/WCharacter/test_isPunct.cpp | 3 +- test/src/WCharacter/test_isSpace.cpp | 3 +- test/src/WCharacter/test_isUpperCase.cpp | 3 +- test/src/WCharacter/test_isWhitespace.cpp | 3 +- test/src/WCharacter/test_toAscii.cpp | 3 +- test/src/main.cpp | 12 - 144 files changed, 568 insertions(+), 42073 deletions(-) delete mode 100644 api/api/ArduinoAPI.h delete mode 100644 api/api/Binary.h delete mode 100644 api/api/CanMsg.cpp delete mode 100644 api/api/CanMsg.h delete mode 100644 api/api/CanMsgRingbuffer.cpp delete mode 100644 api/api/CanMsgRingbuffer.h delete mode 100644 api/api/Client.h delete mode 100644 api/api/Common.cpp delete mode 100644 api/api/Common.h delete mode 100644 api/api/Compat.h delete mode 100644 api/api/DMAPool.h delete mode 100644 api/api/HardwareCAN.h delete mode 100644 api/api/HardwareI2C.h delete mode 100644 api/api/HardwareSPI.h delete mode 100644 api/api/HardwareSerial.h delete mode 100644 api/api/IPAddress.cpp delete mode 100644 api/api/IPAddress.h delete mode 100644 api/api/Interrupts.h delete mode 100644 api/api/PluggableUSB.cpp delete mode 100644 api/api/PluggableUSB.h delete mode 100644 api/api/Print.cpp delete mode 100644 api/api/Print.h delete mode 100644 api/api/Printable.h delete mode 100644 api/api/RingBuffer.h delete mode 100644 api/api/Server.h delete mode 100644 api/api/Stream.cpp delete mode 100644 api/api/Stream.h delete mode 100644 api/api/String.cpp delete mode 100644 api/api/String.h delete mode 100644 api/api/USBAPI.h delete mode 100644 api/api/Udp.h delete mode 100644 api/api/WCharacter.h delete mode 100644 api/api/deprecated-avr-comp/avr/dtostrf.c.impl delete mode 100644 api/api/deprecated-avr-comp/avr/dtostrf.h delete mode 100644 api/api/deprecated-avr-comp/avr/interrupt.h delete mode 100644 api/api/deprecated-avr-comp/avr/pgmspace.h delete mode 100644 api/api/deprecated/Client.h delete mode 100644 api/api/deprecated/HardwareSerial.h delete mode 100644 api/api/deprecated/IPAddress.h delete mode 100644 api/api/deprecated/Print.h delete mode 100644 api/api/deprecated/Printable.h delete mode 100644 api/api/deprecated/Server.h delete mode 100644 api/api/deprecated/Stream.h delete mode 100644 api/api/deprecated/Udp.h delete mode 100644 api/api/deprecated/WString.h delete mode 100644 api/api/itoa.h delete mode 100644 test/external/catch/v2.13.1/include/catch.hpp delete mode 100644 test/external/catch/v2.13.9/include/catch.hpp delete mode 100644 test/src/main.cpp diff --git a/README.md b/README.md index 506569a8..e533b69e 100644 --- a/README.md +++ b/README.md @@ -85,9 +85,9 @@ Documentation for how to integrate with a Arduino core (which is necessary if yo * [ArduinoCore-mbed](https://github.com/arduino/ArduinoCore-mbed#clone-the-repository-in-sketchbookhardwarearduino-git) * [ArduinoCore-samd](https://github.com/arduino/ArduinoCore-samd/#developing) -## Donations +## Support the project -This open source code is maintained by Arduino with the help of the community. We invest a considerable amount of time in testing code, optimizing it and introducing new features. Please consider [donating](https://www.arduino.cc/en/donate/) or [sponsoring](https://github.com/sponsors/arduino) to support our work, as well as [buying original Arduino boards](https://store.arduino.cc) which is the best way to make sure our effort can continue in the long term. +This open source code is maintained by Arduino with the help of the community. We invest a considerable amount of time in testing code, optimizing it and introducing new features. Please consider [buying original Arduino boards](https://store.arduino.cc) to support our work on the project. ## License and credits diff --git a/api/ArduinoAPI.h b/api/ArduinoAPI.h index 3d53085b..a7d8c0b8 100644 --- a/api/ArduinoAPI.h +++ b/api/ArduinoAPI.h @@ -20,8 +20,8 @@ #ifndef ARDUINO_API_H #define ARDUINO_API_H -// version 1.5.1 -#define ARDUINO_API_VERSION 10501 +// version 1.5.2 +#define ARDUINO_API_VERSION 10502 #include "Binary.h" diff --git a/api/Common.h b/api/Common.h index 5afdf945..9b28f40a 100644 --- a/api/Common.h +++ b/api/Common.h @@ -41,11 +41,6 @@ typedef enum { INPUT_PULLUP = 0x2, INPUT_PULLDOWN = 0x3, OUTPUT_OPENDRAIN = 0x4, - - OUTPUT_2MA = 0x5, - OUTPUT_4MA = 0x6, - OUTPUT_8MA = 0x7, - OUTPUT_12MA = 0x8, } PinMode; typedef enum { diff --git a/api/HardwareSPI.h b/api/HardwareSPI.h index 58f5d75c..7ce833ca 100644 --- a/api/HardwareSPI.h +++ b/api/HardwareSPI.h @@ -34,33 +34,42 @@ typedef enum { SPI_MODE3 = 3, } SPIMode; +// Platforms should define SPI_HAS_PERIPHERAL_MODE if SPI peripheral +// mode is supported, to allow applications to check whether peripheral +// mode is available or not. +typedef enum { + SPI_CONTROLLER = 0, + SPI_PERIPHERAL = 1, +} SPIBusMode; + class SPISettings { public: - SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode) { + SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode = SPI_CONTROLLER) { if (__builtin_constant_p(clock)) { - init_AlwaysInline(clock, bitOrder, dataMode); + init_AlwaysInline(clock, bitOrder, dataMode, busMode); } else { - init_MightInline(clock, bitOrder, dataMode); + init_MightInline(clock, bitOrder, dataMode, busMode); } } - SPISettings(uint32_t clock, BitOrder bitOrder, int dataMode) { + SPISettings(uint32_t clock, BitOrder bitOrder, int dataMode, SPIBusMode busMode = SPI_CONTROLLER) { if (__builtin_constant_p(clock)) { - init_AlwaysInline(clock, bitOrder, (SPIMode)dataMode); + init_AlwaysInline(clock, bitOrder, static_cast(dataMode), busMode); } else { - init_MightInline(clock, bitOrder, (SPIMode)dataMode); + init_MightInline(clock, bitOrder, static_cast(dataMode), busMode); } } // Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first. - SPISettings() { init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0); } + SPISettings() { init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0, SPI_CONTROLLER); } bool operator==(const SPISettings& rhs) const { if ((this->clockFreq == rhs.clockFreq) && (this->bitOrder == rhs.bitOrder) && - (this->dataMode == rhs.dataMode)) { + (this->dataMode == rhs.dataMode) && + (this->busMode == rhs.busMode)) { return true; } return false; @@ -80,22 +89,27 @@ class SPISettings { BitOrder getBitOrder() const { return (bitOrder); } + SPIBusMode getBusMode() const { + return busMode; + } private: - void init_MightInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode) { - init_AlwaysInline(clock, bitOrder, dataMode); + void init_MightInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) { + init_AlwaysInline(clock, bitOrder, dataMode, busMode); } // Core developer MUST use an helper function in beginTransaction() to use this data - void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode) __attribute__((__always_inline__)) { + void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) __attribute__((__always_inline__)) { this->clockFreq = clock; this->dataMode = dataMode; this->bitOrder = bitOrder; + this->busMode = busMode; } uint32_t clockFreq; SPIMode dataMode; BitOrder bitOrder; + SPIBusMode busMode; friend class HardwareSPI; }; @@ -111,9 +125,6 @@ class HardwareSPI virtual uint16_t transfer16(uint16_t data) = 0; virtual void transfer(void *buf, size_t count) = 0; - // EFP3 - Additional block-based versions we implement - virtual void transfer(const void *txbuf, void *rxbuf, size_t count) = 0; - // Transaction Functions virtual void usingInterrupt(int interruptNumber) = 0; virtual void notUsingInterrupt(int interruptNumber) = 0; diff --git a/api/HardwareSerial.h b/api/HardwareSerial.h index f5f9d64f..b687cdf1 100644 --- a/api/HardwareSerial.h +++ b/api/HardwareSerial.h @@ -103,6 +103,4 @@ class HardwareSerial : public Stream // XXX: Are we keeping the serialEvent API? extern void serialEventRun(void) __attribute__((weak)); -} - -using arduino::HardwareSerial; +} \ No newline at end of file diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp index 404b6562..05b41bc1 100644 --- a/api/IPAddress.cpp +++ b/api/IPAddress.cpp @@ -1,83 +1,147 @@ /* - IPAddress.cpp - Base class that provides IPAddress - Copyright (c) 2011 Adrian McEwen. All right reserved. + IPAddress.cpp - Base class that provides IPAddress + Copyright (c) 2011 Adrian McEwen. 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 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. + 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 - */ + 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 +*/ -#include -#include -#include +#include "IPAddress.h" +#include "Print.h" -IPAddress::IPAddress(const IPAddress& from) +using namespace arduino; + +IPAddress::IPAddress() : IPAddress(IPv4) {} + +IPAddress::IPAddress(IPType ip_type) +{ + _type = ip_type; + memset(_address.bytes, 0, sizeof(_address.bytes)); +} + +IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) +{ + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + _address.bytes[IPADDRESS_V4_BYTES_INDEX] = first_octet; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1] = second_octet; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2] = third_octet; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = fourth_octet; +} + +IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16) { + _type = IPv6; + _address.bytes[0] = o1; + _address.bytes[1] = o2; + _address.bytes[2] = o3; + _address.bytes[3] = o4; + _address.bytes[4] = o5; + _address.bytes[5] = o6; + _address.bytes[6] = o7; + _address.bytes[7] = o8; + _address.bytes[8] = o9; + _address.bytes[9] = o10; + _address.bytes[10] = o11; + _address.bytes[11] = o12; + _address.bytes[12] = o13; + _address.bytes[13] = o14; + _address.bytes[14] = o15; + _address.bytes[15] = o16; +} + +IPAddress::IPAddress(uint32_t address) { - ip_addr_copy(_ip, from._ip); + // IPv4 only + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; + + // NOTE on conversion/comparison and uint32_t: + // These conversions are host platform dependent. + // There is a defined integer representation of IPv4 addresses, + // based on network byte order (will be the value on big endian systems), + // e.g. http://2398766798 is the same as http://142.250.70.206, + // However on little endian systems the octets 0x83, 0xFA, 0x46, 0xCE, + // in that order, will form the integer (uint32_t) 3460758158 . } -IPAddress::IPAddress() { - _ip = *IP_ANY_TYPE; // lwIP's v4-or-v6 generic address +IPAddress::IPAddress(const uint8_t *address) : IPAddress(IPv4, address) {} + +IPAddress::IPAddress(IPType ip_type, const uint8_t *address) +{ + _type = ip_type; + if (ip_type == IPv4) { + memset(_address.bytes, 0, sizeof(_address.bytes)); + memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); + } else { + memcpy(_address.bytes, address, sizeof(_address.bytes)); + } } -bool IPAddress::isSet () const { - return !ip_addr_isany(&_ip) && ((*this) != IPADDR_NONE); +IPAddress::IPAddress(const char *address) +{ + fromString(address); } -IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) { - setV4(); - (*this)[0] = first_octet; - (*this)[1] = second_octet; - (*this)[2] = third_octet; - (*this)[3] = fourth_octet; +String IPAddress::toString4() const +{ + char szRet[16]; + snprintf(szRet, sizeof(szRet), "%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]); + return String(szRet); } -void IPAddress::ctor32(uint32_t address) { - setV4(); - v4() = address; +String IPAddress::toString6() const +{ + char szRet[40]; + snprintf(szRet, sizeof(szRet), "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", + _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3], + _address.bytes[4], _address.bytes[5], _address.bytes[6], _address.bytes[7], + _address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11], + _address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]); + return String(szRet); } -IPAddress::IPAddress(const uint8_t *address) { - setV4(); - (*this)[0] = address[0]; - (*this)[1] = address[1]; - (*this)[2] = address[2]; - (*this)[3] = address[3]; +String IPAddress::toString() const +{ + if (_type == IPv4) { + return toString4(); + } else { + return toString6(); + } } bool IPAddress::fromString(const char *address) { if (!fromString4(address)) { -#if LWIP_IPV6 return fromString6(address); -#else - return false; -#endif } return true; } -bool IPAddress::fromString4(const char *address) { - // TODO: (IPv4) add support for "a", "a.b", "a.b.c" formats +bool IPAddress::fromString4(const char *address) +{ + // TODO: add support for "a", "a.b", "a.b.c" formats - uint16_t acc = 0; // Accumulator + int16_t acc = -1; // Accumulator uint8_t dots = 0; + memset(_address.bytes, 0, sizeof(_address.bytes)); while (*address) { char c = *address++; if (c >= '0' && c <= '9') { - acc = acc * 10 + (c - '0'); + acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0'); if (acc > 255) { // Value out of [0..255] range return false; @@ -86,11 +150,15 @@ bool IPAddress::fromString4(const char *address) { else if (c == '.') { if (dots == 3) { - // Too much dots (there must be 3 dots) + // Too many dots (there must be 3 dots) return false; } - (*this)[dots++] = acc; - acc = 0; + if (acc < 0) { + /* No value between dots, e.g. '1..' */ + return false; + } + _address.bytes[IPADDRESS_V4_BYTES_INDEX + dots++] = acc; + acc = -1; } else { @@ -103,105 +171,23 @@ bool IPAddress::fromString4(const char *address) { // Too few dots (there must be 3 dots) return false; } - (*this)[3] = acc; - - setV4(); - return true; -} - -IPAddress& IPAddress::operator=(const uint8_t *address) { - setV4(); - v4() = *reinterpret_cast(address); - return *this; -} - -IPAddress& IPAddress::operator=(uint32_t address) { - setV4(); - v4() = address; - return *this; -} - -bool IPAddress::operator==(const uint8_t* addr) const { - return isV4() && v4() == *reinterpret_cast(addr); -} - -size_t IPAddress::printTo(Print& p) const { - String s = toString(); - return p.print(s); -} - -String IPAddress::toString() const -{ - String s; - - if (!isSet()) - return "(IP unset)"; - -#if LWIP_IPV6 - if (isV6()) { - int count0 = 0; - for (int i = 0; i < 8; i++) { - uint16_t bit = PP_NTOHS(raw6()[i]); - if (bit || count0 < 0) { - char buff[64]; - snprintf(buff, 64, "%x", bit); - buff[63] = 0; - s += buff; - if (count0 > 0) - // no more hiding 0 - count0 = -8; - } else - count0++; - if ((i != 7 && count0 < 2) || count0 == 7) - s += ':'; - } - return s; - } -#endif - - for(int i = 0; i < 4; i++) { - char buff[16]; - snprintf(buff, 16, "%d", (*this)[i]); - buff[15] = 0; - s += buff; - if (i != 3) - s += '.'; + if (acc < 0) { + /* No value between dots, e.g. '1..' */ + return false; } - return s; - -} - -bool IPAddress::isValid(const String& arg) { - return IPAddress().fromString(arg); -} - -bool IPAddress::isValid(const char* arg) { - return IPAddress().fromString(arg); -} - -namespace arduino { -const IPAddress INADDR_ANY; // generic "0.0.0.0" for IPv4 & IPv6 -const IPAddress INADDR_NONE(255,255,255,255); -}; - -void IPAddress::clear() { - (*this) = INADDR_ANY; + _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = acc; + _type = IPv4; + return true; } -/**************************************/ - -#if LWIP_IPV6 - bool IPAddress::fromString6(const char *address) { - // TODO: test test test - uint32_t acc = 0; // Accumulator - int dots = 0, doubledots = -1; + int colons = 0, double_colons = -1; while (*address) { char c = tolower(*address++); - if (isalnum(c)) { + if (isalnum(c) && c <= 'f') { if (c >= 'a') c -= 'a' - '0' - 10; acc = acc * 16 + (c - '0'); @@ -211,17 +197,27 @@ bool IPAddress::fromString6(const char *address) { } else if (c == ':') { if (*address == ':') { - if (doubledots >= 0) + if (double_colons >= 0) { // :: allowed once return false; + } + if (*address != '\0' && *(address + 1) == ':') { + // ::: not allowed + return false; + } // remember location - doubledots = dots + !!acc; + double_colons = colons + !!acc; address++; + } else if (*address == '\0') { + // can't end with a single colon + return false; } - if (dots == 7) + if (colons == 7) // too many separators return false; - raw6()[dots++] = PP_HTONS(acc); + _address.bytes[colons * 2] = acc >> 8; + _address.bytes[colons * 2 + 1] = acc & 0xff; + colons++; acc = 0; } else @@ -229,20 +225,144 @@ bool IPAddress::fromString6(const char *address) { return false; } - if (doubledots == -1 && dots != 7) + if (double_colons == -1 && colons != 7) { // Too few separators return false; - raw6()[dots++] = PP_HTONS(acc); - - if (doubledots != -1) { - for (int i = dots - doubledots - 1; i >= 0; i--) - raw6()[8 - dots + doubledots + i] = raw6()[doubledots + i]; - for (int i = doubledots; i < 8 - dots + doubledots; i++) - raw6()[i] = 0; + } + if (double_colons > -1 && colons > 6) { + // Too many segments (double colon must be at least one zero field) + return false; + } + _address.bytes[colons * 2] = acc >> 8; + _address.bytes[colons * 2 + 1] = acc & 0xff; + colons++; + + if (double_colons != -1) { + for (int i = colons * 2 - double_colons * 2 - 1; i >= 0; i--) + _address.bytes[16 - colons * 2 + double_colons * 2 + i] = _address.bytes[double_colons * 2 + i]; + for (int i = double_colons * 2; i < 16 - colons * 2 + double_colons * 2; i++) + _address.bytes[i] = 0; } - setV6(); + _type = IPv6; return true; } -#endif +IPAddress& IPAddress::operator=(const uint8_t *address) +{ + // IPv4 only conversion from byte pointer + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); + return *this; +} + +IPAddress& IPAddress::operator=(const char *address) +{ + fromString(address); + return *this; +} + +IPAddress& IPAddress::operator=(uint32_t address) +{ + // IPv4 conversion + // See note on conversion/comparison and uint32_t + _type = IPv4; + memset(_address.bytes, 0, sizeof(_address.bytes)); + _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; + return *this; +} + +bool IPAddress::operator==(const IPAddress& addr) const { + return (addr._type == _type) + && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0); +} + +bool IPAddress::operator==(const uint8_t* addr) const +{ + // IPv4 only comparison to byte pointer + // Can't support IPv6 as we know our type, but not the length of the pointer + return _type == IPv4 && memcmp(addr, &_address.bytes[IPADDRESS_V4_BYTES_INDEX], sizeof(uint32_t)) == 0; +} + +uint8_t IPAddress::operator[](int index) const { + if (_type == IPv4) { + return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; + } + return _address.bytes[index]; +} + +uint8_t& IPAddress::operator[](int index) { + if (_type == IPv4) { + return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; + } + return _address.bytes[index]; +} + +size_t IPAddress::printTo(Print& p) const +{ + size_t n = 0; + + if (_type == IPv6) { + // IPv6 IETF canonical format: compress left-most longest run of two or more zero fields, lower case + int8_t longest_start = -1; + int8_t longest_length = 1; + int8_t current_start = -1; + int8_t current_length = 0; + for (int8_t f = 0; f < 8; f++) { + if (_address.bytes[f * 2] == 0 && _address.bytes[f * 2 + 1] == 0) { + if (current_start == -1) { + current_start = f; + current_length = 1; + } else { + current_length++; + } + if (current_length > longest_length) { + longest_start = current_start; + longest_length = current_length; + } + } else { + current_start = -1; + } + } + for (int f = 0; f < 8; f++) { + if (f < longest_start || f >= longest_start + longest_length) { + uint8_t c1 = _address.bytes[f * 2] >> 4; + uint8_t c2 = _address.bytes[f * 2] & 0xf; + uint8_t c3 = _address.bytes[f * 2 + 1] >> 4; + uint8_t c4 = _address.bytes[f * 2 + 1] & 0xf; + if (c1 > 0) { + n += p.print((char)(c1 < 10 ? '0' + c1 : 'a' + c1 - 10)); + } + if (c1 > 0 || c2 > 0) { + n += p.print((char)(c2 < 10 ? '0' + c2 : 'a' + c2 - 10)); + } + if (c1 > 0 || c2 > 0 || c3 > 0) { + n += p.print((char)(c3 < 10 ? '0' + c3 : 'a' + c3 - 10)); + } + n += p.print((char)(c4 < 10 ? '0' + c4 : 'a' + c4 - 10)); + if (f < 7) { + n += p.print(':'); + } + } else if (f == longest_start) { + if (longest_start == 0) { + n += p.print(':'); + } + n += p.print(':'); + } + } + return n; + } + + // IPv4 + for (int i =0; i < 3; i++) + { + n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + i], DEC); + n += p.print('.'); + } + n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + 3], DEC); + return n; +} + +const IPAddress arduino::IN6ADDR_ANY(IPv6); +const IPAddress arduino::INADDR_NONE(0,0,0,0); diff --git a/api/IPAddress.h b/api/IPAddress.h index a395c29b..31a2d06d 100644 --- a/api/IPAddress.h +++ b/api/IPAddress.h @@ -1,236 +1,122 @@ /* - IPAddress.h - Base class that provides IPAddress - Copyright (c) 2011 Adrian McEwen. All right reserved. + IPAddress.h - Base class that provides IPAddress + Copyright (c) 2011 Adrian McEwen. 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 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. + 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 - */ + 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 +*/ #pragma once #include -#include -#include - -#include -#include -#include +#include "Printable.h" +#include "String.h" +#define IPADDRESS_V4_BYTES_INDEX 12 +#define IPADDRESS_V4_DWORD_INDEX 3 // forward declarations of global name space friend classes class EthernetClass; class DhcpClass; class DNSClient; - namespace arduino { -// to display a netif id with printf: -#define NETIFID_STR "%c%c%u" -#define NETIFID_VAL(netif) \ - ((netif)? (netif)->name[0]: '-'), \ - ((netif)? (netif)->name[1]: '-'), \ - ((netif)? netif_get_index(netif): 42) - // A class to make it easier to handle and pass around IP addresses -// IPv6 update: -// IPAddress is now a decorator class for lwIP's ip_addr_t -// fully backward compatible with legacy IPv4-only Arduino's -// with unchanged footprint when IPv6 is disabled - -class IPAddress: public Printable { - private: -#if !LWIP_IPV6 - // Ugly hack to allow Arduino Ethernet library to twiddle internal bits. - // This can only work in IPv4-only mode, of course. - union { - ip_addr_t _ip; - struct { - uint8_t bytes[4]; - } _address; - }; - static_assert(sizeof(_ip) == sizeof(_address), "IP_ADDR_T size != _ADDRESS size"); -#else - ip_addr_t _ip; -#endif - - // Access the raw byte array containing the address. Because this returns a pointer - // to the internal structure rather than a copy of the address this function should only - // be used when you know that the usage of the returned uint8_t* will be transient and not - // stored. - uint8_t* raw_address() { - return reinterpret_cast(&v4()); - } - const uint8_t* raw_address() const { - return reinterpret_cast(&v4()); - } - - void ctor32 (uint32_t); - - public: - // Constructors - IPAddress(); - IPAddress(const IPAddress& from); - IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); - IPAddress(uint32_t address) { ctor32(address); } -// IPAddress(unsigned long address) { ctor32(address); } - IPAddress(int address) { ctor32(address); } - IPAddress(const uint8_t *address); - - bool fromString(const char *address); - bool fromString(const String &address) { return fromString(address.c_str()); } - - // Overloaded cast operator to allow IPAddress objects to be used where a pointer - // to a four-byte uint8_t array is expected - operator uint32_t() const { return isV4()? v4(): (uint32_t)0; } - operator uint32_t() { return isV4()? v4(): (uint32_t)0; } - - bool isSet () const; - operator bool () const { return isSet(); } // <- - operator bool () { return isSet(); } // <- both are needed - - // generic IPv4 wrapper to uint32-view like arduino loves to see it - const uint32_t& v4() const { return ip_2_ip4(&_ip)->addr; } // for raw_address(const) - uint32_t& v4() { return ip_2_ip4(&_ip)->addr; } - - bool operator==(const IPAddress& addr) const { - return ip_addr_cmp(&_ip, &addr._ip); - } - bool operator!=(const IPAddress& addr) const { - return !ip_addr_cmp(&_ip, &addr._ip); - } - bool operator==(uint32_t addr) const { - return isV4() && v4() == addr; - } -// bool operator==(unsigned long addr) const { -// return isV4() && v4() == (uint32_t)addr; -// } - bool operator!=(uint32_t addr) const { - return !(isV4() && v4() == addr); - } -// bool operator!=(unsigned long addr) const { -// return isV4() && v4() != (uint32_t)addr; -// } - bool operator==(const uint8_t* addr) const; - - int operator>>(int n) const { - return isV4()? v4() >> n: 0; - } - - // Overloaded index operator to allow getting and setting individual octets of the address - uint8_t operator[](int index) const { - return isV4()? *(raw_address() + index): 0; - } - uint8_t& operator[](int index) { - setV4(); - return *(raw_address() + index); - } - - // Overloaded copy operators to allow initialisation of IPAddress objects from other types - IPAddress& operator=(const uint8_t *address); - IPAddress& operator=(uint32_t address); - IPAddress& operator=(const IPAddress&) = default; - - virtual size_t printTo(Print& p) const; - String toString() const; - - void clear(); - - /* - check if input string(arg) is a valid IPV4 address or not. - return true on valid. - return false on invalid. - */ - static bool isValid(const String& arg); - static bool isValid(const char* arg); - - friend class WiFiClass; - friend class EthernetClass; - friend class UDP; - friend class Client; - friend class Server; - friend class DhcpClass; - friend class DNSClient; - - friend ::EthernetClass; - friend ::DhcpClass; - friend ::DNSClient; - - /* - lwIP address compatibility - */ - //IPAddress(const ipv4_addr& fw_addr) { setV4(); v4() = fw_addr.addr; } - //IPAddress(const ipv4_addr* fw_addr) { setV4(); v4() = fw_addr->addr; } - - //IPAddress& operator=(const ipv4_addr& fw_addr) { setV4(); v4() = fw_addr.addr; return *this; } - //IPAddress& operator=(const ipv4_addr* fw_addr) { setV4(); v4() = fw_addr->addr; return *this; } - - operator ip_addr_t () const { return _ip; } - operator const ip_addr_t*() const { return &_ip; } - operator ip_addr_t*() { return &_ip; } - - bool isV4() const { return IP_IS_V4_VAL(_ip); } - void setV4() { IP_SET_TYPE_VAL(_ip, IPADDR_TYPE_V4); } - - bool isLocal () const { return ip_addr_islinklocal(&_ip); } - - - IPAddress(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); } - IPAddress(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); } - - IPAddress& operator=(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); return *this; } - IPAddress& operator=(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); return *this; } - -#if LWIP_IPV6 - uint16_t* raw6() - { - setV6(); - return reinterpret_cast(ip_2_ip6(&_ip)); - } - - const uint16_t* raw6() const - { - return isV6()? reinterpret_cast(ip_2_ip6(&_ip)): nullptr; - } - - // when not IPv6, ip_addr_t == ip4_addr_t so this one would be ambiguous - // required otherwise - operator const ip4_addr_t*() const { return isV4()? ip_2_ip4(&_ip): nullptr; } - - bool isV6() const { return IP_IS_V6_VAL(_ip); } - void setV6() { IP_SET_TYPE_VAL(_ip, IPADDR_TYPE_V6); } - - protected: - bool fromString6(const char *address); - -#else - - // allow portable code when IPv6 is not enabled - - uint16_t* raw6() { return nullptr; } - const uint16_t* raw6() const { return nullptr; } - bool isV6() const { return false; } - void setV6() { } -#endif - - protected: - bool fromString4(const char *address); +enum IPType { + IPv4, + IPv6 +}; +class IPAddress : public Printable { +private: + union { + uint8_t bytes[16]; + uint32_t dword[4]; + } _address; + IPType _type; + + // Access the raw byte array containing the address. Because this returns a pointer + // to the internal structure rather than a copy of the address this function should only + // be used when you know that the usage of the returned uint8_t* will be transient and not + // stored. + uint8_t* raw_address() { return _type == IPv4 ? &_address.bytes[IPADDRESS_V4_BYTES_INDEX] : _address.bytes; } + +public: + // Constructors + + // Default IPv4 + IPAddress(); + IPAddress(IPType ip_type); + IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); + IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16); + // IPv4; see implementation note + IPAddress(uint32_t address); + // Default IPv4 + IPAddress(const uint8_t *address); + IPAddress(IPType ip_type, const uint8_t *address); + // If IPv4 fails tries IPv6 see fromString function + IPAddress(const char *address); + + bool fromString(const char *address); + bool fromString(const String &address) { return fromString(address.c_str()); } + + // Overloaded cast operator to allow IPAddress objects to be used where a uint32_t is expected + // NOTE: IPv4 only; see implementation note + operator uint32_t() const { return _type == IPv4 ? _address.dword[IPADDRESS_V4_DWORD_INDEX] : 0; }; + + bool operator==(const IPAddress& addr) const; + bool operator!=(const IPAddress& addr) const { return !(*this == addr); }; + + // NOTE: IPv4 only; we don't know the length of the pointer + bool operator==(const uint8_t* addr) const; + + // Overloaded index operator to allow getting and setting individual octets of the address + uint8_t operator[](int index) const; + uint8_t& operator[](int index); + + // Overloaded copy operators to allow initialisation of IPAddress objects from other types + // NOTE: IPv4 only + IPAddress& operator=(const uint8_t *address); + // NOTE: IPv4 only; see implementation note + IPAddress& operator=(uint32_t address); + // If IPv4 fails tries IPv6 see fromString function + IPAddress& operator=(const char *address); + + virtual size_t printTo(Print& p) const; + String toString() const; + + IPType type() const { return _type; } + + friend class UDP; + friend class Client; + friend class Server; + + friend ::EthernetClass; + friend ::DhcpClass; + friend ::DNSClient; + +protected: + bool fromString4(const char *address); + bool fromString6(const char *address); + String toString4() const; + String toString6() const; }; -extern const IPAddress INADDR_ANY; +extern const IPAddress IN6ADDR_ANY; extern const IPAddress INADDR_NONE; - } + +using arduino::IPAddress; \ No newline at end of file diff --git a/api/Interrupts.h b/api/Interrupts.h index c3e37ade..b397eb7d 100644 --- a/api/Interrupts.h +++ b/api/Interrupts.h @@ -47,15 +47,19 @@ template void attachInterrupt(pin_size_t interruptNum, voidTemplateF // TODO: add structure to delete(__container__) when detachInterrupt() is called auto f = [](void* a) -> void { - T param = *(T*)((struct __container__*)a)->param; - (((struct __container__*)a)->function)(param); + T param = *(static_cast((static_cast*>(a))->param)); + //T param = *(T*) ((struct __container__*)a)->param; + (static_cast*>)(a)->function(param); + + //(((struct __container__*)a)->function)(param); }; attachInterruptParam(interruptNum, f, mode, cont); } template void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam userFunc, PinStatus mode, T* param) { - attachInterruptParam(interruptNum, (voidFuncPtrParam)userFunc, mode, (void*)param); + //attachInterruptParam(interruptNum, (voidFuncPtrParam)userFunc, mode, (void*)param); + attachInterruptParam(interruptNum, static_cast(userFunc), mode, static_cast(param)) } } diff --git a/api/PluggableUSB.cpp b/api/PluggableUSB.cpp index ca19d65d..977b4df4 100644 --- a/api/PluggableUSB.cpp +++ b/api/PluggableUSB.cpp @@ -87,7 +87,9 @@ bool PluggableUSB_::plug(PluggableUSBModule *node) node->pluggedEndpoint = lastEp; lastIf += node->numInterfaces; for (uint8_t i = 0; i < node->numEndpoints; i++) { - *(unsigned int*)(epBuffer(lastEp)) = node->endpointType[i]; + *(static_cast(epBuffer(lastEp))) = node->endpointType[i]; + + //*(unsigned int*)(epBuffer(lastEp)) = node->endpointType[i]; lastEp++; } return true; diff --git a/api/Print.cpp b/api/Print.cpp index f9f2ab8b..603fc468 100644 --- a/api/Print.cpp +++ b/api/Print.cpp @@ -17,7 +17,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include #include @@ -74,17 +73,17 @@ size_t Print::print(char c) size_t Print::print(unsigned char b, int base) { - return print((unsigned long) b, base); + return print(static_cast(b), base); } size_t Print::print(int n, int base) { - return print((long) n, base); + return print(static_cast(n), base); } size_t Print::print(unsigned int n, int base) { - return print((unsigned long) n, base); + return print(static_cast(n), base); } size_t Print::print(long n, int base) @@ -237,53 +236,6 @@ size_t Print::println(const Printable& x) return n; } -size_t Print::printf(const char *format, ...) { - va_list arg; - va_start(arg, format); - char temp[64]; - char* buffer = temp; - size_t len = vsnprintf(temp, sizeof(temp), format, arg); - va_end(arg); - if (len > sizeof(temp) - 1) { - buffer = new char[len + 1]; - if (!buffer) { - return 0; - } - va_start(arg, format); - vsnprintf(buffer, len + 1, format, arg); - va_end(arg); - } - len = write((const uint8_t*) buffer, len); - if (buffer != temp) { - delete[] buffer; - } - return len; -} - -// TODO - must be better way than cut-n-paste! -size_t Print::printf_P(const char *format, ...) { - va_list arg; - va_start(arg, format); - char temp[64]; - char* buffer = temp; - size_t len = vsnprintf(temp, sizeof(temp), format, arg); - va_end(arg); - if (len > sizeof(temp) - 1) { - buffer = new char[len + 1]; - if (!buffer) { - return 0; - } - va_start(arg, format); - vsnprintf(buffer, len + 1, format, arg); - va_end(arg); - } - len = write((const uint8_t*) buffer, len); - if (buffer != temp) { - delete[] buffer; - } - return len; -} - // Private Methods ///////////////////////////////////////////////////////////// size_t Print::printNumber(unsigned long n, uint8_t base) @@ -414,8 +366,8 @@ size_t Print::printFloat(double number, int digits) number += rounding; // Extract the integer part of the number and print it - unsigned long int_part = (unsigned long)number; - double remainder = number - (double)int_part; + unsigned long int_part = static_cast(number); + double remainder = number - static_cast(int_part); n += print(int_part); // Print the decimal point, but only if there are digits beyond @@ -427,7 +379,7 @@ size_t Print::printFloat(double number, int digits) while (digits-- > 0) { remainder *= 10.0; - unsigned int toPrint = (unsigned int)remainder; + unsigned int toPrint = static_cast(remainder); n += print(toPrint); remainder -= toPrint; } diff --git a/api/Print.h b/api/Print.h index 149bf010..89e857ed 100644 --- a/api/Print.h +++ b/api/Print.h @@ -50,11 +50,11 @@ class Print virtual size_t write(uint8_t) = 0; size_t write(const char *str) { if (str == NULL) return 0; - return write((const uint8_t *)str, strlen(str)); + return write(reinterpret_cast(str), strlen(str)); } virtual size_t write(const uint8_t *buffer, size_t size); size_t write(const char *buffer, size_t size) { - return write((const uint8_t *)buffer, size); + return write(reinterpret_cast(buffer), size); } // default to zero, meaning "a single write may block" @@ -90,12 +90,8 @@ class Print size_t println(const Printable&); size_t println(void); - // EFP3 - Add printf() to make life so much easier... - size_t printf(const char *format, ...); - size_t printf_P(const char *format, ...); - virtual void flush() { /* Empty implementation for backward compatibility */ } }; } -using arduino::Print; +using arduino::Print; \ No newline at end of file diff --git a/api/RingBuffer.h b/api/RingBuffer.h index b69c20d4..b1ad1cae 100644 --- a/api/RingBuffer.h +++ b/api/RingBuffer.h @@ -127,7 +127,7 @@ int RingBufferN::peek() template int RingBufferN::nextIndex(int index) { - return (uint32_t)(index + 1) % N; + return static_cast(index + 1) % N; } template diff --git a/api/Stream.h b/api/Stream.h index e81c71ba..10b42852 100644 --- a/api/Stream.h +++ b/api/Stream.h @@ -69,20 +69,20 @@ class Stream : public Print unsigned long getTimeout(void) { return _timeout; } bool find(const char *target); // reads data from the stream until the target string is found - bool find(const uint8_t *target) { return find ((const char *)target); } + bool find(const uint8_t *target) { return find (reinterpret_cast(target)); } // returns true if target string is found, false if timed out (see setTimeout) bool find(const char *target, size_t length); // reads data from the stream until the target string of given length is found - bool find(const uint8_t *target, size_t length) { return find ((const char *)target, length); } + bool find(const uint8_t *target, size_t length) { return find (reinterpret_cast(target), length); } // returns true if target string is found, false if timed out bool find(char target) { return find (&target, 1); } bool findUntil(const char *target, const char *terminator); // as find but search ends if the terminator string is found - bool findUntil(const uint8_t *target, const char *terminator) { return findUntil((const char *)target, terminator); } + bool findUntil(const uint8_t *target, const char *terminator) { return findUntil(reinterpret_cast(target), terminator); } bool findUntil(const char *target, size_t targetLen, const char *terminate, size_t termLen); // as above but search ends if the terminate string is found - bool findUntil(const uint8_t *target, size_t targetLen, const char *terminate, size_t termLen) {return findUntil((const char *)target, targetLen, terminate, termLen); } + bool findUntil(const uint8_t *target, size_t targetLen, const char *terminate, size_t termLen) {return findUntil(reinterpret_cast(target), targetLen, terminate, termLen); } long parseInt(LookaheadMode lookahead = SKIP_ALL, char ignore = NO_IGNORE_CHAR); // returns the first valid (long) integer value from the current position. @@ -95,12 +95,12 @@ class Stream : public Print // float version of parseInt size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer - size_t readBytes( uint8_t *buffer, size_t length) { return readBytes((char *)buffer, length); } + size_t readBytes( uint8_t *buffer, size_t length) { return readBytes(reinterpret_cast(buffer), length); } // terminates if length characters have been read or timeout (see setTimeout) // returns the number of characters placed in the buffer (0 means no valid data found) size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character - size_t readBytesUntil( char terminator, uint8_t *buffer, size_t length) { return readBytesUntil(terminator, (char *)buffer, length); } + size_t readBytesUntil( char terminator, uint8_t *buffer, size_t length) { return readBytesUntil(terminator, reinterpret_cast(buffer), length); } // terminates if length characters have been read, timeout, or if the terminator character detected // returns the number of characters placed in the buffer (0 means no valid data found) diff --git a/api/String.cpp b/api/String.cpp index 4f176374..8b995cfa 100644 --- a/api/String.cpp +++ b/api/String.cpp @@ -175,7 +175,7 @@ bool String::reserve(unsigned int size) bool String::changeBuffer(unsigned int maxStrLen) { - char *newbuffer = (char *)realloc(buffer, maxStrLen + 1); + char *newbuffer = static_cast(realloc(buffer, maxStrLen + 1)); if (newbuffer) { buffer = newbuffer; capacity = maxStrLen; @@ -207,7 +207,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length) return *this; } len = length; - strcpy_P(buffer, (PGM_P)pstr); + strcpy_P(buffer, reinterpret_cast(pstr)); return *this; } @@ -253,7 +253,7 @@ String & String::operator = (const char *cstr) String & String::operator = (const __FlashStringHelper *pstr) { - if (pstr) copy(pstr, strlen_P((PGM_P)pstr)); + if (pstr) copy(pstr, strlen_P(reinterpret_cast(pstr))); else invalidate(); return *this; @@ -343,11 +343,11 @@ bool String::concat(double num) bool String::concat(const __FlashStringHelper * str) { if (!str) return false; - int length = strlen_P((const char *) str); + int length = strlen_P(reinterpret_cast(str)); if (length == 0) return true; unsigned int newlen = len + length; if (!reserve(newlen)) return false; - strcpy_P(buffer + len, (const char *) str); + strcpy_P(buffer + len, reinterpret_cast(str)); len = newlen; return true; } @@ -440,8 +440,8 @@ StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHel int String::compareTo(const String &s) const { if (!buffer || !s.buffer) { - if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer; - if (buffer && len > 0) return *(unsigned char *)buffer; + if (s.buffer && s.len > 0) return 0 - *(reinterpret_cast(s.buffer)); + if (buffer && len > 0) return *(reinterpret_cast(buffer)); return 0; } return strcmp(buffer, s.buffer); @@ -450,8 +450,8 @@ int String::compareTo(const String &s) const int String::compareTo(const char *cstr) const { if (!buffer || !cstr) { - if (cstr && *cstr) return 0 - *(unsigned char *)cstr; - if (buffer && len > 0) return *(unsigned char *)buffer; + if (cstr && *cstr) return 0 - *(const_cast(reinterpret_cast(cstr))); + if (buffer && len > 0) return *(reinterpret_cast(buffer)); return 0; } return strcmp(buffer, cstr); @@ -539,7 +539,7 @@ void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int ind } unsigned int n = bufsize - 1; if (n > len - index) n = len - index; - strncpy((char *)buf, buffer + index, n); + strncpy(reinterpret_cast(buf), buffer + index, n); buf[n] = 0; } @@ -602,7 +602,7 @@ int String::lastIndexOf(const String &s2, unsigned int fromIndex) const for (char *p = buffer; p <= buffer + fromIndex; p++) { p = strstr(p, s2.buffer); if (!p) break; - if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer; + if (static_cast(p - buffer) <= fromIndex) found = p - buffer; } return found; } @@ -685,7 +685,7 @@ void String::remove(unsigned int index){ // Pass the biggest integer as the count. The remove method // below will take care of truncating it at the end of the // string. - remove(index, (unsigned int)-1); + remove(index, static_cast(-1)); } void String::remove(unsigned int index, unsigned int count){ diff --git a/api/api/ArduinoAPI.h b/api/api/ArduinoAPI.h deleted file mode 100644 index a7d8c0b8..00000000 --- a/api/api/ArduinoAPI.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - Arduino API main include - Copyright (c) 2016 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 -*/ - -#ifndef ARDUINO_API_H -#define ARDUINO_API_H - -// version 1.5.2 -#define ARDUINO_API_VERSION 10502 - -#include "Binary.h" - -#ifdef __cplusplus -#include "Interrupts.h" -#include "IPAddress.h" -#include "Print.h" -#include "Printable.h" -#include "PluggableUSB.h" -#include "Server.h" -#include "String.h" -#include "Stream.h" -#include "Udp.h" -#include "USBAPI.h" -#include "WCharacter.h" -#endif - -/* Standard C library includes */ -#include -#include -#include -#include -#include - -// Misc Arduino core functions -#include "Common.h" - -#ifdef __cplusplus -// Compatibility layer for older code -#include "Compat.h" -#endif - -#endif diff --git a/api/api/Binary.h b/api/api/Binary.h deleted file mode 100644 index 947542e3..00000000 --- a/api/api/Binary.h +++ /dev/null @@ -1,552 +0,0 @@ -/* - binary.h - Definitions for binary constants - Deprecated -- use 0b binary literals instead - Copyright (c) 2006 David A. Mellis. 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 -*/ - -#ifndef Binary_h -#define Binary_h - -/* If supported, 0b binary literals are preferable to these constants. - * In that case, warn the user about these being deprecated (if possible). */ -#if __cplusplus >= 201402L - /* C++14 introduces binary literals; C++11 introduces [[deprecated()]] */ - #define DEPRECATED(x) [[deprecated("use " #x " instead")]] -#elif __GNUC__ >= 6 - /* GCC 4.3 supports binary literals; GCC 6 supports __deprecated__ on enums*/ - #define DEPRECATED(x) __attribute__ ((__deprecated__ ("use " #x " instead"))) -#else - /* binary literals not supported, or "deprecated" warning not displayable */ - #define DEPRECATED(x) -#endif - -enum { - B0 DEPRECATED(0b0 ) = 0, - B00 DEPRECATED(0b00 ) = 0, - B000 DEPRECATED(0b000 ) = 0, - B0000 DEPRECATED(0b0000 ) = 0, - B00000 DEPRECATED(0b00000 ) = 0, - B000000 DEPRECATED(0b000000 ) = 0, - B0000000 DEPRECATED(0b0000000 ) = 0, - B00000000 DEPRECATED(0b00000000) = 0, - B1 DEPRECATED(0b1 ) = 1, - B01 DEPRECATED(0b01 ) = 1, - B001 DEPRECATED(0b001 ) = 1, - B0001 DEPRECATED(0b0001 ) = 1, - B00001 DEPRECATED(0b00001 ) = 1, - B000001 DEPRECATED(0b000001 ) = 1, - B0000001 DEPRECATED(0b0000001 ) = 1, - B00000001 DEPRECATED(0b00000001) = 1, - B10 DEPRECATED(0b10 ) = 2, - B010 DEPRECATED(0b010 ) = 2, - B0010 DEPRECATED(0b0010 ) = 2, - B00010 DEPRECATED(0b00010 ) = 2, - B000010 DEPRECATED(0b000010 ) = 2, - B0000010 DEPRECATED(0b0000010 ) = 2, - B00000010 DEPRECATED(0b00000010) = 2, - B11 DEPRECATED(0b11 ) = 3, - B011 DEPRECATED(0b011 ) = 3, - B0011 DEPRECATED(0b0011 ) = 3, - B00011 DEPRECATED(0b00011 ) = 3, - B000011 DEPRECATED(0b000011 ) = 3, - B0000011 DEPRECATED(0b0000011 ) = 3, - B00000011 DEPRECATED(0b00000011) = 3, - B100 DEPRECATED(0b100 ) = 4, - B0100 DEPRECATED(0b0100 ) = 4, - B00100 DEPRECATED(0b00100 ) = 4, - B000100 DEPRECATED(0b000100 ) = 4, - B0000100 DEPRECATED(0b0000100 ) = 4, - B00000100 DEPRECATED(0b00000100) = 4, - B101 DEPRECATED(0b101 ) = 5, - B0101 DEPRECATED(0b0101 ) = 5, - B00101 DEPRECATED(0b00101 ) = 5, - B000101 DEPRECATED(0b000101 ) = 5, - B0000101 DEPRECATED(0b0000101 ) = 5, - B00000101 DEPRECATED(0b00000101) = 5, - B110 DEPRECATED(0b110 ) = 6, - B0110 DEPRECATED(0b0110 ) = 6, - B00110 DEPRECATED(0b00110 ) = 6, - B000110 DEPRECATED(0b000110 ) = 6, - B0000110 DEPRECATED(0b0000110 ) = 6, - B00000110 DEPRECATED(0b00000110) = 6, - B111 DEPRECATED(0b111 ) = 7, - B0111 DEPRECATED(0b0111 ) = 7, - B00111 DEPRECATED(0b00111 ) = 7, - B000111 DEPRECATED(0b000111 ) = 7, - B0000111 DEPRECATED(0b0000111 ) = 7, - B00000111 DEPRECATED(0b00000111) = 7, - B1000 DEPRECATED(0b1000 ) = 8, - B01000 DEPRECATED(0b01000 ) = 8, - B001000 DEPRECATED(0b001000 ) = 8, - B0001000 DEPRECATED(0b0001000 ) = 8, - B00001000 DEPRECATED(0b00001000) = 8, - B1001 DEPRECATED(0b1001 ) = 9, - B01001 DEPRECATED(0b01001 ) = 9, - B001001 DEPRECATED(0b001001 ) = 9, - B0001001 DEPRECATED(0b0001001 ) = 9, - B00001001 DEPRECATED(0b00001001) = 9, - B1010 DEPRECATED(0b1010 ) = 10, - B01010 DEPRECATED(0b01010 ) = 10, - B001010 DEPRECATED(0b001010 ) = 10, - B0001010 DEPRECATED(0b0001010 ) = 10, - B00001010 DEPRECATED(0b00001010) = 10, - B1011 DEPRECATED(0b1011 ) = 11, - B01011 DEPRECATED(0b01011 ) = 11, - B001011 DEPRECATED(0b001011 ) = 11, - B0001011 DEPRECATED(0b0001011 ) = 11, - B00001011 DEPRECATED(0b00001011) = 11, - B1100 DEPRECATED(0b1100 ) = 12, - B01100 DEPRECATED(0b01100 ) = 12, - B001100 DEPRECATED(0b001100 ) = 12, - B0001100 DEPRECATED(0b0001100 ) = 12, - B00001100 DEPRECATED(0b00001100) = 12, - B1101 DEPRECATED(0b1101 ) = 13, - B01101 DEPRECATED(0b01101 ) = 13, - B001101 DEPRECATED(0b001101 ) = 13, - B0001101 DEPRECATED(0b0001101 ) = 13, - B00001101 DEPRECATED(0b00001101) = 13, - B1110 DEPRECATED(0b1110 ) = 14, - B01110 DEPRECATED(0b01110 ) = 14, - B001110 DEPRECATED(0b001110 ) = 14, - B0001110 DEPRECATED(0b0001110 ) = 14, - B00001110 DEPRECATED(0b00001110) = 14, - B1111 DEPRECATED(0b1111 ) = 15, - B01111 DEPRECATED(0b01111 ) = 15, - B001111 DEPRECATED(0b001111 ) = 15, - B0001111 DEPRECATED(0b0001111 ) = 15, - B00001111 DEPRECATED(0b00001111) = 15, - B10000 DEPRECATED(0b10000 ) = 16, - B010000 DEPRECATED(0b010000 ) = 16, - B0010000 DEPRECATED(0b0010000 ) = 16, - B00010000 DEPRECATED(0b00010000) = 16, - B10001 DEPRECATED(0b10001 ) = 17, - B010001 DEPRECATED(0b010001 ) = 17, - B0010001 DEPRECATED(0b0010001 ) = 17, - B00010001 DEPRECATED(0b00010001) = 17, - B10010 DEPRECATED(0b10010 ) = 18, - B010010 DEPRECATED(0b010010 ) = 18, - B0010010 DEPRECATED(0b0010010 ) = 18, - B00010010 DEPRECATED(0b00010010) = 18, - B10011 DEPRECATED(0b10011 ) = 19, - B010011 DEPRECATED(0b010011 ) = 19, - B0010011 DEPRECATED(0b0010011 ) = 19, - B00010011 DEPRECATED(0b00010011) = 19, - B10100 DEPRECATED(0b10100 ) = 20, - B010100 DEPRECATED(0b010100 ) = 20, - B0010100 DEPRECATED(0b0010100 ) = 20, - B00010100 DEPRECATED(0b00010100) = 20, - B10101 DEPRECATED(0b10101 ) = 21, - B010101 DEPRECATED(0b010101 ) = 21, - B0010101 DEPRECATED(0b0010101 ) = 21, - B00010101 DEPRECATED(0b00010101) = 21, - B10110 DEPRECATED(0b10110 ) = 22, - B010110 DEPRECATED(0b010110 ) = 22, - B0010110 DEPRECATED(0b0010110 ) = 22, - B00010110 DEPRECATED(0b00010110) = 22, - B10111 DEPRECATED(0b10111 ) = 23, - B010111 DEPRECATED(0b010111 ) = 23, - B0010111 DEPRECATED(0b0010111 ) = 23, - B00010111 DEPRECATED(0b00010111) = 23, - B11000 DEPRECATED(0b11000 ) = 24, - B011000 DEPRECATED(0b011000 ) = 24, - B0011000 DEPRECATED(0b0011000 ) = 24, - B00011000 DEPRECATED(0b00011000) = 24, - B11001 DEPRECATED(0b11001 ) = 25, - B011001 DEPRECATED(0b011001 ) = 25, - B0011001 DEPRECATED(0b0011001 ) = 25, - B00011001 DEPRECATED(0b00011001) = 25, - B11010 DEPRECATED(0b11010 ) = 26, - B011010 DEPRECATED(0b011010 ) = 26, - B0011010 DEPRECATED(0b0011010 ) = 26, - B00011010 DEPRECATED(0b00011010) = 26, - B11011 DEPRECATED(0b11011 ) = 27, - B011011 DEPRECATED(0b011011 ) = 27, - B0011011 DEPRECATED(0b0011011 ) = 27, - B00011011 DEPRECATED(0b00011011) = 27, - B11100 DEPRECATED(0b11100 ) = 28, - B011100 DEPRECATED(0b011100 ) = 28, - B0011100 DEPRECATED(0b0011100 ) = 28, - B00011100 DEPRECATED(0b00011100) = 28, - B11101 DEPRECATED(0b11101 ) = 29, - B011101 DEPRECATED(0b011101 ) = 29, - B0011101 DEPRECATED(0b0011101 ) = 29, - B00011101 DEPRECATED(0b00011101) = 29, - B11110 DEPRECATED(0b11110 ) = 30, - B011110 DEPRECATED(0b011110 ) = 30, - B0011110 DEPRECATED(0b0011110 ) = 30, - B00011110 DEPRECATED(0b00011110) = 30, - B11111 DEPRECATED(0b11111 ) = 31, - B011111 DEPRECATED(0b011111 ) = 31, - B0011111 DEPRECATED(0b0011111 ) = 31, - B00011111 DEPRECATED(0b00011111) = 31, - B100000 DEPRECATED(0b100000 ) = 32, - B0100000 DEPRECATED(0b0100000 ) = 32, - B00100000 DEPRECATED(0b00100000) = 32, - B100001 DEPRECATED(0b100001 ) = 33, - B0100001 DEPRECATED(0b0100001 ) = 33, - B00100001 DEPRECATED(0b00100001) = 33, - B100010 DEPRECATED(0b100010 ) = 34, - B0100010 DEPRECATED(0b0100010 ) = 34, - B00100010 DEPRECATED(0b00100010) = 34, - B100011 DEPRECATED(0b100011 ) = 35, - B0100011 DEPRECATED(0b0100011 ) = 35, - B00100011 DEPRECATED(0b00100011) = 35, - B100100 DEPRECATED(0b100100 ) = 36, - B0100100 DEPRECATED(0b0100100 ) = 36, - B00100100 DEPRECATED(0b00100100) = 36, - B100101 DEPRECATED(0b100101 ) = 37, - B0100101 DEPRECATED(0b0100101 ) = 37, - B00100101 DEPRECATED(0b00100101) = 37, - B100110 DEPRECATED(0b100110 ) = 38, - B0100110 DEPRECATED(0b0100110 ) = 38, - B00100110 DEPRECATED(0b00100110) = 38, - B100111 DEPRECATED(0b100111 ) = 39, - B0100111 DEPRECATED(0b0100111 ) = 39, - B00100111 DEPRECATED(0b00100111) = 39, - B101000 DEPRECATED(0b101000 ) = 40, - B0101000 DEPRECATED(0b0101000 ) = 40, - B00101000 DEPRECATED(0b00101000) = 40, - B101001 DEPRECATED(0b101001 ) = 41, - B0101001 DEPRECATED(0b0101001 ) = 41, - B00101001 DEPRECATED(0b00101001) = 41, - B101010 DEPRECATED(0b101010 ) = 42, - B0101010 DEPRECATED(0b0101010 ) = 42, - B00101010 DEPRECATED(0b00101010) = 42, - B101011 DEPRECATED(0b101011 ) = 43, - B0101011 DEPRECATED(0b0101011 ) = 43, - B00101011 DEPRECATED(0b00101011) = 43, - B101100 DEPRECATED(0b101100 ) = 44, - B0101100 DEPRECATED(0b0101100 ) = 44, - B00101100 DEPRECATED(0b00101100) = 44, - B101101 DEPRECATED(0b101101 ) = 45, - B0101101 DEPRECATED(0b0101101 ) = 45, - B00101101 DEPRECATED(0b00101101) = 45, - B101110 DEPRECATED(0b101110 ) = 46, - B0101110 DEPRECATED(0b0101110 ) = 46, - B00101110 DEPRECATED(0b00101110) = 46, - B101111 DEPRECATED(0b101111 ) = 47, - B0101111 DEPRECATED(0b0101111 ) = 47, - B00101111 DEPRECATED(0b00101111) = 47, - B110000 DEPRECATED(0b110000 ) = 48, - B0110000 DEPRECATED(0b0110000 ) = 48, - B00110000 DEPRECATED(0b00110000) = 48, - B110001 DEPRECATED(0b110001 ) = 49, - B0110001 DEPRECATED(0b0110001 ) = 49, - B00110001 DEPRECATED(0b00110001) = 49, - B110010 DEPRECATED(0b110010 ) = 50, - B0110010 DEPRECATED(0b0110010 ) = 50, - B00110010 DEPRECATED(0b00110010) = 50, - B110011 DEPRECATED(0b110011 ) = 51, - B0110011 DEPRECATED(0b0110011 ) = 51, - B00110011 DEPRECATED(0b00110011) = 51, - B110100 DEPRECATED(0b110100 ) = 52, - B0110100 DEPRECATED(0b0110100 ) = 52, - B00110100 DEPRECATED(0b00110100) = 52, - B110101 DEPRECATED(0b110101 ) = 53, - B0110101 DEPRECATED(0b0110101 ) = 53, - B00110101 DEPRECATED(0b00110101) = 53, - B110110 DEPRECATED(0b110110 ) = 54, - B0110110 DEPRECATED(0b0110110 ) = 54, - B00110110 DEPRECATED(0b00110110) = 54, - B110111 DEPRECATED(0b110111 ) = 55, - B0110111 DEPRECATED(0b0110111 ) = 55, - B00110111 DEPRECATED(0b00110111) = 55, - B111000 DEPRECATED(0b111000 ) = 56, - B0111000 DEPRECATED(0b0111000 ) = 56, - B00111000 DEPRECATED(0b00111000) = 56, - B111001 DEPRECATED(0b111001 ) = 57, - B0111001 DEPRECATED(0b0111001 ) = 57, - B00111001 DEPRECATED(0b00111001) = 57, - B111010 DEPRECATED(0b111010 ) = 58, - B0111010 DEPRECATED(0b0111010 ) = 58, - B00111010 DEPRECATED(0b00111010) = 58, - B111011 DEPRECATED(0b111011 ) = 59, - B0111011 DEPRECATED(0b0111011 ) = 59, - B00111011 DEPRECATED(0b00111011) = 59, - B111100 DEPRECATED(0b111100 ) = 60, - B0111100 DEPRECATED(0b0111100 ) = 60, - B00111100 DEPRECATED(0b00111100) = 60, - B111101 DEPRECATED(0b111101 ) = 61, - B0111101 DEPRECATED(0b0111101 ) = 61, - B00111101 DEPRECATED(0b00111101) = 61, - B111110 DEPRECATED(0b111110 ) = 62, - B0111110 DEPRECATED(0b0111110 ) = 62, - B00111110 DEPRECATED(0b00111110) = 62, - B111111 DEPRECATED(0b111111 ) = 63, - B0111111 DEPRECATED(0b0111111 ) = 63, - B00111111 DEPRECATED(0b00111111) = 63, - B1000000 DEPRECATED(0b1000000 ) = 64, - B01000000 DEPRECATED(0b01000000) = 64, - B1000001 DEPRECATED(0b1000001 ) = 65, - B01000001 DEPRECATED(0b01000001) = 65, - B1000010 DEPRECATED(0b1000010 ) = 66, - B01000010 DEPRECATED(0b01000010) = 66, - B1000011 DEPRECATED(0b1000011 ) = 67, - B01000011 DEPRECATED(0b01000011) = 67, - B1000100 DEPRECATED(0b1000100 ) = 68, - B01000100 DEPRECATED(0b01000100) = 68, - B1000101 DEPRECATED(0b1000101 ) = 69, - B01000101 DEPRECATED(0b01000101) = 69, - B1000110 DEPRECATED(0b1000110 ) = 70, - B01000110 DEPRECATED(0b01000110) = 70, - B1000111 DEPRECATED(0b1000111 ) = 71, - B01000111 DEPRECATED(0b01000111) = 71, - B1001000 DEPRECATED(0b1001000 ) = 72, - B01001000 DEPRECATED(0b01001000) = 72, - B1001001 DEPRECATED(0b1001001 ) = 73, - B01001001 DEPRECATED(0b01001001) = 73, - B1001010 DEPRECATED(0b1001010 ) = 74, - B01001010 DEPRECATED(0b01001010) = 74, - B1001011 DEPRECATED(0b1001011 ) = 75, - B01001011 DEPRECATED(0b01001011) = 75, - B1001100 DEPRECATED(0b1001100 ) = 76, - B01001100 DEPRECATED(0b01001100) = 76, - B1001101 DEPRECATED(0b1001101 ) = 77, - B01001101 DEPRECATED(0b01001101) = 77, - B1001110 DEPRECATED(0b1001110 ) = 78, - B01001110 DEPRECATED(0b01001110) = 78, - B1001111 DEPRECATED(0b1001111 ) = 79, - B01001111 DEPRECATED(0b01001111) = 79, - B1010000 DEPRECATED(0b1010000 ) = 80, - B01010000 DEPRECATED(0b01010000) = 80, - B1010001 DEPRECATED(0b1010001 ) = 81, - B01010001 DEPRECATED(0b01010001) = 81, - B1010010 DEPRECATED(0b1010010 ) = 82, - B01010010 DEPRECATED(0b01010010) = 82, - B1010011 DEPRECATED(0b1010011 ) = 83, - B01010011 DEPRECATED(0b01010011) = 83, - B1010100 DEPRECATED(0b1010100 ) = 84, - B01010100 DEPRECATED(0b01010100) = 84, - B1010101 DEPRECATED(0b1010101 ) = 85, - B01010101 DEPRECATED(0b01010101) = 85, - B1010110 DEPRECATED(0b1010110 ) = 86, - B01010110 DEPRECATED(0b01010110) = 86, - B1010111 DEPRECATED(0b1010111 ) = 87, - B01010111 DEPRECATED(0b01010111) = 87, - B1011000 DEPRECATED(0b1011000 ) = 88, - B01011000 DEPRECATED(0b01011000) = 88, - B1011001 DEPRECATED(0b1011001 ) = 89, - B01011001 DEPRECATED(0b01011001) = 89, - B1011010 DEPRECATED(0b1011010 ) = 90, - B01011010 DEPRECATED(0b01011010) = 90, - B1011011 DEPRECATED(0b1011011 ) = 91, - B01011011 DEPRECATED(0b01011011) = 91, - B1011100 DEPRECATED(0b1011100 ) = 92, - B01011100 DEPRECATED(0b01011100) = 92, - B1011101 DEPRECATED(0b1011101 ) = 93, - B01011101 DEPRECATED(0b01011101) = 93, - B1011110 DEPRECATED(0b1011110 ) = 94, - B01011110 DEPRECATED(0b01011110) = 94, - B1011111 DEPRECATED(0b1011111 ) = 95, - B01011111 DEPRECATED(0b01011111) = 95, - B1100000 DEPRECATED(0b1100000 ) = 96, - B01100000 DEPRECATED(0b01100000) = 96, - B1100001 DEPRECATED(0b1100001 ) = 97, - B01100001 DEPRECATED(0b01100001) = 97, - B1100010 DEPRECATED(0b1100010 ) = 98, - B01100010 DEPRECATED(0b01100010) = 98, - B1100011 DEPRECATED(0b1100011 ) = 99, - B01100011 DEPRECATED(0b01100011) = 99, - B1100100 DEPRECATED(0b1100100 ) = 100, - B01100100 DEPRECATED(0b01100100) = 100, - B1100101 DEPRECATED(0b1100101 ) = 101, - B01100101 DEPRECATED(0b01100101) = 101, - B1100110 DEPRECATED(0b1100110 ) = 102, - B01100110 DEPRECATED(0b01100110) = 102, - B1100111 DEPRECATED(0b1100111 ) = 103, - B01100111 DEPRECATED(0b01100111) = 103, - B1101000 DEPRECATED(0b1101000 ) = 104, - B01101000 DEPRECATED(0b01101000) = 104, - B1101001 DEPRECATED(0b1101001 ) = 105, - B01101001 DEPRECATED(0b01101001) = 105, - B1101010 DEPRECATED(0b1101010 ) = 106, - B01101010 DEPRECATED(0b01101010) = 106, - B1101011 DEPRECATED(0b1101011 ) = 107, - B01101011 DEPRECATED(0b01101011) = 107, - B1101100 DEPRECATED(0b1101100 ) = 108, - B01101100 DEPRECATED(0b01101100) = 108, - B1101101 DEPRECATED(0b1101101 ) = 109, - B01101101 DEPRECATED(0b01101101) = 109, - B1101110 DEPRECATED(0b1101110 ) = 110, - B01101110 DEPRECATED(0b01101110) = 110, - B1101111 DEPRECATED(0b1101111 ) = 111, - B01101111 DEPRECATED(0b01101111) = 111, - B1110000 DEPRECATED(0b1110000 ) = 112, - B01110000 DEPRECATED(0b01110000) = 112, - B1110001 DEPRECATED(0b1110001 ) = 113, - B01110001 DEPRECATED(0b01110001) = 113, - B1110010 DEPRECATED(0b1110010 ) = 114, - B01110010 DEPRECATED(0b01110010) = 114, - B1110011 DEPRECATED(0b1110011 ) = 115, - B01110011 DEPRECATED(0b01110011) = 115, - B1110100 DEPRECATED(0b1110100 ) = 116, - B01110100 DEPRECATED(0b01110100) = 116, - B1110101 DEPRECATED(0b1110101 ) = 117, - B01110101 DEPRECATED(0b01110101) = 117, - B1110110 DEPRECATED(0b1110110 ) = 118, - B01110110 DEPRECATED(0b01110110) = 118, - B1110111 DEPRECATED(0b1110111 ) = 119, - B01110111 DEPRECATED(0b01110111) = 119, - B1111000 DEPRECATED(0b1111000 ) = 120, - B01111000 DEPRECATED(0b01111000) = 120, - B1111001 DEPRECATED(0b1111001 ) = 121, - B01111001 DEPRECATED(0b01111001) = 121, - B1111010 DEPRECATED(0b1111010 ) = 122, - B01111010 DEPRECATED(0b01111010) = 122, - B1111011 DEPRECATED(0b1111011 ) = 123, - B01111011 DEPRECATED(0b01111011) = 123, - B1111100 DEPRECATED(0b1111100 ) = 124, - B01111100 DEPRECATED(0b01111100) = 124, - B1111101 DEPRECATED(0b1111101 ) = 125, - B01111101 DEPRECATED(0b01111101) = 125, - B1111110 DEPRECATED(0b1111110 ) = 126, - B01111110 DEPRECATED(0b01111110) = 126, - B1111111 DEPRECATED(0b1111111 ) = 127, - B01111111 DEPRECATED(0b01111111) = 127, - B10000000 DEPRECATED(0b10000000) = 128, - B10000001 DEPRECATED(0b10000001) = 129, - B10000010 DEPRECATED(0b10000010) = 130, - B10000011 DEPRECATED(0b10000011) = 131, - B10000100 DEPRECATED(0b10000100) = 132, - B10000101 DEPRECATED(0b10000101) = 133, - B10000110 DEPRECATED(0b10000110) = 134, - B10000111 DEPRECATED(0b10000111) = 135, - B10001000 DEPRECATED(0b10001000) = 136, - B10001001 DEPRECATED(0b10001001) = 137, - B10001010 DEPRECATED(0b10001010) = 138, - B10001011 DEPRECATED(0b10001011) = 139, - B10001100 DEPRECATED(0b10001100) = 140, - B10001101 DEPRECATED(0b10001101) = 141, - B10001110 DEPRECATED(0b10001110) = 142, - B10001111 DEPRECATED(0b10001111) = 143, - B10010000 DEPRECATED(0b10010000) = 144, - B10010001 DEPRECATED(0b10010001) = 145, - B10010010 DEPRECATED(0b10010010) = 146, - B10010011 DEPRECATED(0b10010011) = 147, - B10010100 DEPRECATED(0b10010100) = 148, - B10010101 DEPRECATED(0b10010101) = 149, - B10010110 DEPRECATED(0b10010110) = 150, - B10010111 DEPRECATED(0b10010111) = 151, - B10011000 DEPRECATED(0b10011000) = 152, - B10011001 DEPRECATED(0b10011001) = 153, - B10011010 DEPRECATED(0b10011010) = 154, - B10011011 DEPRECATED(0b10011011) = 155, - B10011100 DEPRECATED(0b10011100) = 156, - B10011101 DEPRECATED(0b10011101) = 157, - B10011110 DEPRECATED(0b10011110) = 158, - B10011111 DEPRECATED(0b10011111) = 159, - B10100000 DEPRECATED(0b10100000) = 160, - B10100001 DEPRECATED(0b10100001) = 161, - B10100010 DEPRECATED(0b10100010) = 162, - B10100011 DEPRECATED(0b10100011) = 163, - B10100100 DEPRECATED(0b10100100) = 164, - B10100101 DEPRECATED(0b10100101) = 165, - B10100110 DEPRECATED(0b10100110) = 166, - B10100111 DEPRECATED(0b10100111) = 167, - B10101000 DEPRECATED(0b10101000) = 168, - B10101001 DEPRECATED(0b10101001) = 169, - B10101010 DEPRECATED(0b10101010) = 170, - B10101011 DEPRECATED(0b10101011) = 171, - B10101100 DEPRECATED(0b10101100) = 172, - B10101101 DEPRECATED(0b10101101) = 173, - B10101110 DEPRECATED(0b10101110) = 174, - B10101111 DEPRECATED(0b10101111) = 175, - B10110000 DEPRECATED(0b10110000) = 176, - B10110001 DEPRECATED(0b10110001) = 177, - B10110010 DEPRECATED(0b10110010) = 178, - B10110011 DEPRECATED(0b10110011) = 179, - B10110100 DEPRECATED(0b10110100) = 180, - B10110101 DEPRECATED(0b10110101) = 181, - B10110110 DEPRECATED(0b10110110) = 182, - B10110111 DEPRECATED(0b10110111) = 183, - B10111000 DEPRECATED(0b10111000) = 184, - B10111001 DEPRECATED(0b10111001) = 185, - B10111010 DEPRECATED(0b10111010) = 186, - B10111011 DEPRECATED(0b10111011) = 187, - B10111100 DEPRECATED(0b10111100) = 188, - B10111101 DEPRECATED(0b10111101) = 189, - B10111110 DEPRECATED(0b10111110) = 190, - B10111111 DEPRECATED(0b10111111) = 191, - B11000000 DEPRECATED(0b11000000) = 192, - B11000001 DEPRECATED(0b11000001) = 193, - B11000010 DEPRECATED(0b11000010) = 194, - B11000011 DEPRECATED(0b11000011) = 195, - B11000100 DEPRECATED(0b11000100) = 196, - B11000101 DEPRECATED(0b11000101) = 197, - B11000110 DEPRECATED(0b11000110) = 198, - B11000111 DEPRECATED(0b11000111) = 199, - B11001000 DEPRECATED(0b11001000) = 200, - B11001001 DEPRECATED(0b11001001) = 201, - B11001010 DEPRECATED(0b11001010) = 202, - B11001011 DEPRECATED(0b11001011) = 203, - B11001100 DEPRECATED(0b11001100) = 204, - B11001101 DEPRECATED(0b11001101) = 205, - B11001110 DEPRECATED(0b11001110) = 206, - B11001111 DEPRECATED(0b11001111) = 207, - B11010000 DEPRECATED(0b11010000) = 208, - B11010001 DEPRECATED(0b11010001) = 209, - B11010010 DEPRECATED(0b11010010) = 210, - B11010011 DEPRECATED(0b11010011) = 211, - B11010100 DEPRECATED(0b11010100) = 212, - B11010101 DEPRECATED(0b11010101) = 213, - B11010110 DEPRECATED(0b11010110) = 214, - B11010111 DEPRECATED(0b11010111) = 215, - B11011000 DEPRECATED(0b11011000) = 216, - B11011001 DEPRECATED(0b11011001) = 217, - B11011010 DEPRECATED(0b11011010) = 218, - B11011011 DEPRECATED(0b11011011) = 219, - B11011100 DEPRECATED(0b11011100) = 220, - B11011101 DEPRECATED(0b11011101) = 221, - B11011110 DEPRECATED(0b11011110) = 222, - B11011111 DEPRECATED(0b11011111) = 223, - B11100000 DEPRECATED(0b11100000) = 224, - B11100001 DEPRECATED(0b11100001) = 225, - B11100010 DEPRECATED(0b11100010) = 226, - B11100011 DEPRECATED(0b11100011) = 227, - B11100100 DEPRECATED(0b11100100) = 228, - B11100101 DEPRECATED(0b11100101) = 229, - B11100110 DEPRECATED(0b11100110) = 230, - B11100111 DEPRECATED(0b11100111) = 231, - B11101000 DEPRECATED(0b11101000) = 232, - B11101001 DEPRECATED(0b11101001) = 233, - B11101010 DEPRECATED(0b11101010) = 234, - B11101011 DEPRECATED(0b11101011) = 235, - B11101100 DEPRECATED(0b11101100) = 236, - B11101101 DEPRECATED(0b11101101) = 237, - B11101110 DEPRECATED(0b11101110) = 238, - B11101111 DEPRECATED(0b11101111) = 239, - B11110000 DEPRECATED(0b11110000) = 240, - B11110001 DEPRECATED(0b11110001) = 241, - B11110010 DEPRECATED(0b11110010) = 242, - B11110011 DEPRECATED(0b11110011) = 243, - B11110100 DEPRECATED(0b11110100) = 244, - B11110101 DEPRECATED(0b11110101) = 245, - B11110110 DEPRECATED(0b11110110) = 246, - B11110111 DEPRECATED(0b11110111) = 247, - B11111000 DEPRECATED(0b11111000) = 248, - B11111001 DEPRECATED(0b11111001) = 249, - B11111010 DEPRECATED(0b11111010) = 250, - B11111011 DEPRECATED(0b11111011) = 251, - B11111100 DEPRECATED(0b11111100) = 252, - B11111101 DEPRECATED(0b11111101) = 253, - B11111110 DEPRECATED(0b11111110) = 254, - B11111111 DEPRECATED(0b11111111) = 255 -}; - -#undef DEPRECATED - -#endif diff --git a/api/api/CanMsg.cpp b/api/api/CanMsg.cpp deleted file mode 100644 index f4f93ce8..00000000 --- a/api/api/CanMsg.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - CanMsg.cpp - Library for CAN message handling - Copyright (c) 2023 Arduino. 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 -*/ - -/************************************************************************************** - * INCLUDE - **************************************************************************************/ - -#include "CanMsg.h" - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -namespace arduino -{ - -/************************************************************************************** - * STATIC CONST DEFINITION - **************************************************************************************/ - -uint8_t const CanMsg::MAX_DATA_LENGTH; -uint32_t const CanMsg::CAN_EFF_FLAG; -uint32_t const CanMsg::CAN_SFF_MASK; -uint32_t const CanMsg::CAN_EFF_MASK; - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -} /* arduino */ diff --git a/api/api/CanMsg.h b/api/api/CanMsg.h deleted file mode 100644 index a8e32e5b..00000000 --- a/api/api/CanMsg.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - CanMsg.h - Library for CAN message handling - Copyright (c) 2023 Arduino. 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 -*/ - -#ifndef ARDUINOCORE_API_CAN_MSG_H_ -#define ARDUINOCORE_API_CAN_MSG_H_ - -/************************************************************************************** - * INCLUDE - **************************************************************************************/ - -#include -#include - -#include "Print.h" -#include "Printable.h" -#include "Common.h" - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -namespace arduino -{ - -/************************************************************************************** - * CLASS DECLARATION - **************************************************************************************/ - -class CanMsg : public Printable -{ -public: - static uint8_t constexpr MAX_DATA_LENGTH = 8; - - static uint32_t constexpr CAN_EFF_FLAG = 0x80000000U; - static uint32_t constexpr CAN_SFF_MASK = 0x000007FFU; /* standard frame format (SFF) */ - static uint32_t constexpr CAN_EFF_MASK = 0x1FFFFFFFU; /* extended frame format (EFF) */ - - - CanMsg(uint32_t const can_id, uint8_t const can_data_len, uint8_t const * can_data_ptr) - : id{can_id} - , data_length{min(can_data_len, MAX_DATA_LENGTH)} - , data{0} - { - if (data_length && can_data_ptr) - memcpy(data, can_data_ptr, data_length); - } - - CanMsg() : CanMsg(0, 0, nullptr) { } - - CanMsg(CanMsg const & other) - { - id = other.id; - data_length = other.data_length; - if (data_length > 0) - memcpy(data, other.data, data_length); - } - - virtual ~CanMsg() { } - - CanMsg & operator = (CanMsg const & other) - { - if (this != &other) - { - id = other.id; - data_length = other.data_length; - if (data_length > 0) - memcpy(data, other.data, data_length); - } - return (*this); - } - - virtual size_t printTo(Print & p) const override - { - char buf[20] = {0}; - size_t len = 0; - - /* Print the header. */ - if (isStandardId()) - len = snprintf(buf, sizeof(buf), "[%03" PRIX32 "] (%d) : ", getStandardId(), data_length); - else - len = snprintf(buf, sizeof(buf), "[%08" PRIX32 "] (%d) : ", getExtendedId(), data_length); - size_t n = p.write(buf, len); - - /* Print the data. */ - for (size_t d = 0; d < data_length; d++) - { - len = snprintf(buf, sizeof(buf), "%02X", data[d]); - n += p.write(buf, len); - } - - /* Wrap up. */ - return n; - } - - - uint32_t getStandardId() const { - return (id & CAN_SFF_MASK); - } - uint32_t getExtendedId() const { - return (id & CAN_EFF_MASK); - } - bool isStandardId() const { - return ((id & CAN_EFF_FLAG) == 0); - } - bool isExtendedId() const { - return ((id & CAN_EFF_FLAG) == CAN_EFF_FLAG); - } - - - /* - * CAN ID semantics (mirroring definition by linux/can.h): - * |- Bit 31 : frame format flag (0 = standard 11 bit, 1 = extended 29 bit) - * |- Bit 30 : reserved (future remote transmission request flag) - * |- Bit 29 : reserved (future error frame flag) - * |- Bit 0-28 : CAN identifier (11/29 bit) - */ - uint32_t id; - uint8_t data_length; - uint8_t data[MAX_DATA_LENGTH]; -}; - -/************************************************************************************** - * FREE FUNCTIONS - **************************************************************************************/ - -inline uint32_t CanStandardId(uint32_t const id) { - return (id & CanMsg::CAN_SFF_MASK); -} - -inline uint32_t CanExtendedId(uint32_t const id) { - return (CanMsg::CAN_EFF_FLAG | (id & CanMsg::CAN_EFF_MASK)); -} - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -} /* arduino */ - -#endif /* ARDUINOCORE_API_CAN_MSG_H_ */ diff --git a/api/api/CanMsgRingbuffer.cpp b/api/api/CanMsgRingbuffer.cpp deleted file mode 100644 index 56abbac4..00000000 --- a/api/api/CanMsgRingbuffer.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - CanMsgRingbuffer.cpp - Library for CAN message handling - Copyright (c) 2023 Arduino. 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 -*/ - -/************************************************************************************** - * INCLUDE - **************************************************************************************/ - -#include "CanMsgRingbuffer.h" - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -namespace arduino -{ - -/************************************************************************************** - * CTOR/DTOR - **************************************************************************************/ - -CanMsgRingbuffer::CanMsgRingbuffer() -: _head{0} -, _tail{0} -, _num_elems{0} -{ -} - -/************************************************************************************** - * PUBLIC MEMBER FUNCTIONS - **************************************************************************************/ - -void CanMsgRingbuffer::enqueue(CanMsg const & msg) -{ - if (isFull()) - return; - - _buf[_head] = msg; - _head = next(_head); - _num_elems = _num_elems + 1; -} - -CanMsg CanMsgRingbuffer::dequeue() -{ - if (isEmpty()) - return CanMsg(); - - CanMsg const msg = _buf[_tail]; - _tail = next(_tail); - _num_elems = _num_elems - 1; - - return msg; -} - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -} /* arduino */ diff --git a/api/api/CanMsgRingbuffer.h b/api/api/CanMsgRingbuffer.h deleted file mode 100644 index 9eb6bafc..00000000 --- a/api/api/CanMsgRingbuffer.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - CanMsgRingbuffer.h - Library for CAN message handling - Copyright (c) 2023 Arduino. 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 -*/ - -#ifndef ARDUINOCORE_API_CAN_MSG_RING_BUFFER_H_ -#define ARDUINOCORE_API_CAN_MSG_RING_BUFFER_H_ - -/************************************************************************************** - * INCLUDE - **************************************************************************************/ - -#include - -#include "CanMsg.h" - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -namespace arduino -{ - -/************************************************************************************** - * CLASS DECLARATION - **************************************************************************************/ - -class CanMsgRingbuffer -{ -public: - static size_t constexpr RING_BUFFER_SIZE = 32U; - - CanMsgRingbuffer(); - - inline bool isFull() const { return (_num_elems == RING_BUFFER_SIZE); } - void enqueue(CanMsg const & msg); - - inline bool isEmpty() const { return (_num_elems == 0); } - CanMsg dequeue(); - - inline size_t available() const { return _num_elems; } - -private: - CanMsg _buf[RING_BUFFER_SIZE]; - volatile size_t _head; - volatile size_t _tail; - volatile size_t _num_elems; - - inline size_t next(size_t const idx) const { return ((idx + 1) % RING_BUFFER_SIZE); } -}; - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -} /* arduino */ - -#endif /* ARDUINOCORE_API_CAN_MSG_RING_BUFFER_H_ */ diff --git a/api/api/Client.h b/api/api/Client.h deleted file mode 100644 index 5a1d99fe..00000000 --- a/api/api/Client.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - Client.h - Base class that provides Client - Copyright (c) 2011 Adrian McEwen. 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 -*/ - -#pragma once - -#include "Stream.h" -#include "IPAddress.h" - -namespace arduino { - -class Client : public Stream { - -public: - virtual int connect(IPAddress ip, uint16_t port) =0; - virtual int connect(const char *host, uint16_t port) =0; - virtual size_t write(uint8_t) =0; - virtual size_t write(const uint8_t *buf, size_t size) =0; - virtual int available() = 0; - virtual int read() = 0; - virtual int read(uint8_t *buf, size_t size) = 0; - virtual int peek() = 0; - virtual void flush() = 0; - virtual void stop() = 0; - virtual uint8_t connected() = 0; - virtual operator bool() = 0; -protected: - uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); }; -}; - -} \ No newline at end of file diff --git a/api/api/Common.cpp b/api/api/Common.cpp deleted file mode 100644 index 8299247a..00000000 --- a/api/api/Common.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - Common.cpp - Common function implementations - Copyright (c) 2017 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 -*/ - -#include "Common.h" - -/* C++ prototypes */ -long map(long x, long in_min, long in_max, long out_min, long out_max) -{ - return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; -} - -uint16_t makeWord(uint16_t w) { return w; } -uint16_t makeWord(uint8_t h, uint8_t l) { return (h << 8) | l; } \ No newline at end of file diff --git a/api/api/Common.h b/api/api/Common.h deleted file mode 100644 index 9b28f40a..00000000 --- a/api/api/Common.h +++ /dev/null @@ -1,190 +0,0 @@ -/* - Common.h - Common definitions for Arduino core - Copyright (c) 2017 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 -*/ - -#pragma once -#include -#include - -#ifdef __cplusplus -extern "C"{ -#endif - -void yield(void); - -typedef enum { - LOW = 0, - HIGH = 1, - CHANGE = 2, - FALLING = 3, - RISING = 4, -} PinStatus; - -typedef enum { - INPUT = 0x0, - OUTPUT = 0x1, - INPUT_PULLUP = 0x2, - INPUT_PULLDOWN = 0x3, - OUTPUT_OPENDRAIN = 0x4, -} PinMode; - -typedef enum { - LSBFIRST = 0, - MSBFIRST = 1, -} BitOrder; - -#define PI 3.1415926535897932384626433832795 -#define HALF_PI 1.5707963267948966192313216916398 -#define TWO_PI 6.283185307179586476925286766559 -#define DEG_TO_RAD 0.017453292519943295769236907684886 -#define RAD_TO_DEG 57.295779513082320876798154814105 -#define EULER 2.718281828459045235360287471352 - -#define SERIAL 0x0 -#define DISPLAY 0x1 - -#ifndef constrain -#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt))) -#endif - -#ifndef radians -#define radians(deg) ((deg)*DEG_TO_RAD) -#endif - -#ifndef degrees -#define degrees(rad) ((rad)*RAD_TO_DEG) -#endif - -#ifndef sq -#define sq(x) ((x)*(x)) -#endif - -typedef void (*voidFuncPtr)(void); -typedef void (*voidFuncPtrParam)(void*); - -// interrupts() / noInterrupts() must be defined by the core - -#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 bitToggle(value, bit) ((value) ^= (1UL << (bit))) -#define bitWrite(value, bit, bitvalue) ((bitvalue) ? bitSet((value), (bit)) : bitClear((value), (bit))) - -#ifndef bit -#define bit(b) (1UL << (b)) -#endif - -/* TODO: request for removal */ -typedef bool boolean; -typedef uint8_t byte; -typedef uint16_t word; - -void init(void); -void initVariant(void); - -#ifndef HOST -int atexit(void (*func)()) __attribute__((weak)); -#endif -int main() __attribute__((weak)); - -#ifdef EXTENDED_PIN_MODE -// Platforms who want to declare more than 256 pins need to define EXTENDED_PIN_MODE globally -typedef uint32_t pin_size_t; -#else -typedef uint8_t pin_size_t; -#endif - -void pinMode(pin_size_t pinNumber, PinMode pinMode); -void digitalWrite(pin_size_t pinNumber, PinStatus status); -PinStatus digitalRead(pin_size_t pinNumber); -int analogRead(pin_size_t pinNumber); -void analogReference(uint8_t mode); -void analogWrite(pin_size_t pinNumber, int value); - -unsigned long millis(void); -unsigned long micros(void); -void delay(unsigned long); -void delayMicroseconds(unsigned int us); -unsigned long pulseIn(pin_size_t pin, uint8_t state, unsigned long timeout); -unsigned long pulseInLong(pin_size_t pin, uint8_t state, unsigned long timeout); - -void shiftOut(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder, uint8_t val); -uint8_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder); - -void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus mode); -void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback, PinStatus mode, void* param); -void detachInterrupt(pin_size_t interruptNumber); - -void setup(void); -void loop(void); - -#ifdef __cplusplus -} // extern "C" -#endif - -#ifdef __cplusplus - template - auto min(const T& a, const L& b) -> decltype((b < a) ? b : a) - { - return (b < a) ? b : a; - } - - template - auto max(const T& a, const L& b) -> decltype((b < a) ? b : a) - { - return (a < b) ? b : a; - } -#else -#ifndef min -#define min(a,b) \ - ({ __typeof__ (a) _a = (a); \ - __typeof__ (b) _b = (b); \ - _a < _b ? _a : _b; }) -#endif -#ifndef max -#define max(a,b) \ - ({ __typeof__ (a) _a = (a); \ - __typeof__ (b) _b = (b); \ - _a > _b ? _a : _b; }) -#endif -#endif - -#ifdef __cplusplus - -/* C++ prototypes */ -uint16_t makeWord(uint16_t w); -uint16_t makeWord(byte h, byte l); - -#define word(...) makeWord(__VA_ARGS__) - -unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L); -unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L); - -void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0); -void noTone(uint8_t _pin); - -// WMath prototypes -long random(long); -long random(long, long); -void randomSeed(unsigned long); -long map(long, long, long, long, long); - -#endif // __cplusplus diff --git a/api/api/Compat.h b/api/api/Compat.h deleted file mode 100644 index 564170c6..00000000 --- a/api/api/Compat.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Compat.h - Compatibility layer for Arduino API - Copyright (c) 2018 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 -*/ - -#ifndef __COMPAT_H__ -#define __COMPAT_H__ - -namespace arduino { - -inline void pinMode(pin_size_t pinNumber, int mode) { - pinMode(pinNumber, (PinMode)mode); -}; - -inline void digitalWrite(pin_size_t pinNumber, int status) { - digitalWrite(pinNumber, (PinStatus)status); -}; - -} - -#endif \ No newline at end of file diff --git a/api/api/DMAPool.h b/api/api/DMAPool.h deleted file mode 100644 index 815f5d3e..00000000 --- a/api/api/DMAPool.h +++ /dev/null @@ -1,316 +0,0 @@ -/* - This file is part of the Arduino_AdvancedAnalog library. - Copyright (c) 2023-2024 Arduino SA. 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 - 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 Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef __DMA_POOL_H__ -#define __DMA_POOL_H__ - -#include -#include - -namespace arduino { - -#if defined(__DCACHE_PRESENT) -#define __CACHE_LINE_SIZE__ __SCB_DCACHE_LINE_SIZE -#elif defined(__cpp_lib_hardware_interference_size) -#define __CACHE_LINE_SIZE__ std::hardware_constructive_interference_size -#else // No cache. -#define __CACHE_LINE_SIZE__ alignof(int) -#endif - -// Single-producer, single-consumer, lock-free bounded Queue. -template class SPSCQueue { - private: - size_t capacity; - std::atomic head; - std::atomic tail; - std::unique_ptr buff; - - public: - SPSCQueue(size_t size=0): - capacity(0), tail(0), head(0), buff(nullptr) { - if (size) { - T *mem = new T[size + 1]; - if (mem) { - buff.reset(mem); - capacity = size + 1; - } - } - } - - void reset() { - tail = head = 0; - } - - size_t empty() { - return tail == head; - } - - operator bool() const { - return buff.get() != nullptr; - } - - bool push(T data) { - size_t curr = head.load(std::memory_order_relaxed); - size_t next = (curr + 1) % capacity; - if (!buff || (next == tail.load(std::memory_order_acquire))) { - return false; - } - buff[curr] = data; - head.store(next, std::memory_order_release); - return true; - } - - T pop(bool peek=false) { - size_t curr = tail.load(std::memory_order_relaxed); - if (!buff || (curr == head.load(std::memory_order_acquire))) { - return nullptr; - } - T data = buff[curr]; - if (!peek) { - size_t next = (curr + 1) % capacity; - tail.store(next, std::memory_order_release); - } - return data; - } -}; - -enum { - DMA_BUFFER_READ = (1 << 0), - DMA_BUFFER_WRITE = (1 << 1), - DMA_BUFFER_DISCONT = (1 << 2), - DMA_BUFFER_INTRLVD = (1 << 3), -} DMABufferFlags; - -// Forward declaration of DMAPool class. -template class DMAPool; - -template class DMABuffer { - private: - DMAPool *pool; - size_t n_samples; - size_t n_channels; - T *ptr; - uint32_t ts; - uint32_t flags; - - public: - DMABuffer(DMAPool *pool=nullptr, size_t samples=0, size_t channels=0, T *mem=nullptr): - pool(pool), n_samples(samples), n_channels(channels), ptr(mem), ts(0), flags(0) { - } - - T *data() { - return ptr; - } - - size_t size() { - return n_samples * n_channels; - } - - size_t bytes() { - return n_samples * n_channels * sizeof(T); - } - - void flush() { - #if __DCACHE_PRESENT - if (ptr) { - SCB_CleanDCache_by_Addr(data(), bytes()); - } - #endif - } - - void invalidate() { - #if __DCACHE_PRESENT - if (ptr) { - SCB_InvalidateDCache_by_Addr(data(), bytes()); - } - #endif - } - - uint32_t timestamp() { - return ts; - } - - void timestamp(uint32_t ts) { - this->ts = ts; - } - - uint32_t channels() { - return n_channels; - } - - void release() { - if (pool && ptr) { - pool->free(this, flags); - } - } - - void set_flags(uint32_t f) { - flags |= f; - } - - bool get_flags(uint32_t f=0xFFFFFFFFU) { - return flags & f; - } - - void clr_flags(uint32_t f=0xFFFFFFFFU) { - flags &= (~f); - } - - T& operator[](size_t i) { - assert(ptr && i < size()); - return ptr[i]; - } - - const T& operator[](size_t i) const { - assert(ptr && i < size()); - return ptr[i]; - } - - operator bool() const { - return (ptr != nullptr); - } -}; - -template class DMAPool { - private: - uint8_t *mem; - bool managed; - SPSCQueue*> wqueue; - SPSCQueue*> rqueue; - - // Allocates dynamic aligned memory. - // Note this memory must be free'd with aligned_free. - static void *aligned_malloc(size_t size) { - void **ptr, *stashed; - size_t offset = A - 1 + sizeof(void *); - if ((A % 2) || !((stashed = ::malloc(size + offset)))) { - return nullptr; - } - ptr = (void **) (((uintptr_t) stashed + offset) & ~(A - 1)); - ptr[-1] = stashed; - return ptr; - } - - // Frees dynamic aligned memory allocated with aligned_malloc. - static void aligned_free(void *ptr) { - if (ptr != nullptr) { - ::free(((void **) ptr)[-1]); - } - } - - public: - DMAPool(size_t n_samples, size_t n_channels, size_t n_buffers, void *mem_in=nullptr): - mem((uint8_t *) mem_in), managed(mem_in==nullptr), wqueue(n_buffers), rqueue(n_buffers) { - // Round up to the next multiple of the alignment. - size_t bufsize = (((n_samples * n_channels * sizeof(T)) + (A-1)) & ~(A-1)); - if (bufsize && rqueue && wqueue) { - if (mem == nullptr) { - // Allocate an aligned memory block for the DMA buffers' memory. - mem = (uint8_t *) aligned_malloc(n_buffers * bufsize); - if (!mem) { - // Failed to allocate memory. - return; - } - } - // Allocate the DMA buffers, initialize them using aligned - // pointers from the pool, and add them to the write queue. - for (size_t i=0; i *buf = new DMABuffer( - this, n_samples, n_channels, (T *) &mem[i * bufsize] - ); - if (buf == nullptr) { - break; - } - wqueue.push(buf); - } - } - } - - ~DMAPool() { - while (readable()) { - delete alloc(DMA_BUFFER_READ); - } - - while (writable()) { - delete alloc(DMA_BUFFER_WRITE); - } - - if (mem && managed) { - aligned_free(mem); - } - } - - bool writable() { - return !(wqueue.empty()); - } - - bool readable() { - return !(rqueue.empty()); - } - - void flush() { - while (readable()) { - DMABuffer *buf = alloc(DMA_BUFFER_READ); - if (buf) { - buf->release(); - } - } - } - - DMABuffer *alloc(uint32_t flags) { - DMABuffer *buf = nullptr; - if (flags & DMA_BUFFER_READ) { - // Get a DMA buffer from the read/ready queue. - buf = rqueue.pop(); - } else { - // Get a DMA buffer from the write/free queue. - buf = wqueue.pop(); - } - if (buf) { - buf->clr_flags(DMA_BUFFER_READ | DMA_BUFFER_WRITE); - buf->set_flags(flags); - } - return buf; - } - - void free(DMABuffer *buf, uint32_t flags=0) { - if (buf == nullptr) { - return; - } - if (flags == 0) { - flags = buf->get_flags(); - } - if (flags & DMA_BUFFER_READ) { - // Return the DMA buffer to the write/free queue. - buf->clr_flags(); - wqueue.push(buf); - } else { - // Return the DMA buffer to the read/ready queue. - rqueue.push(buf); - } - } - -}; - -} // namespace arduino - -using arduino::DMAPool; -using arduino::DMABuffer; -using arduino::SPSCQueue; -#endif //__DMA_POOL_H__ diff --git a/api/api/HardwareCAN.h b/api/api/HardwareCAN.h deleted file mode 100644 index 57d9d582..00000000 --- a/api/api/HardwareCAN.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - HardwareCAN.h - CAN bus interface for Arduino core - Copyright (c) 2023 Arduino. 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 -*/ - -#ifndef ARDUINOCORE_API_HARDWARECAN_H -#define ARDUINOCORE_API_HARDWARECAN_H - -/************************************************************************************** - * INCLUDE - **************************************************************************************/ - -#include "CanMsg.h" -#include "CanMsgRingbuffer.h" - -/************************************************************************************** - * TYPEDEF - **************************************************************************************/ - -enum class CanBitRate : int -{ - BR_125k = 125000, - BR_250k = 250000, - BR_500k = 500000, - BR_1000k = 1000000, -}; - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -namespace arduino -{ - -/************************************************************************************** - * CLASS DECLARATION - **************************************************************************************/ - -class HardwareCAN -{ -public: - virtual ~HardwareCAN() {} - - - /** - * Initialize the CAN controller. - * - * @param can_bitrate the bus bit rate - * @return true if initialization succeeded and the controller is operational - */ - virtual bool begin(CanBitRate const can_bitrate) = 0; - - /** - * Disable the CAN controller. - * - * Whether any messages that are buffered will be sent is _implementation defined_. - */ - virtual void end() = 0; - - /** - * Enqueue a message for transmission to the CAN bus. - * - * This call returns when the message has been enqueued for transmission. - * Due to bus arbitration and error recovery there may be a substantial delay - * before the message is actually sent. - * - * An implementation must ensure that all messages with the same CAN priority - * are sent in the order in which they are enqueued. - * - * It is _implementation defined_ whether multiple messages can be enqueued - * for transmission, and if messages with higher CAN priority can preempt the - * transmission of previously enqueued messages. The default configuration for - * and implementation should not allow multiple messages to be enqueued. - * - * @param msg the message to send - * @return 1 if the message was enqueued, an _implementation defined_ error code < 0 if there was an error - * @todo define specific error codes, especially "message already pending" - */ - virtual int write(CanMsg const &msg) = 0; - - /** - * Determine if any messages have been received and buffered. - * - * @return the number of unread messages that have been received - */ - virtual size_t available() = 0; - - /** - * Returns the first message received, or an empty message if none are available. - * - * Messages must be returned in the order received. - * - * @return the first message in the receive buffer - */ - virtual CanMsg read() = 0; -}; - -/************************************************************************************** - * NAMESPACE - **************************************************************************************/ - -} /* arduino */ - -#endif /* ARDUINOCORE_API_HARDWARECAN_H */ diff --git a/api/api/HardwareI2C.h b/api/api/HardwareI2C.h deleted file mode 100644 index 98c6bfd7..00000000 --- a/api/api/HardwareI2C.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - HardwareI2C.h - Hardware I2C interface for Arduino - Copyright (c) 2016 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 -*/ - -#pragma once - -#include -#include "Stream.h" - -namespace arduino { - -class HardwareI2C : public Stream -{ - public: - virtual void begin() = 0; - virtual void begin(uint8_t address) = 0; - virtual void end() = 0; - - virtual void setClock(uint32_t freq) = 0; - - virtual void beginTransmission(uint8_t address) = 0; - virtual uint8_t endTransmission(bool stopBit) = 0; - virtual uint8_t endTransmission(void) = 0; - - virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit) = 0; - virtual size_t requestFrom(uint8_t address, size_t len) = 0; - - virtual void onReceive(void(*)(int)) = 0; - virtual void onRequest(void(*)(void)) = 0; -}; - -} - diff --git a/api/api/HardwareSPI.h b/api/api/HardwareSPI.h deleted file mode 100644 index 7ce833ca..00000000 --- a/api/api/HardwareSPI.h +++ /dev/null @@ -1,145 +0,0 @@ -/* - HardwareSPI.h - Hardware SPI interface for Arduino - Copyright (c) 2018 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 -*/ - -#pragma once - -#include "Common.h" -#include -#include "Stream.h" - -#define SPI_HAS_TRANSACTION - -namespace arduino { - -typedef enum { - SPI_MODE0 = 0, - SPI_MODE1 = 1, - SPI_MODE2 = 2, - SPI_MODE3 = 3, -} SPIMode; - -// Platforms should define SPI_HAS_PERIPHERAL_MODE if SPI peripheral -// mode is supported, to allow applications to check whether peripheral -// mode is available or not. -typedef enum { - SPI_CONTROLLER = 0, - SPI_PERIPHERAL = 1, -} SPIBusMode; - - -class SPISettings { - public: - SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode = SPI_CONTROLLER) { - if (__builtin_constant_p(clock)) { - init_AlwaysInline(clock, bitOrder, dataMode, busMode); - } else { - init_MightInline(clock, bitOrder, dataMode, busMode); - } - } - - SPISettings(uint32_t clock, BitOrder bitOrder, int dataMode, SPIBusMode busMode = SPI_CONTROLLER) { - if (__builtin_constant_p(clock)) { - init_AlwaysInline(clock, bitOrder, static_cast(dataMode), busMode); - } else { - init_MightInline(clock, bitOrder, static_cast(dataMode), busMode); - } - } - - // Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first. - SPISettings() { init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0, SPI_CONTROLLER); } - - bool operator==(const SPISettings& rhs) const - { - if ((this->clockFreq == rhs.clockFreq) && - (this->bitOrder == rhs.bitOrder) && - (this->dataMode == rhs.dataMode) && - (this->busMode == rhs.busMode)) { - return true; - } - return false; - } - - bool operator!=(const SPISettings& rhs) const - { - return !(*this == rhs); - } - - uint32_t getClockFreq() const { - return clockFreq; - } - SPIMode getDataMode() const { - return dataMode; - } - BitOrder getBitOrder() const { - return (bitOrder); - } - SPIBusMode getBusMode() const { - return busMode; - } - - private: - void init_MightInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) { - init_AlwaysInline(clock, bitOrder, dataMode, busMode); - } - - // Core developer MUST use an helper function in beginTransaction() to use this data - void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) __attribute__((__always_inline__)) { - this->clockFreq = clock; - this->dataMode = dataMode; - this->bitOrder = bitOrder; - this->busMode = busMode; - } - - uint32_t clockFreq; - SPIMode dataMode; - BitOrder bitOrder; - SPIBusMode busMode; - - friend class HardwareSPI; -}; - -const SPISettings DEFAULT_SPI_SETTINGS = SPISettings(); - -class HardwareSPI -{ - public: - virtual ~HardwareSPI() { } - - virtual uint8_t transfer(uint8_t data) = 0; - virtual uint16_t transfer16(uint16_t data) = 0; - virtual void transfer(void *buf, size_t count) = 0; - - // Transaction Functions - virtual void usingInterrupt(int interruptNumber) = 0; - virtual void notUsingInterrupt(int interruptNumber) = 0; - virtual void beginTransaction(SPISettings settings) = 0; - virtual void endTransaction(void) = 0; - - // SPI Configuration methods - virtual void attachInterrupt() = 0; - virtual void detachInterrupt() = 0; - - virtual void begin() = 0; - virtual void end() = 0; -}; - -// Alias SPIClass to HardwareSPI since it's already the defacto standard for SPI class name -typedef HardwareSPI SPIClass; - -} diff --git a/api/api/HardwareSerial.h b/api/api/HardwareSerial.h deleted file mode 100644 index b687cdf1..00000000 --- a/api/api/HardwareSerial.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - HardwareSerial.h - Hardware serial interface for Arduino - Copyright (c) 2016 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 -*/ - -#pragma once - -#include -#include "Stream.h" - -namespace arduino { - -// XXX: Those constants should be defined as const int / enums? -// XXX: shall we use namespaces too? -#define SERIAL_PARITY_EVEN (0x1ul) -#define SERIAL_PARITY_ODD (0x2ul) -#define SERIAL_PARITY_NONE (0x3ul) -#define SERIAL_PARITY_MARK (0x4ul) -#define SERIAL_PARITY_SPACE (0x5ul) -#define SERIAL_PARITY_MASK (0xFul) - -#define SERIAL_STOP_BIT_1 (0x10ul) -#define SERIAL_STOP_BIT_1_5 (0x20ul) -#define SERIAL_STOP_BIT_2 (0x30ul) -#define SERIAL_STOP_BIT_MASK (0xF0ul) - -#define SERIAL_DATA_5 (0x100ul) -#define SERIAL_DATA_6 (0x200ul) -#define SERIAL_DATA_7 (0x300ul) -#define SERIAL_DATA_8 (0x400ul) -#define SERIAL_DATA_MASK (0xF00ul) - -#define SERIAL_5N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_5) -#define SERIAL_6N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_6) -#define SERIAL_7N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_7) -#define SERIAL_8N1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_NONE | SERIAL_DATA_8) -#define SERIAL_5N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_5) -#define SERIAL_6N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_6) -#define SERIAL_7N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_7) -#define SERIAL_8N2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_NONE | SERIAL_DATA_8) -#define SERIAL_5E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_5) -#define SERIAL_6E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_6) -#define SERIAL_7E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_7) -#define SERIAL_8E1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_EVEN | SERIAL_DATA_8) -#define SERIAL_5E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_5) -#define SERIAL_6E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_6) -#define SERIAL_7E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_7) -#define SERIAL_8E2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_EVEN | SERIAL_DATA_8) -#define SERIAL_5O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_5) -#define SERIAL_6O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_6) -#define SERIAL_7O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_7) -#define SERIAL_8O1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_ODD | SERIAL_DATA_8) -#define SERIAL_5O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_5) -#define SERIAL_6O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_6) -#define SERIAL_7O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_7) -#define SERIAL_8O2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_ODD | SERIAL_DATA_8) -#define SERIAL_5M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_5) -#define SERIAL_6M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_6) -#define SERIAL_7M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_7) -#define SERIAL_8M1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_MARK | SERIAL_DATA_8) -#define SERIAL_5M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_5) -#define SERIAL_6M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_6) -#define SERIAL_7M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_7) -#define SERIAL_8M2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_MARK | SERIAL_DATA_8) -#define SERIAL_5S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_5) -#define SERIAL_6S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_6) -#define SERIAL_7S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_7) -#define SERIAL_8S1 (SERIAL_STOP_BIT_1 | SERIAL_PARITY_SPACE | SERIAL_DATA_8) -#define SERIAL_5S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_5) -#define SERIAL_6S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_6) -#define SERIAL_7S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_7) -#define SERIAL_8S2 (SERIAL_STOP_BIT_2 | SERIAL_PARITY_SPACE | SERIAL_DATA_8) - -class HardwareSerial : public Stream -{ - public: - virtual void begin(unsigned long) = 0; - virtual void begin(unsigned long baudrate, uint16_t config) = 0; - virtual void end() = 0; - virtual int available(void) = 0; - virtual int peek(void) = 0; - virtual int read(void) = 0; - virtual void flush(void) = 0; - virtual size_t write(uint8_t) = 0; - using Print::write; // pull in write(str) and write(buf, size) from Print - virtual operator bool() = 0; -}; - -// XXX: Are we keeping the serialEvent API? -extern void serialEventRun(void) __attribute__((weak)); - -} \ No newline at end of file diff --git a/api/api/IPAddress.cpp b/api/api/IPAddress.cpp deleted file mode 100644 index 05b41bc1..00000000 --- a/api/api/IPAddress.cpp +++ /dev/null @@ -1,368 +0,0 @@ -/* - IPAddress.cpp - Base class that provides IPAddress - Copyright (c) 2011 Adrian McEwen. 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 -*/ - -#include "IPAddress.h" -#include "Print.h" - -using namespace arduino; - -IPAddress::IPAddress() : IPAddress(IPv4) {} - -IPAddress::IPAddress(IPType ip_type) -{ - _type = ip_type; - memset(_address.bytes, 0, sizeof(_address.bytes)); -} - -IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) -{ - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - _address.bytes[IPADDRESS_V4_BYTES_INDEX] = first_octet; - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1] = second_octet; - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2] = third_octet; - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = fourth_octet; -} - -IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16) { - _type = IPv6; - _address.bytes[0] = o1; - _address.bytes[1] = o2; - _address.bytes[2] = o3; - _address.bytes[3] = o4; - _address.bytes[4] = o5; - _address.bytes[5] = o6; - _address.bytes[6] = o7; - _address.bytes[7] = o8; - _address.bytes[8] = o9; - _address.bytes[9] = o10; - _address.bytes[10] = o11; - _address.bytes[11] = o12; - _address.bytes[12] = o13; - _address.bytes[13] = o14; - _address.bytes[14] = o15; - _address.bytes[15] = o16; -} - -IPAddress::IPAddress(uint32_t address) -{ - // IPv4 only - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; - - // NOTE on conversion/comparison and uint32_t: - // These conversions are host platform dependent. - // There is a defined integer representation of IPv4 addresses, - // based on network byte order (will be the value on big endian systems), - // e.g. http://2398766798 is the same as http://142.250.70.206, - // However on little endian systems the octets 0x83, 0xFA, 0x46, 0xCE, - // in that order, will form the integer (uint32_t) 3460758158 . -} - -IPAddress::IPAddress(const uint8_t *address) : IPAddress(IPv4, address) {} - -IPAddress::IPAddress(IPType ip_type, const uint8_t *address) -{ - _type = ip_type; - if (ip_type == IPv4) { - memset(_address.bytes, 0, sizeof(_address.bytes)); - memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); - } else { - memcpy(_address.bytes, address, sizeof(_address.bytes)); - } -} - -IPAddress::IPAddress(const char *address) -{ - fromString(address); -} - -String IPAddress::toString4() const -{ - char szRet[16]; - snprintf(szRet, sizeof(szRet), "%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]); - return String(szRet); -} - -String IPAddress::toString6() const -{ - char szRet[40]; - snprintf(szRet, sizeof(szRet), "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", - _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3], - _address.bytes[4], _address.bytes[5], _address.bytes[6], _address.bytes[7], - _address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11], - _address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]); - return String(szRet); -} - -String IPAddress::toString() const -{ - if (_type == IPv4) { - return toString4(); - } else { - return toString6(); - } -} - -bool IPAddress::fromString(const char *address) { - if (!fromString4(address)) { - return fromString6(address); - } - return true; -} - -bool IPAddress::fromString4(const char *address) -{ - // TODO: add support for "a", "a.b", "a.b.c" formats - - int16_t acc = -1; // Accumulator - uint8_t dots = 0; - - memset(_address.bytes, 0, sizeof(_address.bytes)); - while (*address) - { - char c = *address++; - if (c >= '0' && c <= '9') - { - acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0'); - if (acc > 255) { - // Value out of [0..255] range - return false; - } - } - else if (c == '.') - { - if (dots == 3) { - // Too many dots (there must be 3 dots) - return false; - } - if (acc < 0) { - /* No value between dots, e.g. '1..' */ - return false; - } - _address.bytes[IPADDRESS_V4_BYTES_INDEX + dots++] = acc; - acc = -1; - } - else - { - // Invalid char - return false; - } - } - - if (dots != 3) { - // Too few dots (there must be 3 dots) - return false; - } - if (acc < 0) { - /* No value between dots, e.g. '1..' */ - return false; - } - _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3] = acc; - _type = IPv4; - return true; -} - -bool IPAddress::fromString6(const char *address) { - uint32_t acc = 0; // Accumulator - int colons = 0, double_colons = -1; - - while (*address) - { - char c = tolower(*address++); - if (isalnum(c) && c <= 'f') { - if (c >= 'a') - c -= 'a' - '0' - 10; - acc = acc * 16 + (c - '0'); - if (acc > 0xffff) - // Value out of range - return false; - } - else if (c == ':') { - if (*address == ':') { - if (double_colons >= 0) { - // :: allowed once - return false; - } - if (*address != '\0' && *(address + 1) == ':') { - // ::: not allowed - return false; - } - // remember location - double_colons = colons + !!acc; - address++; - } else if (*address == '\0') { - // can't end with a single colon - return false; - } - if (colons == 7) - // too many separators - return false; - _address.bytes[colons * 2] = acc >> 8; - _address.bytes[colons * 2 + 1] = acc & 0xff; - colons++; - acc = 0; - } - else - // Invalid char - return false; - } - - if (double_colons == -1 && colons != 7) { - // Too few separators - return false; - } - if (double_colons > -1 && colons > 6) { - // Too many segments (double colon must be at least one zero field) - return false; - } - _address.bytes[colons * 2] = acc >> 8; - _address.bytes[colons * 2 + 1] = acc & 0xff; - colons++; - - if (double_colons != -1) { - for (int i = colons * 2 - double_colons * 2 - 1; i >= 0; i--) - _address.bytes[16 - colons * 2 + double_colons * 2 + i] = _address.bytes[double_colons * 2 + i]; - for (int i = double_colons * 2; i < 16 - colons * 2 + double_colons * 2; i++) - _address.bytes[i] = 0; - } - - _type = IPv6; - return true; -} - -IPAddress& IPAddress::operator=(const uint8_t *address) -{ - // IPv4 only conversion from byte pointer - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - memcpy(&_address.bytes[IPADDRESS_V4_BYTES_INDEX], address, sizeof(uint32_t)); - return *this; -} - -IPAddress& IPAddress::operator=(const char *address) -{ - fromString(address); - return *this; -} - -IPAddress& IPAddress::operator=(uint32_t address) -{ - // IPv4 conversion - // See note on conversion/comparison and uint32_t - _type = IPv4; - memset(_address.bytes, 0, sizeof(_address.bytes)); - _address.dword[IPADDRESS_V4_DWORD_INDEX] = address; - return *this; -} - -bool IPAddress::operator==(const IPAddress& addr) const { - return (addr._type == _type) - && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0); -} - -bool IPAddress::operator==(const uint8_t* addr) const -{ - // IPv4 only comparison to byte pointer - // Can't support IPv6 as we know our type, but not the length of the pointer - return _type == IPv4 && memcmp(addr, &_address.bytes[IPADDRESS_V4_BYTES_INDEX], sizeof(uint32_t)) == 0; -} - -uint8_t IPAddress::operator[](int index) const { - if (_type == IPv4) { - return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; - } - return _address.bytes[index]; -} - -uint8_t& IPAddress::operator[](int index) { - if (_type == IPv4) { - return _address.bytes[IPADDRESS_V4_BYTES_INDEX + index]; - } - return _address.bytes[index]; -} - -size_t IPAddress::printTo(Print& p) const -{ - size_t n = 0; - - if (_type == IPv6) { - // IPv6 IETF canonical format: compress left-most longest run of two or more zero fields, lower case - int8_t longest_start = -1; - int8_t longest_length = 1; - int8_t current_start = -1; - int8_t current_length = 0; - for (int8_t f = 0; f < 8; f++) { - if (_address.bytes[f * 2] == 0 && _address.bytes[f * 2 + 1] == 0) { - if (current_start == -1) { - current_start = f; - current_length = 1; - } else { - current_length++; - } - if (current_length > longest_length) { - longest_start = current_start; - longest_length = current_length; - } - } else { - current_start = -1; - } - } - for (int f = 0; f < 8; f++) { - if (f < longest_start || f >= longest_start + longest_length) { - uint8_t c1 = _address.bytes[f * 2] >> 4; - uint8_t c2 = _address.bytes[f * 2] & 0xf; - uint8_t c3 = _address.bytes[f * 2 + 1] >> 4; - uint8_t c4 = _address.bytes[f * 2 + 1] & 0xf; - if (c1 > 0) { - n += p.print((char)(c1 < 10 ? '0' + c1 : 'a' + c1 - 10)); - } - if (c1 > 0 || c2 > 0) { - n += p.print((char)(c2 < 10 ? '0' + c2 : 'a' + c2 - 10)); - } - if (c1 > 0 || c2 > 0 || c3 > 0) { - n += p.print((char)(c3 < 10 ? '0' + c3 : 'a' + c3 - 10)); - } - n += p.print((char)(c4 < 10 ? '0' + c4 : 'a' + c4 - 10)); - if (f < 7) { - n += p.print(':'); - } - } else if (f == longest_start) { - if (longest_start == 0) { - n += p.print(':'); - } - n += p.print(':'); - } - } - return n; - } - - // IPv4 - for (int i =0; i < 3; i++) - { - n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + i], DEC); - n += p.print('.'); - } - n += p.print(_address.bytes[IPADDRESS_V4_BYTES_INDEX + 3], DEC); - return n; -} - -const IPAddress arduino::IN6ADDR_ANY(IPv6); -const IPAddress arduino::INADDR_NONE(0,0,0,0); diff --git a/api/api/IPAddress.h b/api/api/IPAddress.h deleted file mode 100644 index 31a2d06d..00000000 --- a/api/api/IPAddress.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - IPAddress.h - Base class that provides IPAddress - Copyright (c) 2011 Adrian McEwen. 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 -*/ - -#pragma once - -#include -#include "Printable.h" -#include "String.h" - -#define IPADDRESS_V4_BYTES_INDEX 12 -#define IPADDRESS_V4_DWORD_INDEX 3 - -// forward declarations of global name space friend classes -class EthernetClass; -class DhcpClass; -class DNSClient; - -namespace arduino { - -// A class to make it easier to handle and pass around IP addresses - -enum IPType { - IPv4, - IPv6 -}; - -class IPAddress : public Printable { -private: - union { - uint8_t bytes[16]; - uint32_t dword[4]; - } _address; - IPType _type; - - // Access the raw byte array containing the address. Because this returns a pointer - // to the internal structure rather than a copy of the address this function should only - // be used when you know that the usage of the returned uint8_t* will be transient and not - // stored. - uint8_t* raw_address() { return _type == IPv4 ? &_address.bytes[IPADDRESS_V4_BYTES_INDEX] : _address.bytes; } - -public: - // Constructors - - // Default IPv4 - IPAddress(); - IPAddress(IPType ip_type); - IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); - IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16); - // IPv4; see implementation note - IPAddress(uint32_t address); - // Default IPv4 - IPAddress(const uint8_t *address); - IPAddress(IPType ip_type, const uint8_t *address); - // If IPv4 fails tries IPv6 see fromString function - IPAddress(const char *address); - - bool fromString(const char *address); - bool fromString(const String &address) { return fromString(address.c_str()); } - - // Overloaded cast operator to allow IPAddress objects to be used where a uint32_t is expected - // NOTE: IPv4 only; see implementation note - operator uint32_t() const { return _type == IPv4 ? _address.dword[IPADDRESS_V4_DWORD_INDEX] : 0; }; - - bool operator==(const IPAddress& addr) const; - bool operator!=(const IPAddress& addr) const { return !(*this == addr); }; - - // NOTE: IPv4 only; we don't know the length of the pointer - bool operator==(const uint8_t* addr) const; - - // Overloaded index operator to allow getting and setting individual octets of the address - uint8_t operator[](int index) const; - uint8_t& operator[](int index); - - // Overloaded copy operators to allow initialisation of IPAddress objects from other types - // NOTE: IPv4 only - IPAddress& operator=(const uint8_t *address); - // NOTE: IPv4 only; see implementation note - IPAddress& operator=(uint32_t address); - // If IPv4 fails tries IPv6 see fromString function - IPAddress& operator=(const char *address); - - virtual size_t printTo(Print& p) const; - String toString() const; - - IPType type() const { return _type; } - - friend class UDP; - friend class Client; - friend class Server; - - friend ::EthernetClass; - friend ::DhcpClass; - friend ::DNSClient; - -protected: - bool fromString4(const char *address); - bool fromString6(const char *address); - String toString4() const; - String toString6() const; -}; - -extern const IPAddress IN6ADDR_ANY; -extern const IPAddress INADDR_NONE; -} - -using arduino::IPAddress; \ No newline at end of file diff --git a/api/api/Interrupts.h b/api/api/Interrupts.h deleted file mode 100644 index b397eb7d..00000000 --- a/api/api/Interrupts.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - Interrupts.h - Arduino interrupt management functions - Copyright (c) 2018 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 -*/ - -#ifndef W_INTERRUPTS_CPP -#define W_INTERRUPTS_CPP -#ifdef __cplusplus - -#include -#include -#include -#include "Common.h" - -namespace arduino { - -template -using voidTemplateFuncPtrParam = void (*)(T param); - -template struct __container__ { - void* param; - voidTemplateFuncPtrParam function; -}; - -// C++ only overloaded version of attachInterrupt function -template void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam userFunc, PinStatus mode, T& param) { - - struct __container__ *cont = new __container__(); - cont->param = ¶m; - cont->function = userFunc; - - // TODO: check lambda scope - // TODO: add structure to delete(__container__) when detachInterrupt() is called - auto f = [](void* a) -> void - { - T param = *(static_cast((static_cast*>(a))->param)); - //T param = *(T*) ((struct __container__*)a)->param; - (static_cast*>)(a)->function(param); - - //(((struct __container__*)a)->function)(param); - }; - - attachInterruptParam(interruptNum, f, mode, cont); -} - -template void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam userFunc, PinStatus mode, T* param) { - //attachInterruptParam(interruptNum, (voidFuncPtrParam)userFunc, mode, (void*)param); - attachInterruptParam(interruptNum, static_cast(userFunc), mode, static_cast(param)) -} - -} -#endif -#endif diff --git a/api/api/PluggableUSB.cpp b/api/api/PluggableUSB.cpp deleted file mode 100644 index 977b4df4..00000000 --- a/api/api/PluggableUSB.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - PluggableUSB.cpp - Copyright (c) 2015 Arduino LLC - - 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 -*/ - -#include "USBAPI.h" -#include "PluggableUSB.h" - -using namespace arduino; - -int PluggableUSB_::getInterface(uint8_t* interfaceCount) -{ - int sent = 0; - PluggableUSBModule* node; - for (node = rootNode; node; node = node->next) { - int res = node->getInterface(interfaceCount); - if (res < 0) - return -1; - sent += res; - } - return sent; -} - -int PluggableUSB_::getDescriptor(USBSetup& setup) -{ - PluggableUSBModule* node; - for (node = rootNode; node; node = node->next) { - int ret = node->getDescriptor(setup); - // ret!=0 -> request has been processed - if (ret) - return ret; - } - return 0; -} - -void PluggableUSB_::getShortName(char *iSerialNum) -{ - PluggableUSBModule* node; - for (node = rootNode; node; node = node->next) { - iSerialNum += node->getShortName(iSerialNum); - } - *iSerialNum = 0; -} - -bool PluggableUSB_::setup(USBSetup& setup) -{ - PluggableUSBModule* node; - for (node = rootNode; node; node = node->next) { - if (node->setup(setup)) { - return true; - } - } - return false; -} - -bool PluggableUSB_::plug(PluggableUSBModule *node) -{ - if ((lastEp + node->numEndpoints) > totalEP) { - return false; - } - - if (!rootNode) { - rootNode = node; - } else { - PluggableUSBModule *current = rootNode; - while (current->next) { - current = current->next; - } - current->next = node; - } - - node->pluggedInterface = lastIf; - node->pluggedEndpoint = lastEp; - lastIf += node->numInterfaces; - for (uint8_t i = 0; i < node->numEndpoints; i++) { - *(static_cast(epBuffer(lastEp))) = node->endpointType[i]; - - //*(unsigned int*)(epBuffer(lastEp)) = node->endpointType[i]; - lastEp++; - } - return true; - // restart USB layer??? -} - -PluggableUSB_& PluggableUSB() -{ - static PluggableUSB_ obj; - return obj; -} \ No newline at end of file diff --git a/api/api/PluggableUSB.h b/api/api/PluggableUSB.h deleted file mode 100644 index 9018f6ce..00000000 --- a/api/api/PluggableUSB.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - PluggableUSB.h - Copyright (c) 2015 Arduino LLC - - 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 -*/ - -#ifndef PUSB_h -#define PUSB_h - -#include "USBAPI.h" -#include -#include - -namespace arduino { - -class PluggableUSBModule { -public: - PluggableUSBModule(uint8_t numEps, uint8_t numIfs, unsigned int *epType) : - numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType) - { } - -protected: - virtual bool setup(USBSetup& setup) = 0; - virtual int getInterface(uint8_t* interfaceCount) = 0; - virtual int getDescriptor(USBSetup& setup) = 0; - virtual uint8_t getShortName(char *name) { name[0] = 'A'+pluggedInterface; return 1; } - - uint8_t pluggedInterface; - uint8_t pluggedEndpoint; - - const uint8_t numEndpoints; - const uint8_t numInterfaces; - const unsigned int *endpointType; - - PluggableUSBModule *next = NULL; - - friend class PluggableUSB_; -}; - -class PluggableUSB_ { -public: - PluggableUSB_(); - bool plug(PluggableUSBModule *node); - int getInterface(uint8_t* interfaceCount); - int getDescriptor(USBSetup& setup); - bool setup(USBSetup& setup); - void getShortName(char *iSerialNum); - -private: - uint8_t lastIf; - uint8_t lastEp; - PluggableUSBModule* rootNode; - uint8_t totalEP; -}; -} - -// core need to define -void* epBuffer(unsigned int n); // -> returns a pointer to the Nth element of the EP buffer structure - -// Replacement for global singleton. -// This function prevents static-initialization-order-fiasco -// https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use -arduino::PluggableUSB_& PluggableUSB(); - -#endif \ No newline at end of file diff --git a/api/api/Print.cpp b/api/api/Print.cpp deleted file mode 100644 index 603fc468..00000000 --- a/api/api/Print.cpp +++ /dev/null @@ -1,388 +0,0 @@ -/* - Print.cpp - Base class that provides print() and println() - Copyright (c) 2014 Arduino. 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 -*/ - -#include -#include -#include -#include - -#include "Print.h" - -using namespace arduino; - -// Public Methods ////////////////////////////////////////////////////////////// - -/* default implementation: may be overridden */ -size_t Print::write(const uint8_t *buffer, size_t size) -{ - size_t n = 0; - while (size--) { - if (write(*buffer++)) n++; - else break; - } - return n; -} - -size_t Print::print(const __FlashStringHelper *ifsh) -{ -#if defined(__AVR__) - PGM_P p = reinterpret_cast(ifsh); - size_t n = 0; - while (1) { - unsigned char c = pgm_read_byte(p++); - if (c == 0) break; - if (write(c)) n++; - else break; - } - return n; -#else - return print(reinterpret_cast(ifsh)); -#endif -} - -size_t Print::print(const String &s) -{ - return write(s.c_str(), s.length()); -} - -size_t Print::print(const char str[]) -{ - return write(str); -} - -size_t Print::print(char c) -{ - return write(c); -} - -size_t Print::print(unsigned char b, int base) -{ - return print(static_cast(b), base); -} - -size_t Print::print(int n, int base) -{ - return print(static_cast(n), base); -} - -size_t Print::print(unsigned int n, int base) -{ - return print(static_cast(n), base); -} - -size_t Print::print(long n, int base) -{ - if (base == 0) { - return write(n); - } else if (base == 10) { - if (n < 0) { - int t = print('-'); - n = -n; - return printNumber(n, 10) + t; - } - return printNumber(n, 10); - } else { - return printNumber(n, base); - } -} - -size_t Print::print(unsigned long n, int base) -{ - if (base == 0) return write(n); - else return printNumber(n, base); -} - -size_t Print::print(long long n, int base) -{ - if (base == 0) { - return write(n); - } else if (base == 10) { - if (n < 0) { - int t = print('-'); - n = -n; - return printULLNumber(n, 10) + t; - } - return printULLNumber(n, 10); - } else { - return printULLNumber(n, base); - } -} - -size_t Print::print(unsigned long long n, int base) -{ - if (base == 0) return write(n); - else return printULLNumber(n, base); -} - -size_t Print::print(double n, int digits) -{ - return printFloat(n, digits); -} - -size_t Print::println(const __FlashStringHelper *ifsh) -{ - size_t n = print(ifsh); - n += println(); - return n; -} - -size_t Print::print(const Printable& x) -{ - return x.printTo(*this); -} - -size_t Print::println(void) -{ - return write("\r\n"); -} - -size_t Print::println(const String &s) -{ - size_t n = print(s); - n += println(); - return n; -} - -size_t Print::println(const char c[]) -{ - size_t n = print(c); - n += println(); - return n; -} - -size_t Print::println(char c) -{ - size_t n = print(c); - n += println(); - return n; -} - -size_t Print::println(unsigned char b, int base) -{ - size_t n = print(b, base); - n += println(); - return n; -} - -size_t Print::println(int num, int base) -{ - size_t n = print(num, base); - n += println(); - return n; -} - -size_t Print::println(unsigned int num, int base) -{ - size_t n = print(num, base); - n += println(); - return n; -} - -size_t Print::println(long num, int base) -{ - size_t n = print(num, base); - n += println(); - return n; -} - -size_t Print::println(unsigned long num, int base) -{ - size_t n = print(num, base); - n += println(); - return n; -} - -size_t Print::println(long long num, int base) -{ - size_t n = print(num, base); - n += println(); - return n; -} - -size_t Print::println(unsigned long long num, int base) -{ - size_t n = print(num, base); - n += println(); - return n; -} - -size_t Print::println(double num, int digits) -{ - size_t n = print(num, digits); - n += println(); - return n; -} - -size_t Print::println(const Printable& x) -{ - size_t n = print(x); - n += println(); - return n; -} - -// Private Methods ///////////////////////////////////////////////////////////// - -size_t Print::printNumber(unsigned long n, uint8_t base) -{ - char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte. - char *str = &buf[sizeof(buf) - 1]; - - *str = '\0'; - - // prevent crash if called with base == 1 - if (base < 2) base = 10; - - do { - char c = n % base; - n /= base; - - *--str = c < 10 ? c + '0' : c + 'A' - 10; - } while(n); - - return write(str); -} - -// REFERENCE IMPLEMENTATION FOR ULL -// size_t Print::printULLNumber(unsigned long long n, uint8_t base) -// { - // // if limited to base 10 and 16 the bufsize can be smaller - // char buf[65]; - // char *str = &buf[64]; - - // *str = '\0'; - - // // prevent crash if called with base == 1 - // if (base < 2) base = 10; - - // do { - // unsigned long long t = n / base; - // char c = n - t * base; // faster than c = n%base; - // n = t; - // *--str = c < 10 ? c + '0' : c + 'A' - 10; - // } while(n); - - // return write(str); -// } - -// FAST IMPLEMENTATION FOR ULL -size_t Print::printULLNumber(unsigned long long n64, uint8_t base) -{ - // if limited to base 10 and 16 the bufsize can be 20 - char buf[64]; - uint8_t i = 0; - uint8_t innerLoops = 0; - - // Special case workaround https://github.com/arduino/ArduinoCore-API/issues/178 - if (n64 == 0) { - write('0'); - return 1; - } - - // prevent crash if called with base == 1 - if (base < 2) base = 10; - - // process chunks that fit in "16 bit math". - uint16_t top = 0xFFFF / base; - uint16_t th16 = 1; - while (th16 < top) - { - th16 *= base; - innerLoops++; - } - - while (n64 > th16) - { - // 64 bit math part - uint64_t q = n64 / th16; - uint16_t r = n64 - q*th16; - n64 = q; - - // 16 bit math loop to do remainder. (note buffer is filled reverse) - for (uint8_t j=0; j < innerLoops; j++) - { - uint16_t qq = r/base; - buf[i++] = r - qq*base; - r = qq; - } - } - - uint16_t n16 = n64; - while (n16 > 0) - { - uint16_t qq = n16/base; - buf[i++] = n16 - qq*base; - n16 = qq; - } - - size_t bytes = i; - for (; i > 0; i--) - write((char) (buf[i - 1] < 10 ? - '0' + buf[i - 1] : - 'A' + buf[i - 1] - 10)); - - return bytes; -} - -size_t Print::printFloat(double number, int digits) -{ - if (digits < 0) - digits = 2; - - size_t n = 0; - - if (isnan(number)) return print("nan"); - if (isinf(number)) return print("inf"); - if (number > 4294967040.0) return print ("ovf"); // constant determined empirically - if (number <-4294967040.0) return print ("ovf"); // constant determined empirically - - // Handle negative numbers - if (number < 0.0) - { - n += print('-'); - number = -number; - } - - // Round correctly so that print(1.999, 2) prints as "2.00" - double rounding = 0.5; - for (uint8_t i=0; i(number); - double remainder = number - static_cast(int_part); - n += print(int_part); - - // Print the decimal point, but only if there are digits beyond - if (digits > 0) { - n += print("."); - } - - // Extract digits from the remainder one at a time - while (digits-- > 0) - { - remainder *= 10.0; - unsigned int toPrint = static_cast(remainder); - n += print(toPrint); - remainder -= toPrint; - } - - return n; -} diff --git a/api/api/Print.h b/api/api/Print.h deleted file mode 100644 index 89e857ed..00000000 --- a/api/api/Print.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - Print.h - Base class that provides print() and println() - Copyright (c) 2016 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 -*/ - -#pragma once - -#include -#include // for size_t - -#include "String.h" -#include "Printable.h" - -#define DEC 10 -#define HEX 16 -#define OCT 8 -#define BIN 2 - -namespace arduino { - -class Print -{ - private: - int write_error; - size_t printNumber(unsigned long, uint8_t); - size_t printULLNumber(unsigned long long, uint8_t); - size_t printFloat(double, int); - protected: - void setWriteError(int err = 1) { write_error = err; } - public: - Print() : write_error(0) {} - - int getWriteError() { return write_error; } - void clearWriteError() { setWriteError(0); } - - virtual size_t write(uint8_t) = 0; - size_t write(const char *str) { - if (str == NULL) return 0; - return write(reinterpret_cast(str), strlen(str)); - } - virtual size_t write(const uint8_t *buffer, size_t size); - size_t write(const char *buffer, size_t size) { - return write(reinterpret_cast(buffer), size); - } - - // default to zero, meaning "a single write may block" - // should be overridden by subclasses with buffering - virtual int availableForWrite() { return 0; } - - size_t print(const __FlashStringHelper *); - size_t print(const String &); - size_t print(const char[]); - size_t print(char); - size_t print(unsigned char, int = DEC); - size_t print(int, int = DEC); - size_t print(unsigned int, int = DEC); - size_t print(long, int = DEC); - size_t print(unsigned long, int = DEC); - size_t print(long long, int = DEC); - size_t print(unsigned long long, int = DEC); - size_t print(double, int = 2); - size_t print(const Printable&); - - size_t println(const __FlashStringHelper *); - size_t println(const String &s); - size_t println(const char[]); - size_t println(char); - size_t println(unsigned char, int = DEC); - size_t println(int, int = DEC); - size_t println(unsigned int, int = DEC); - size_t println(long, int = DEC); - size_t println(unsigned long, int = DEC); - size_t println(long long, int = DEC); - size_t println(unsigned long long, int = DEC); - size_t println(double, int = 2); - size_t println(const Printable&); - size_t println(void); - - virtual void flush() { /* Empty implementation for backward compatibility */ } -}; - -} -using arduino::Print; \ No newline at end of file diff --git a/api/api/Printable.h b/api/api/Printable.h deleted file mode 100644 index 850c8d21..00000000 --- a/api/api/Printable.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Printable.h - Interface for classes that can be printed via Print - Copyright (c) 2016 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 -*/ - -#pragma once - -#include - -namespace arduino { - -class Print; - -/** The Printable class provides a way for new classes to allow themselves to be printed. - By deriving from Printable and implementing the printTo method, it will then be possible - for users to print out instances of this class by passing them into the usual - Print::print and Print::println methods. -*/ - -class Printable -{ - public: - virtual size_t printTo(Print& p) const = 0; -}; - -} \ No newline at end of file diff --git a/api/api/RingBuffer.h b/api/api/RingBuffer.h deleted file mode 100644 index b1ad1cae..00000000 --- a/api/api/RingBuffer.h +++ /dev/null @@ -1,142 +0,0 @@ -/* - RingBuffer.h - Ring buffer implementation - Copyright (c) 2014 Arduino. 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 -*/ - -#ifdef __cplusplus - -#ifndef _RING_BUFFER_ -#define _RING_BUFFER_ - -#include -#include - -namespace arduino { - -// Define constants and variables for buffering incoming serial data. We're -// using a ring buffer (I think), in which head is the index of the location -// to which to write the next incoming character and tail is the index of the -// location from which to read. -#define SERIAL_BUFFER_SIZE 64 - -template -class RingBufferN -{ - public: - uint8_t _aucBuffer[N] ; - volatile int _iHead ; - volatile int _iTail ; - volatile int _numElems; - - public: - RingBufferN( void ) ; - void store_char( uint8_t c ) ; - void clear(); - int read_char(); - int available(); - int availableForStore(); - int peek(); - bool isFull(); - - private: - int nextIndex(int index); - inline bool isEmpty() const { return (_numElems == 0); } -}; - -typedef RingBufferN RingBuffer; - - -template -RingBufferN::RingBufferN( void ) -{ - memset( _aucBuffer, 0, N ) ; - clear(); -} - -template -void RingBufferN::store_char( uint8_t c ) -{ - // if we should be storing the received character into the location - // just before the tail (meaning that the head would advance to the - // current location of the tail), we're about to overflow the buffer - // and so we don't write the character or advance the head. - if (!isFull()) - { - _aucBuffer[_iHead] = c ; - _iHead = nextIndex(_iHead); - _numElems = _numElems + 1; - } -} - -template -void RingBufferN::clear() -{ - _iHead = 0; - _iTail = 0; - _numElems = 0; -} - -template -int RingBufferN::read_char() -{ - if (isEmpty()) - return -1; - - uint8_t value = _aucBuffer[_iTail]; - _iTail = nextIndex(_iTail); - _numElems = _numElems - 1; - - return value; -} - -template -int RingBufferN::available() -{ - return _numElems; -} - -template -int RingBufferN::availableForStore() -{ - return (N - _numElems); -} - -template -int RingBufferN::peek() -{ - if (isEmpty()) - return -1; - - return _aucBuffer[_iTail]; -} - -template -int RingBufferN::nextIndex(int index) -{ - return static_cast(index + 1) % N; -} - -template -bool RingBufferN::isFull() -{ - return (_numElems == N); -} - -} - -#endif /* _RING_BUFFER_ */ -#endif /* __cplusplus */ diff --git a/api/api/Server.h b/api/api/Server.h deleted file mode 100644 index 83d0cd3b..00000000 --- a/api/api/Server.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Server.h - Base class that provides Server - Copyright (c) 2011 Adrian McEwen. 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 -*/ - -#pragma once - -#include "Print.h" - -namespace arduino { - -class Server : public Print { - public: - virtual void begin() = 0; -}; - -} \ No newline at end of file diff --git a/api/api/Stream.cpp b/api/api/Stream.cpp deleted file mode 100644 index f6f9bda6..00000000 --- a/api/api/Stream.cpp +++ /dev/null @@ -1,321 +0,0 @@ -/* - Stream.cpp - adds parsing methods to Stream class - Copyright (c) 2008 David A. Mellis. 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 - - Created July 2011 - parsing functions based on TextFinder library by Michael Margolis - - findMulti/findUntil routines written by Jim Leonard/Xuth - */ - -#include "Common.h" -#include "Stream.h" - -#define PARSE_TIMEOUT 1000 // default number of milli-seconds to wait - -using namespace arduino; - -// private method to read stream with timeout -int Stream::timedRead() -{ - int c; - _startMillis = millis(); - do { - c = read(); - if (c >= 0) return c; - } while(millis() - _startMillis < _timeout); - return -1; // -1 indicates timeout -} - -// private method to peek stream with timeout -int Stream::timedPeek() -{ - int c; - _startMillis = millis(); - do { - c = peek(); - if (c >= 0) return c; - } while(millis() - _startMillis < _timeout); - return -1; // -1 indicates timeout -} - -// returns peek of the next digit in the stream or -1 if timeout -// discards non-numeric characters -int Stream::peekNextDigit(LookaheadMode lookahead, bool detectDecimal) -{ - int c; - while (1) { - c = timedPeek(); - - if( c < 0 || - c == '-' || - (c >= '0' && c <= '9') || - (detectDecimal && c == '.')) return c; - - switch( lookahead ){ - case SKIP_NONE: return -1; // Fail code. - case SKIP_WHITESPACE: - switch( c ){ - case ' ': - case '\t': - case '\r': - case '\n': break; - default: return -1; // Fail code. - } - case SKIP_ALL: - break; - } - read(); // discard non-numeric - } -} - -// Public Methods -////////////////////////////////////////////////////////////// - -void Stream::setTimeout(unsigned long timeout) // sets the maximum number of milliseconds to wait -{ - _timeout = timeout; -} - - // find returns true if the target string is found -bool Stream::find(const char *target) -{ - return findUntil(target, strlen(target), NULL, 0); -} - -// reads data from the stream until the target string of given length is found -// returns true if target string is found, false if timed out -bool Stream::find(const char *target, size_t length) -{ - return findUntil(target, length, NULL, 0); -} - -// as find but search ends if the terminator string is found -bool Stream::findUntil(const char *target, const char *terminator) -{ - return findUntil(target, strlen(target), terminator, strlen(terminator)); -} - -// reads data from the stream until the target string of the given length is found -// search terminated if the terminator string is found -// returns true if target string is found, false if terminated or timed out -bool Stream::findUntil(const char *target, size_t targetLen, const char *terminator, size_t termLen) -{ - if (terminator == NULL) { - MultiTarget t[1] = {{target, targetLen, 0}}; - return findMulti(t, 1) == 0; - } else { - MultiTarget t[2] = {{target, targetLen, 0}, {terminator, termLen, 0}}; - return findMulti(t, 2) == 0; - } -} - -// returns the first valid (long) integer value from the current position. -// lookahead determines how parseInt looks ahead in the stream. -// See LookaheadMode enumeration at the top of the file. -// Lookahead is terminated by the first character that is not a valid part of an integer. -// Once parsing commences, 'ignore' will be skipped in the stream. -long Stream::parseInt(LookaheadMode lookahead, char ignore) -{ - bool isNegative = false; - long value = 0; - int c; - - c = peekNextDigit(lookahead, false); - // ignore non numeric leading characters - if(c < 0) - return 0; // zero returned if timeout - - do{ - if((char)c == ignore) - ; // ignore this character - else if(c == '-') - isNegative = true; - else if(c >= '0' && c <= '9') // is c a digit? - value = value * 10 + c - '0'; - read(); // consume the character we got with peek - c = timedPeek(); - } - while( (c >= '0' && c <= '9') || (char)c == ignore ); - - if(isNegative) - value = -value; - return value; -} - -// as parseInt but returns a floating point value -float Stream::parseFloat(LookaheadMode lookahead, char ignore) -{ - bool isNegative = false; - bool isFraction = false; - double value = 0.0; - int c; - double fraction = 1.0; - - c = peekNextDigit(lookahead, true); - // ignore non numeric leading characters - if(c < 0) - return 0; // zero returned if timeout - - do{ - if((char)c == ignore) - ; // ignore - else if(c == '-') - isNegative = true; - else if (c == '.') - isFraction = true; - else if(c >= '0' && c <= '9') { // is c a digit? - if(isFraction) { - fraction *= 0.1; - value = value + fraction * (c - '0'); - } else { - value = value * 10 + c - '0'; - } - } - read(); // consume the character we got with peek - c = timedPeek(); - } - while( (c >= '0' && c <= '9') || (c == '.' && !isFraction) || (char)c == ignore ); - - if(isNegative) - value = -value; - - return value; -} - -// read characters from stream into buffer -// terminates if length characters have been read, or timeout (see setTimeout) -// returns the number of characters placed in the buffer -// the buffer is NOT null terminated. -// -size_t Stream::readBytes(char *buffer, size_t length) -{ - size_t count = 0; - while (count < length) { - int c = timedRead(); - if (c < 0) break; - *buffer++ = (char)c; - count++; - } - return count; -} - - -// as readBytes with terminator character -// terminates if length characters have been read, timeout, or if the terminator character detected -// returns the number of characters placed in the buffer (0 means no valid data found) - -size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length) -{ - size_t index = 0; - while (index < length) { - int c = timedRead(); - if (c < 0 || (char)c == terminator) break; - *buffer++ = (char)c; - index++; - } - return index; // return number of characters, not including null terminator -} - -String Stream::readString() -{ - String ret; - int c = timedRead(); - while (c >= 0) - { - ret += (char)c; - c = timedRead(); - } - return ret; -} - -String Stream::readStringUntil(char terminator) -{ - String ret; - int c = timedRead(); - while (c >= 0 && (char)c != terminator) - { - ret += (char)c; - c = timedRead(); - } - return ret; -} - -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) { - if (t->len <= 0) - return t - targets; - } - - 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 ((char)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; - - int origIndex = t->index; - do { - --t->index; - // first check if current char works against the new current index - if ((char)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; -} diff --git a/api/api/Stream.h b/api/api/Stream.h deleted file mode 100644 index 10b42852..00000000 --- a/api/api/Stream.h +++ /dev/null @@ -1,133 +0,0 @@ -/* - Stream.h - base class for character-based streams. - Copyright (c) 2010 David A. Mellis. 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 - - parsing functions based on TextFinder library by Michael Margolis -*/ - -#pragma once - -#include -#include "Print.h" - -// compatibility macros for testing -/* -#define getInt() parseInt() -#define getInt(ignore) parseInt(ignore) -#define getFloat() parseFloat() -#define getFloat(ignore) parseFloat(ignore) -#define getString( pre_string, post_string, buffer, length) -readBytesBetween( pre_string, terminator, buffer, length) -*/ - -namespace arduino { - -// This enumeration provides the lookahead options for parseInt(), parseFloat() -// The rules set out here are used until either the first valid character is found -// or a time out occurs due to lack of input. -enum LookaheadMode{ - SKIP_ALL, // All invalid characters are ignored. - SKIP_NONE, // Nothing is skipped, and the stream is not touched unless the first waiting character is valid. - SKIP_WHITESPACE // Only tabs, spaces, line feeds & carriage returns are skipped. -}; - -#define NO_IGNORE_CHAR '\x01' // a char not found in a valid ASCII numeric field - -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 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; - - Stream() {_timeout=1000;} - -// 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(const char *target); // reads data from the stream until the target string is found - bool find(const uint8_t *target) { return find (reinterpret_cast(target)); } - // returns true if target string is found, false if timed out (see setTimeout) - - bool find(const char *target, size_t length); // reads data from the stream until the target string of given length is found - bool find(const uint8_t *target, size_t length) { return find (reinterpret_cast(target), length); } - // returns true if target string is found, false if timed out - - bool find(char target) { return find (&target, 1); } - - bool findUntil(const char *target, const char *terminator); // as find but search ends if the terminator string is found - bool findUntil(const uint8_t *target, const char *terminator) { return findUntil(reinterpret_cast(target), terminator); } - - bool findUntil(const char *target, size_t targetLen, const char *terminate, size_t termLen); // as above but search ends if the terminate string is found - bool findUntil(const uint8_t *target, size_t targetLen, const char *terminate, size_t termLen) {return findUntil(reinterpret_cast(target), targetLen, terminate, termLen); } - - long parseInt(LookaheadMode lookahead = SKIP_ALL, char ignore = NO_IGNORE_CHAR); - // returns the first valid (long) integer value from the current position. - // lookahead determines how parseInt looks ahead in the stream. - // See LookaheadMode enumeration at the top of the file. - // Lookahead is terminated by the first character that is not a valid part of an integer. - // Once parsing commences, 'ignore' will be skipped in the stream. - - float parseFloat(LookaheadMode lookahead = SKIP_ALL, char ignore = NO_IGNORE_CHAR); - // float version of parseInt - - size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer - size_t readBytes( uint8_t *buffer, size_t length) { return readBytes(reinterpret_cast(buffer), length); } - // terminates if length characters have been read or timeout (see setTimeout) - // returns the number of characters placed in the buffer (0 means no valid data found) - - size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character - size_t readBytesUntil( char terminator, uint8_t *buffer, size_t length) { return readBytesUntil(terminator, reinterpret_cast(buffer), length); } - // terminates if length characters have been read, timeout, or if the terminator character detected - // returns the number of characters placed in the buffer (0 means no valid data found) - - // Arduino String functions to be added here - String readString(); - String readStringUntil(char terminator); - - protected: - long parseInt(char ignore) { return parseInt(SKIP_ALL, ignore); } - float parseFloat(char ignore) { return parseFloat(SKIP_ALL, ignore); } - // These overload exists for compatibility with any class that has derived - // Stream and used parseFloat/Int with a custom ignore character. To keep - // the public API simple, these overload remains protected. - - struct MultiTarget { - const char *str; // string you're searching for - size_t len; // length of string you're searching for - size_t index; // index used by the search routine. - }; - - // This allows you to search for an arbitrary number of strings. - // Returns index of the target that is found first or -1 if timeout occurs. - int findMulti(struct MultiTarget *targets, int tCount); -}; - -#undef NO_IGNORE_CHAR - -} - -using arduino::Stream; \ No newline at end of file diff --git a/api/api/String.cpp b/api/api/String.cpp deleted file mode 100644 index 8b995cfa..00000000 --- a/api/api/String.cpp +++ /dev/null @@ -1,750 +0,0 @@ -/* - String library for Wiring & Arduino - ...mostly rewritten by Paul Stoffregen... - Copyright (c) 2009-10 Hernando Barragan. All rights reserved. - Copyright 2011, Paul Stoffregen, paul@pjrc.com - - 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 -*/ - -#include "String.h" -#include "Common.h" -#include "itoa.h" -#include "deprecated-avr-comp/avr/dtostrf.h" - -#include - -namespace arduino { - -/*********************************************/ -/* Static Member Initialisation */ -/*********************************************/ - -size_t const String::FLT_MAX_DECIMAL_PLACES; -size_t const String::DBL_MAX_DECIMAL_PLACES; - -/*********************************************/ -/* Constructors */ -/*********************************************/ - -String::String(const char *cstr) -{ - init(); - if (cstr) copy(cstr, strlen(cstr)); -} - -String::String(const char *cstr, unsigned int length) -{ - init(); - if (cstr) copy(cstr, length); -} - -String::String(const String &value) -{ - init(); - *this = value; -} - -String::String(const __FlashStringHelper *pstr) -{ - init(); - *this = pstr; -} - -String::String(String &&rval) - : buffer(rval.buffer) - , capacity(rval.capacity) - , len(rval.len) -{ - rval.buffer = NULL; - rval.capacity = 0; - rval.len = 0; -} - -String::String(char c) -{ - init(); - char buf[2]; - buf[0] = c; - buf[1] = 0; - *this = buf; -} - -String::String(unsigned char value, unsigned char base) -{ - init(); - char buf[1 + 8 * sizeof(unsigned char)]; - utoa(value, buf, base); - *this = buf; -} - -String::String(int value, unsigned char base) -{ - init(); - char buf[2 + 8 * sizeof(int)]; - itoa(value, buf, base); - *this = buf; -} - -String::String(unsigned int value, unsigned char base) -{ - init(); - char buf[1 + 8 * sizeof(unsigned int)]; - utoa(value, buf, base); - *this = buf; -} - -String::String(long value, unsigned char base) -{ - init(); - char buf[2 + 8 * sizeof(long)]; - ltoa(value, buf, base); - *this = buf; -} - -String::String(unsigned long value, unsigned char base) -{ - init(); - char buf[1 + 8 * sizeof(unsigned long)]; - ultoa(value, buf, base); - *this = buf; -} - -String::String(float value, unsigned char decimalPlaces) -{ - static size_t const FLOAT_BUF_SIZE = FLT_MAX_10_EXP + FLT_MAX_DECIMAL_PLACES + 1 /* '-' */ + 1 /* '.' */ + 1 /* '\0' */; - init(); - char buf[FLOAT_BUF_SIZE]; - decimalPlaces = min(decimalPlaces, FLT_MAX_DECIMAL_PLACES); - *this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf); -} - -String::String(double value, unsigned char decimalPlaces) -{ - static size_t const DOUBLE_BUF_SIZE = DBL_MAX_10_EXP + DBL_MAX_DECIMAL_PLACES + 1 /* '-' */ + 1 /* '.' */ + 1 /* '\0' */; - init(); - char buf[DOUBLE_BUF_SIZE]; - decimalPlaces = min(decimalPlaces, DBL_MAX_DECIMAL_PLACES); - *this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf); -} - -String::~String() -{ - if (buffer) free(buffer); -} - -/*********************************************/ -/* Memory Management */ -/*********************************************/ - -inline void String::init(void) -{ - buffer = NULL; - capacity = 0; - len = 0; -} - -void String::invalidate(void) -{ - if (buffer) free(buffer); - buffer = NULL; - capacity = len = 0; -} - -bool String::reserve(unsigned int size) -{ - if (buffer && capacity >= size) return 1; - if (changeBuffer(size)) { - if (len == 0) buffer[0] = 0; - return true; - } - return false; -} - -bool String::changeBuffer(unsigned int maxStrLen) -{ - char *newbuffer = static_cast(realloc(buffer, maxStrLen + 1)); - if (newbuffer) { - buffer = newbuffer; - capacity = maxStrLen; - return true; - } - return false; -} - -/*********************************************/ -/* Copy and Move */ -/*********************************************/ - -String & String::copy(const char *cstr, unsigned int length) -{ - if (!reserve(length)) { - invalidate(); - return *this; - } - len = length; - memcpy(buffer, cstr, length); - buffer[len] = '\0'; - return *this; -} - -String & String::copy(const __FlashStringHelper *pstr, unsigned int length) -{ - if (!reserve(length)) { - invalidate(); - return *this; - } - len = length; - strcpy_P(buffer, reinterpret_cast(pstr)); - return *this; -} - -void String::move(String &rhs) -{ - if (this != &rhs) - { - free(buffer); - - buffer = rhs.buffer; - len = rhs.len; - capacity = rhs.capacity; - - rhs.buffer = NULL; - rhs.len = 0; - rhs.capacity = 0; - } -} - -String & String::operator = (const String &rhs) -{ - if (this == &rhs) return *this; - - if (rhs.buffer) copy(rhs.buffer, rhs.len); - else invalidate(); - - return *this; -} - -String & String::operator = (String &&rval) -{ - move(rval); - return *this; -} - -String & String::operator = (const char *cstr) -{ - if (cstr) copy(cstr, strlen(cstr)); - else invalidate(); - - return *this; -} - -String & String::operator = (const __FlashStringHelper *pstr) -{ - if (pstr) copy(pstr, strlen_P(reinterpret_cast(pstr))); - else invalidate(); - - return *this; -} - -/*********************************************/ -/* concat */ -/*********************************************/ - -bool String::concat(const String &s) -{ - return concat(s.buffer, s.len); -} - -bool String::concat(const char *cstr, unsigned int length) -{ - unsigned int newlen = len + length; - if (!cstr) return false; - if (length == 0) return true; - if (!reserve(newlen)) return false; - memcpy(buffer + len, cstr, length); - len = newlen; - buffer[len] = '\0'; - return true; -} - -bool String::concat(const char *cstr) -{ - if (!cstr) return false; - return concat(cstr, strlen(cstr)); -} - -bool String::concat(char c) -{ - return concat(&c, 1); -} - -bool String::concat(unsigned char num) -{ - char buf[1 + 3 * sizeof(unsigned char)]; - itoa(num, buf, 10); - return concat(buf); -} - -bool String::concat(int num) -{ - char buf[2 + 3 * sizeof(int)]; - itoa(num, buf, 10); - return concat(buf); -} - -bool String::concat(unsigned int num) -{ - char buf[1 + 3 * sizeof(unsigned int)]; - utoa(num, buf, 10); - return concat(buf); -} - -bool String::concat(long num) -{ - char buf[2 + 3 * sizeof(long)]; - ltoa(num, buf, 10); - return concat(buf); -} - -bool String::concat(unsigned long num) -{ - char buf[1 + 3 * sizeof(unsigned long)]; - ultoa(num, buf, 10); - return concat(buf); -} - -bool String::concat(float num) -{ - char buf[20]; - char* string = dtostrf(num, 4, 2, buf); - return concat(string); -} - -bool String::concat(double num) -{ - char buf[20]; - char* string = dtostrf(num, 4, 2, buf); - return concat(string); -} - -bool String::concat(const __FlashStringHelper * str) -{ - if (!str) return false; - int length = strlen_P(reinterpret_cast(str)); - if (length == 0) return true; - unsigned int newlen = len + length; - if (!reserve(newlen)) return false; - strcpy_P(buffer + len, reinterpret_cast(str)); - len = newlen; - return true; -} - -/*********************************************/ -/* Concatenate */ -/*********************************************/ - -StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(rhs.buffer, rhs.len)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr) -{ - StringSumHelper &a = const_cast(lhs); - if (!cstr || !a.concat(cstr)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, char c) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(c)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, int num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, long num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, float num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, double num) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(num)) a.invalidate(); - return a; -} - -StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs) -{ - StringSumHelper &a = const_cast(lhs); - if (!a.concat(rhs)) a.invalidate(); - return a; -} - -/*********************************************/ -/* Comparison */ -/*********************************************/ - -int String::compareTo(const String &s) const -{ - if (!buffer || !s.buffer) { - if (s.buffer && s.len > 0) return 0 - *(reinterpret_cast(s.buffer)); - if (buffer && len > 0) return *(reinterpret_cast(buffer)); - return 0; - } - return strcmp(buffer, s.buffer); -} - -int String::compareTo(const char *cstr) const -{ - if (!buffer || !cstr) { - if (cstr && *cstr) return 0 - *(const_cast(reinterpret_cast(cstr))); - if (buffer && len > 0) return *(reinterpret_cast(buffer)); - return 0; - } - return strcmp(buffer, cstr); -} - -bool String::equals(const String &s2) const -{ - return (len == s2.len && compareTo(s2) == 0); -} - -bool String::equals(const char *cstr) const -{ - if (len == 0) return (cstr == NULL || *cstr == 0); - if (cstr == NULL) return buffer[0] == 0; - return strcmp(buffer, cstr) == 0; -} - -bool String::equalsIgnoreCase( const String &s2 ) const -{ - if (this == &s2) return true; - if (len != s2.len) return false; - if (len == 0) return true; - const char *p1 = buffer; - const char *p2 = s2.buffer; - while (*p1) { - if (tolower(*p1++) != tolower(*p2++)) return false; - } - return true; -} - -bool String::startsWith( const String &s2 ) const -{ - if (len < s2.len) return false; - return startsWith(s2, 0); -} - -bool String::startsWith( const String &s2, unsigned int offset ) const -{ - if (offset > len - s2.len || !buffer || !s2.buffer) return false; - return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0; -} - -bool String::endsWith( const String &s2 ) const -{ - if ( len < s2.len || !buffer || !s2.buffer) return false; - return strcmp(&buffer[len - s2.len], s2.buffer) == 0; -} - -/*********************************************/ -/* Character Access */ -/*********************************************/ - -char String::charAt(unsigned int loc) const -{ - return operator[](loc); -} - -void String::setCharAt(unsigned int loc, char c) -{ - if (loc < len) buffer[loc] = c; -} - -char & String::operator[](unsigned int index) -{ - static char dummy_writable_char; - if (index >= len || !buffer) { - dummy_writable_char = 0; - return dummy_writable_char; - } - return buffer[index]; -} - -char String::operator[]( unsigned int index ) const -{ - if (index >= len || !buffer) return 0; - return buffer[index]; -} - -void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const -{ - if (!bufsize || !buf) return; - if (index >= len) { - buf[0] = 0; - return; - } - unsigned int n = bufsize - 1; - if (n > len - index) n = len - index; - strncpy(reinterpret_cast(buf), buffer + index, n); - buf[n] = 0; -} - -/*********************************************/ -/* Search */ -/*********************************************/ - -int String::indexOf(char c) const -{ - return indexOf(c, 0); -} - -int String::indexOf( char ch, unsigned int fromIndex ) const -{ - if (fromIndex >= len) return -1; - const char* temp = strchr(buffer + fromIndex, ch); - if (temp == NULL) return -1; - return temp - buffer; -} - -int String::indexOf(const String &s2) const -{ - return indexOf(s2, 0); -} - -int String::indexOf(const String &s2, unsigned int fromIndex) const -{ - if (fromIndex >= len) return -1; - const char *found = strstr(buffer + fromIndex, s2.buffer); - if (found == NULL) return -1; - return found - buffer; -} - -int String::lastIndexOf( char theChar ) const -{ - return lastIndexOf(theChar, len - 1); -} - -int String::lastIndexOf(char ch, unsigned int fromIndex) const -{ - if (fromIndex >= len) return -1; - char tempchar = buffer[fromIndex + 1]; - buffer[fromIndex + 1] = '\0'; - char* temp = strrchr( buffer, ch ); - buffer[fromIndex + 1] = tempchar; - if (temp == NULL) return -1; - return temp - buffer; -} - -int String::lastIndexOf(const String &s2) const -{ - return lastIndexOf(s2, len - s2.len); -} - -int String::lastIndexOf(const String &s2, unsigned int fromIndex) const -{ - if (s2.len == 0 || len == 0 || s2.len > len) return -1; - if (fromIndex >= len) fromIndex = len - 1; - int found = -1; - for (char *p = buffer; p <= buffer + fromIndex; p++) { - p = strstr(p, s2.buffer); - if (!p) break; - if (static_cast(p - buffer) <= fromIndex) found = p - buffer; - } - return found; -} - -String String::substring(unsigned int left, unsigned int right) const -{ - if (left > right) { - unsigned int temp = right; - right = left; - left = temp; - } - String out; - if (left >= len) return out; - if (right > len) right = len; - out.copy(buffer + left, right - left); - return out; -} - -/*********************************************/ -/* Modification */ -/*********************************************/ - -void String::replace(char find, char replace) -{ - if (!buffer) return; - for (char *p = buffer; *p; p++) { - if (*p == find) *p = replace; - } -} - -void String::replace(const String& find, const String& replace) -{ - if (len == 0 || find.len == 0) return; - int diff = replace.len - find.len; - char *readFrom = buffer; - char *foundAt; - if (diff == 0) { - while ((foundAt = strstr(readFrom, find.buffer)) != NULL) { - memcpy(foundAt, replace.buffer, replace.len); - readFrom = foundAt + replace.len; - } - } else if (diff < 0) { - unsigned int size = len; // compute size needed for result - diff = 0 - diff; - while ((foundAt = strstr(readFrom, find.buffer)) != NULL) { - readFrom = foundAt + find.len; - size -= diff; - } - if (size == len) return; - int index = len - 1; - while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) { - readFrom = buffer + index + find.len; - memmove(readFrom - diff, readFrom, len - (readFrom - buffer)); - len -= diff; - buffer[len] = 0; - memcpy(buffer + index, replace.buffer, replace.len); - index--; - } - } else { - unsigned int size = len; // compute size needed for result - while ((foundAt = strstr(readFrom, find.buffer)) != NULL) { - readFrom = foundAt + find.len; - size += diff; - } - if (size == len) return; - if (size > capacity && !changeBuffer(size)) return; // XXX: tell user! - int index = len - 1; - while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) { - readFrom = buffer + index + find.len; - memmove(readFrom + diff, readFrom, len - (readFrom - buffer)); - len += diff; - buffer[len] = 0; - memcpy(buffer + index, replace.buffer, replace.len); - index--; - } - } -} - -void String::remove(unsigned int index){ - // Pass the biggest integer as the count. The remove method - // below will take care of truncating it at the end of the - // string. - remove(index, static_cast(-1)); -} - -void String::remove(unsigned int index, unsigned int count){ - if (index >= len) { return; } - if (count <= 0) { return; } - if (count > len - index) { count = len - index; } - char *writeTo = buffer + index; - len = len - count; - memmove(writeTo, buffer + index + count,len - index); - buffer[len] = 0; -} - -void String::toLowerCase(void) -{ - if (!buffer) return; - for (char *p = buffer; *p; p++) { - *p = tolower(*p); - } -} - -void String::toUpperCase(void) -{ - if (!buffer) return; - for (char *p = buffer; *p; p++) { - *p = toupper(*p); - } -} - -void String::trim(void) -{ - if (!buffer || len == 0) return; - char *begin = buffer; - while (isspace(*begin)) begin++; - char *end = buffer + len - 1; - while (isspace(*end) && end >= begin) end--; - len = end + 1 - begin; - if (begin > buffer) memmove(buffer, begin, len); - buffer[len] = 0; -} - -/*********************************************/ -/* Parsing / Conversion */ -/*********************************************/ - -long String::toInt(void) const -{ - if (buffer) return atol(buffer); - return 0; -} - -float String::toFloat(void) const -{ - return float(toDouble()); -} - -double String::toDouble(void) const -{ - if (buffer) return atof(buffer); - return 0; -} - -} // namespace arduino diff --git a/api/api/String.h b/api/api/String.h deleted file mode 100644 index 0bafd35a..00000000 --- a/api/api/String.h +++ /dev/null @@ -1,255 +0,0 @@ -/* - String library for Wiring & Arduino - ...mostly rewritten by Paul Stoffregen... - Copyright (c) 2009-10 Hernando Barragan. All right reserved. - Copyright 2011, Paul Stoffregen, paul@pjrc.com - - 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 -*/ - -#ifdef __cplusplus - -#ifndef __ARDUINO_STRINGS__ -#define __ARDUINO_STRINGS__ - -#include -#include -#include -#if defined(__AVR__) -#include "avr/pgmspace.h" -#else -#include "deprecated-avr-comp/avr/pgmspace.h" -#endif - -namespace arduino { - -// When compiling programs with this class, the following gcc parameters -// dramatically increase performance and memory (RAM) efficiency, typically -// with little or no increase in code size. -// -felide-constructors -// -std=c++0x - -class __FlashStringHelper; -#define F(string_literal) (reinterpret_cast(PSTR(string_literal))) - -// An inherited class for holding the result of a concatenation. These -// result objects are assumed to be writable by subsequent concatenations. -class StringSumHelper; - -// The string class -class String -{ - friend class StringSumHelper; - // use a function pointer to allow for "if (s)" without the - // complications of an operator bool(). for more information, see: - // http://www.artima.com/cppsource/safebool.html - typedef void (String::*StringIfHelperType)() const; - void StringIfHelper() const {} - - static size_t const FLT_MAX_DECIMAL_PLACES = 10; - static size_t const DBL_MAX_DECIMAL_PLACES = FLT_MAX_DECIMAL_PLACES; - -public: - // constructors - // creates a copy of the initial value. - // if the initial value is null or invalid, or if memory allocation - // fails, the string will be marked as invalid (i.e. "if (s)" will - // be false). - String(const char *cstr = ""); - String(const char *cstr, unsigned int length); - String(const uint8_t *cstr, unsigned int length) : String((const char*)cstr, length) {} - String(const String &str); - String(const __FlashStringHelper *str); - String(String &&rval); - explicit String(char c); - explicit String(unsigned char, unsigned char base=10); - explicit String(int, unsigned char base=10); - explicit String(unsigned int, unsigned char base=10); - explicit String(long, unsigned char base=10); - explicit String(unsigned long, unsigned char base=10); - explicit String(float, unsigned char decimalPlaces=2); - explicit String(double, unsigned char decimalPlaces=2); - ~String(void); - - // memory management - // return true on success, false on failure (in which case, the string - // is left unchanged). reserve(0), if successful, will validate an - // invalid string (i.e., "if (s)" will be true afterwards) - bool reserve(unsigned int size); - inline unsigned int length(void) const {return len;} - inline bool isEmpty(void) const { return length() == 0; } - - // creates a copy of the assigned value. if the value is null or - // invalid, or if the memory allocation fails, the string will be - // marked as invalid ("if (s)" will be false). - String & operator = (const String &rhs); - String & operator = (const char *cstr); - String & operator = (const __FlashStringHelper *str); - String & operator = (String &&rval); - - // concatenate (works w/ built-in types) - - // returns true on success, false on failure (in which case, the string - // is left unchanged). if the argument is null or invalid, the - // concatenation is considered unsuccessful. - bool concat(const String &str); - bool concat(const char *cstr); - bool concat(const char *cstr, unsigned int length); - bool concat(const uint8_t *cstr, unsigned int length) {return concat((const char*)cstr, length);} - bool concat(char c); - bool concat(unsigned char num); - bool concat(int num); - bool concat(unsigned int num); - bool concat(long num); - bool concat(unsigned long num); - bool concat(float num); - bool concat(double num); - bool concat(const __FlashStringHelper * str); - - // if there's not enough memory for the concatenated value, the string - // will be left unchanged (but this isn't signalled in any way) - String & operator += (const String &rhs) {concat(rhs); return (*this);} - String & operator += (const char *cstr) {concat(cstr); return (*this);} - String & operator += (char c) {concat(c); return (*this);} - String & operator += (unsigned char num) {concat(num); return (*this);} - String & operator += (int num) {concat(num); return (*this);} - String & operator += (unsigned int num) {concat(num); return (*this);} - String & operator += (long num) {concat(num); return (*this);} - String & operator += (unsigned long num) {concat(num); return (*this);} - String & operator += (float num) {concat(num); return (*this);} - String & operator += (double num) {concat(num); return (*this);} - String & operator += (const __FlashStringHelper *str){concat(str); return (*this);} - - friend StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs); - friend StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr); - friend StringSumHelper & operator + (const StringSumHelper &lhs, char c); - friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, int num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, long num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, float num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, double num); - friend StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs); - - // comparison (only works w/ Strings and "strings") - operator StringIfHelperType() const { return buffer ? &String::StringIfHelper : 0; } - int compareTo(const String &s) const; - int compareTo(const char *cstr) const; - bool equals(const String &s) const; - bool equals(const char *cstr) const; - - friend bool operator == (const String &a, const String &b) { return a.equals(b); } - friend bool operator == (const String &a, const char *b) { return a.equals(b); } - friend bool operator == (const char *a, const String &b) { return b == a; } - friend bool operator < (const String &a, const String &b) { return a.compareTo(b) < 0; } - friend bool operator < (const String &a, const char *b) { return a.compareTo(b) < 0; } - friend bool operator < (const char *a, const String &b) { return b.compareTo(a) > 0; } - - friend bool operator != (const String &a, const String &b) { return !(a == b); } - friend bool operator != (const String &a, const char *b) { return !(a == b); } - friend bool operator != (const char *a, const String &b) { return !(a == b); } - friend bool operator > (const String &a, const String &b) { return b < a; } - friend bool operator > (const String &a, const char *b) { return b < a; } - friend bool operator > (const char *a, const String &b) { return b < a; } - friend bool operator <= (const String &a, const String &b) { return !(b < a); } - friend bool operator <= (const String &a, const char *b) { return !(b < a); } - friend bool operator <= (const char *a, const String &b) { return !(b < a); } - friend bool operator >= (const String &a, const String &b) { return !(a < b); } - friend bool operator >= (const String &a, const char *b) { return !(a < b); } - friend bool operator >= (const char *a, const String &b) { return !(a < b); } - - bool equalsIgnoreCase(const String &s) const; - bool startsWith( const String &prefix) const; - bool startsWith(const String &prefix, unsigned int offset) const; - bool endsWith(const String &suffix) const; - - // character access - char charAt(unsigned int index) const; - void setCharAt(unsigned int index, char c); - char operator [] (unsigned int index) const; - 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; } - 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; - int indexOf( char ch, unsigned int fromIndex ) const; - int indexOf( const String &str ) const; - int indexOf( const String &str, unsigned int fromIndex ) const; - int lastIndexOf( char ch ) const; - int lastIndexOf( char ch, unsigned int fromIndex ) const; - int lastIndexOf( const String &str ) const; - int lastIndexOf( const String &str, unsigned int fromIndex ) const; - String substring( unsigned int beginIndex ) const { return substring(beginIndex, len); }; - String substring( unsigned int beginIndex, unsigned int endIndex ) const; - - // modification - void replace(char find, char replace); - void replace(const String& find, const String& replace); - void remove(unsigned int index); - void remove(unsigned int index, unsigned int count); - void toLowerCase(void); - void toUpperCase(void); - void trim(void); - - // parsing/conversion - long toInt(void) const; - float toFloat(void) const; - double toDouble(void) const; - -protected: - char *buffer; // the actual char array - unsigned int capacity; // the array length minus one (for the '\0') - unsigned int len; // the String length (not counting the '\0') -protected: - void init(void); - void invalidate(void); - bool changeBuffer(unsigned int maxStrLen); - - // copy and move - String & copy(const char *cstr, unsigned int length); - String & copy(const __FlashStringHelper *pstr, unsigned int length); - void move(String &rhs); -}; - -class StringSumHelper : public String -{ -public: - StringSumHelper(const String &s) : String(s) {} - StringSumHelper(const char *p) : String(p) {} - StringSumHelper(char c) : String(c) {} - StringSumHelper(unsigned char num) : String(num) {} - StringSumHelper(int num) : String(num) {} - StringSumHelper(unsigned int num) : String(num) {} - StringSumHelper(long num) : String(num) {} - StringSumHelper(unsigned long num) : String(num) {} - StringSumHelper(float num) : String(num) {} - StringSumHelper(double num) : String(num) {} -}; - -} // namespace arduino - -using arduino::__FlashStringHelper; -using arduino::String; - -#endif // __cplusplus -#endif // __ARDUINO_STRINGS__ diff --git a/api/api/USBAPI.h b/api/api/USBAPI.h deleted file mode 100644 index ba5e87ce..00000000 --- a/api/api/USBAPI.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - USBAPI.h - Copyright (c) 2005-2014 Arduino. 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 -*/ - -#ifndef __USBAPI__ -#define __USBAPI__ - -#include - -namespace arduino { -//================================================================================ -//================================================================================ -// Low level API - -typedef struct __attribute__((packed)) -{ - union { - uint8_t bmRequestType; - struct { - uint8_t direction : 5; - uint8_t type : 2; - uint8_t transferDirection : 1; - }; - }; - uint8_t bRequest; - uint8_t wValueL; - uint8_t wValueH; - uint16_t wIndex; - uint16_t wLength; -} USBSetup; - -} - -//================================================================================ -// USB APIs (C scope) -//================================================================================ - -int USB_SendControl(uint8_t flags, const void* d, int len); -int USB_RecvControl(void* d, int len); -int USB_RecvControlLong(void* d, int len); - -uint8_t USB_Available(uint8_t ep); -uint8_t USB_SendSpace(uint8_t ep); -int USB_Send(uint8_t ep, const void* data, int len); // blocking -int USB_Recv(uint8_t ep, void* data, int len); // non-blocking -int USB_Recv(uint8_t ep); // non-blocking -void USB_Flush(uint8_t ep); - -#endif \ No newline at end of file diff --git a/api/api/Udp.h b/api/api/Udp.h deleted file mode 100644 index 20117a67..00000000 --- a/api/api/Udp.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Udp.cpp: Library to send/receive UDP packets. - * - * NOTE: UDP is fast, but has some important limitations (thanks to Warren Gray for mentioning these) - * 1) UDP does not guarantee the order in which assembled UDP packets are received. This - * might not happen often in practice, but in larger network topologies, a UDP - * packet can be received out of sequence. - * 2) UDP does not guard against lost packets - so packets *can* disappear without the sender being - * aware of it. Again, this may not be a concern in practice on small local networks. - * For more information, see http://www.cafeaulait.org/course/week12/35.html - * - * MIT License: - * Copyright (c) 2008 Bjoern Hartmann - * 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. - * - * bjoern@cs.stanford.edu 12/30/2008 - */ - -#pragma once - -#include "Stream.h" -#include "IPAddress.h" - -namespace arduino { - -class UDP : public Stream { - -public: - virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use - virtual uint8_t beginMulticast(IPAddress, uint16_t) { return 0; } // initialize, start listening on specified multicast IP address and port. Returns 1 if successful, 0 on failure - virtual void stop() =0; // Finish with the UDP socket - - // Sending UDP packets - - // Start building up a packet to send to the remote host specified in ip and port - // Returns 1 if successful, 0 if there was a problem with the supplied IP address or port - virtual int beginPacket(IPAddress ip, uint16_t port) =0; - // Start building up a packet to send to the remote host specified in host and port - // Returns 1 if successful, 0 if there was a problem resolving the hostname or port - virtual int beginPacket(const char *host, uint16_t port) =0; - // Finish off this packet and send it - // Returns 1 if the packet was sent successfully, 0 if there was an error - virtual int endPacket() =0; - // Write a single byte into the packet - virtual size_t write(uint8_t) =0; - // Write size bytes from buffer into the packet - virtual size_t write(const uint8_t *buffer, size_t size) =0; - - // Start processing the next available incoming packet - // Returns the size of the packet in bytes, or 0 if no packets are available - virtual int parsePacket() =0; - // Number of bytes remaining in the current packet - virtual int available() =0; - // Read a single byte from the current packet - virtual int read() =0; - // Read up to len bytes from the current packet and place them into buffer - // Returns the number of bytes read, or 0 if none are available - virtual int read(unsigned char* buffer, size_t len) =0; - // Read up to len characters from the current packet and place them into buffer - // Returns the number of characters read, or 0 if none are available - virtual int read(char* buffer, size_t len) =0; - // Return the next byte from the current packet without moving on to the next byte - virtual int peek() =0; - virtual void flush() =0; // Finish reading the current packet - - // Return the IP address of the host who sent the current incoming packet - virtual IPAddress remoteIP() =0; - // Return the port of the host who sent the current incoming packet - virtual uint16_t remotePort() =0; -protected: - uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); }; -}; - -} - -using arduino::UDP; \ No newline at end of file diff --git a/api/api/WCharacter.h b/api/api/WCharacter.h deleted file mode 100644 index d0508424..00000000 --- a/api/api/WCharacter.h +++ /dev/null @@ -1,171 +0,0 @@ -/* - WCharacter.h - Character utility functions for Wiring & Arduino - Copyright (c) 2010 Hernando Barragan. 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 - */ - -#ifndef Character_h -#define Character_h - -#include - -namespace arduino { - -// WCharacter.h prototypes -inline bool isAlphaNumeric(int c) __attribute__((always_inline)); -inline bool isAlpha(int c) __attribute__((always_inline)); -inline bool isAscii(int c) __attribute__((always_inline)); -inline bool isWhitespace(int c) __attribute__((always_inline)); -inline bool isControl(int c) __attribute__((always_inline)); -inline bool isDigit(int c) __attribute__((always_inline)); -inline bool isGraph(int c) __attribute__((always_inline)); -inline bool isLowerCase(int c) __attribute__((always_inline)); -inline bool isPrintable(int c) __attribute__((always_inline)); -inline bool isPunct(int c) __attribute__((always_inline)); -inline bool isSpace(int c) __attribute__((always_inline)); -inline bool isUpperCase(int c) __attribute__((always_inline)); -inline bool isHexadecimalDigit(int c) __attribute__((always_inline)); -inline int toAscii(int c) __attribute__((always_inline)); -inline int toLowerCase(int c) __attribute__((always_inline)); -inline int toUpperCase(int c)__attribute__((always_inline)); - - -// Checks for an alphanumeric character. -// It is equivalent to (isalpha(c) || isdigit(c)). -inline bool isAlphaNumeric(int c) -{ - return ( isalnum(c) == 0 ? false : true); -} - - -// Checks for an alphabetic character. -// It is equivalent to (isupper(c) || islower(c)). -inline bool isAlpha(int c) -{ - return ( isalpha(c) == 0 ? false : true); -} - - -// Checks whether c is a 7-bit unsigned char value -// that fits into the ASCII character set. -inline bool isAscii(int c) -{ - return ((c & ~0x7f) != 0 ? false : true ); -} - - -// Checks for a blank character, that is, a space or a tab. -inline bool isWhitespace(int c) -{ - return ( c == '\t' || c == ' '); -} - - -// Checks for a control character. -inline bool isControl(int c) -{ - return ( iscntrl (c) == 0 ? false : true); -} - - -// Checks for a digit (0 through 9). -inline bool isDigit(int c) -{ - return ( isdigit (c) == 0 ? false : true); -} - - -// Checks for any printable character except space. -inline bool isGraph(int c) -{ - return ( isgraph (c) == 0 ? false : true); -} - - -// Checks for a lower-case character. -inline bool isLowerCase(int c) -{ - return ( c >= 'a' && c <= 'z' ); -} - - -// Checks for any printable character including space. -inline bool isPrintable(int c) -{ - return ( isprint (c) == 0 ? false : true); -} - - -// Checks for any printable character which is not a space -// or an alphanumeric character. -inline bool isPunct(int c) -{ - return ( isPrintable(c) && !isSpace(c) && !isAlphaNumeric(c) ); -} - - -// Checks for white-space characters. For the avr-libc library, -// these are: space, formfeed ('\f'), newline ('\n'), carriage -// return ('\r'), horizontal tab ('\t'), and vertical tab ('\v'). -inline bool isSpace(int c) -{ - return ( isspace (c) == 0 ? false : true); -} - - -// Checks for an uppercase letter. -inline bool isUpperCase(int c) -{ - return ( isupper (c) == 0 ? false : true); -} - - -// Checks for a hexadecimal digits, i.e. one of 0 1 2 3 4 5 6 7 -// 8 9 a b c d e f A B C D E F. -inline bool isHexadecimalDigit(int c) -{ - return ( isxdigit (c) == 0 ? false : true); -} - - -// Converts c to a 7-bit unsigned char value that fits into the -// ASCII character set, by clearing the high-order bits. -inline int toAscii(int c) -{ - return (c & 0x7f); -} - - -// Warning: -// Many people will be unhappy if you use this function. -// This function will convert accented letters into random -// characters. - -// Converts the letter c to lower case, if possible. -inline int toLowerCase(int c) -{ - return tolower (c); -} - - -// Converts the letter c to upper case, if possible. -inline int toUpperCase(int c) -{ - return toupper (c); -} - -} -#endif \ No newline at end of file diff --git a/api/api/deprecated-avr-comp/avr/dtostrf.c.impl b/api/api/deprecated-avr-comp/avr/dtostrf.c.impl deleted file mode 100644 index f410886c..00000000 --- a/api/api/deprecated-avr-comp/avr/dtostrf.c.impl +++ /dev/null @@ -1,40 +0,0 @@ -/* - dtostrf - Emulation for dtostrf function from avr-libc - Copyright (c) 2016 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 - 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 -*/ - -// This is a default implementation for dtostrf function. -// This file should be used if the standard lib doesn't provide an -// implementation of dtostrf. - -// Create a file called "dtostrf.c" with the following include: -// #include "api/deprecated-avr-comp/avr/dtostrf.c.impl" - -#include - -char *dtostrf (double val, signed char width, unsigned char prec, char *sout) { - asm(".global _printf_float"); - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - char fmt[20]; - sprintf(fmt, "%%%d.%df", width, prec); - sprintf(sout, fmt, val); - return sout; -#pragma GCC diagnostic pop -} - diff --git a/api/api/deprecated-avr-comp/avr/dtostrf.h b/api/api/deprecated-avr-comp/avr/dtostrf.h deleted file mode 100644 index 2d287ca1..00000000 --- a/api/api/deprecated-avr-comp/avr/dtostrf.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - dtostrf - Emulation for dtostrf function from avr-libc - 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 - 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 -*/ - -#pragma once - -#if !defined(ARDUINO_ARCH_AVR) - -#ifdef __cplusplus -extern "C" { -#endif - -char *dtostrf(double val, signed char width, unsigned char prec, char *sout); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/api/api/deprecated-avr-comp/avr/interrupt.h b/api/api/deprecated-avr-comp/avr/interrupt.h deleted file mode 100644 index a2873cf9..00000000 --- a/api/api/deprecated-avr-comp/avr/interrupt.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - 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 - 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 -*/ - -/* - Empty file. - This file is here to allow compatibility with sketches (made for AVR) - that include -*/ diff --git a/api/api/deprecated-avr-comp/avr/pgmspace.h b/api/api/deprecated-avr-comp/avr/pgmspace.h deleted file mode 100644 index a80e4a51..00000000 --- a/api/api/deprecated-avr-comp/avr/pgmspace.h +++ /dev/null @@ -1,124 +0,0 @@ -/* - pgmspace.h - Definitions for compatibility with AVR pgmspace macros - - Copyright (c) 2015 Arduino LLC - - Based on work of Paul Stoffregen on Teensy 3 (http://pjrc.com) - - 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_ -#define __PGMSPACE_H_ 1 - -#include - -#define PROGMEM -#define __ATTR_PROGMEM__ -#define PGM_P const char * -#define PGM_VOID_P const void * -#define PSTR(str) (str) - -#define _SFR_BYTE(n) (n) - -typedef void prog_void; -typedef char prog_char; -typedef unsigned char prog_uchar; -typedef int8_t prog_int8_t; -typedef uint8_t prog_uint8_t; -typedef int16_t prog_int16_t; -typedef uint16_t prog_uint16_t; -typedef int32_t prog_int32_t; -typedef uint32_t prog_uint32_t; -typedef int64_t prog_int64_t; -typedef uint64_t prog_uint64_t; - -typedef const void* int_farptr_t; -typedef const void* uint_farptr_t; - -#define memchr_P(s, c, n) memchr((s), (c), (n)) -#define memcmp_P(s1, s2, n) memcmp((s1), (s2), (n)) -#define memccpy_P(dest, src, c, n) memccpy((dest), (src), (c), (n)) -#define memcpy_P(dest, src, n) memcpy((dest), (src), (n)) -#define memmem_P(haystack, haystacklen, needle, needlelen) memmem((haystack), (haystacklen), (needle), (needlelen)) -#define memrchr_P(s, c, n) memrchr((s), (c), (n)) -#define strcat_P(dest, src) strcat((dest), (src)) -#define strchr_P(s, c) strchr((s), (c)) -#define strchrnul_P(s, c) strchrnul((s), (c)) -#define strcmp_P(a, b) strcmp((a), (b)) -#define strcpy_P(dest, src) strcpy((dest), (src)) -#define strcasecmp_P(s1, s2) strcasecmp((s1), (s2)) -#define strcasestr_P(haystack, needle) strcasestr((haystack), (needle)) -#define strcspn_P(s, accept) strcspn((s), (accept)) -#define strlcat_P(s1, s2, n) strlcat((s1), (s2), (n)) -#define strlcpy_P(s1, s2, n) strlcpy((s1), (s2), (n)) -#define strlen_P(a) strlen((a)) -#define strnlen_P(s, n) strnlen((s), (n)) -#define strncmp_P(s1, s2, n) strncmp((s1), (s2), (n)) -#define strncasecmp_P(s1, s2, n) strncasecmp((s1), (s2), (n)) -#define strncat_P(s1, s2, n) strncat((s1), (s2), (n)) -#define strncpy_P(s1, s2, n) strncpy((s1), (s2), (n)) -#define strpbrk_P(s, accept) strpbrk((s), (accept)) -#define strrchr_P(s, c) strrchr((s), (c)) -#define strsep_P(sp, delim) strsep((sp), (delim)) -#define strspn_P(s, accept) strspn((s), (accept)) -#define strstr_P(a, b) strstr((a), (b)) -#define strtok_P(s, delim) strtok((s), (delim)) -#define strtok_rP(s, delim, last) strtok((s), (delim), (last)) - -#define strlen_PF(a) strlen((a)) -#define strnlen_PF(src, len) strnlen((src), (len)) -#define memcpy_PF(dest, src, len) memcpy((dest), (src), (len)) -#define strcpy_PF(dest, src) strcpy((dest), (src)) -#define strncpy_PF(dest, src, len) strncpy((dest), (src), (len)) -#define strcat_PF(dest, src) strcat((dest), (src)) -#define strlcat_PF(dest, src, len) strlcat((dest), (src), (len)) -#define strncat_PF(dest, src, len) strncat((dest), (src), (len)) -#define strcmp_PF(s1, s2) strcmp((s1), (s2)) -#define strncmp_PF(s1, s2, n) strncmp((s1), (s2), (n)) -#define strcasecmp_PF(s1, s2) strcasecmp((s1), (s2)) -#define strncasecmp_PF(s1, s2, n) strncasecmp((s1), (s2), (n)) -#define strstr_PF(s1, s2) strstr((s1), (s2)) -#define strlcpy_PF(dest, src, n) strlcpy((dest), (src), (n)) -#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)) -#define pgm_read_dword(addr) (*(const unsigned long *)(addr)) -#define pgm_read_float(addr) (*(const float *)(addr)) -#define pgm_read_ptr(addr) (*(void *const *)(addr)) - -#define pgm_read_byte_near(addr) pgm_read_byte(addr) -#define pgm_read_word_near(addr) pgm_read_word(addr) -#define pgm_read_dword_near(addr) pgm_read_dword(addr) -#define pgm_read_float_near(addr) pgm_read_float(addr) -#define pgm_read_ptr_near(addr) pgm_read_ptr(addr) - -#define pgm_read_byte_far(addr) pgm_read_byte(addr) -#define pgm_read_word_far(addr) pgm_read_word(addr) -#define pgm_read_dword_far(addr) pgm_read_dword(addr) -#define pgm_read_float_far(addr) pgm_read_float(addr) -#define pgm_read_ptr_far(addr) pgm_read_ptr(addr) - -#define pgm_get_far_address(addr) (&(addr)) - -#endif diff --git a/api/api/deprecated/Client.h b/api/api/deprecated/Client.h deleted file mode 100644 index 84981c71..00000000 --- a/api/api/deprecated/Client.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including Client.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../Client.h" - - diff --git a/api/api/deprecated/HardwareSerial.h b/api/api/deprecated/HardwareSerial.h deleted file mode 100644 index 0ed7d7a6..00000000 --- a/api/api/deprecated/HardwareSerial.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including HardwareSerial.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../HardwareSerial.h" - - diff --git a/api/api/deprecated/IPAddress.h b/api/api/deprecated/IPAddress.h deleted file mode 100644 index 4c03574d..00000000 --- a/api/api/deprecated/IPAddress.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including IPAddress.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../IPAddress.h" - - diff --git a/api/api/deprecated/Print.h b/api/api/deprecated/Print.h deleted file mode 100644 index a0d1bd14..00000000 --- a/api/api/deprecated/Print.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including Print.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../Print.h" - diff --git a/api/api/deprecated/Printable.h b/api/api/deprecated/Printable.h deleted file mode 100644 index b6888c11..00000000 --- a/api/api/deprecated/Printable.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including Printable.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../Printable.h" - diff --git a/api/api/deprecated/Server.h b/api/api/deprecated/Server.h deleted file mode 100644 index 65b544bb..00000000 --- a/api/api/deprecated/Server.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including Server.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../Server.h" - - diff --git a/api/api/deprecated/Stream.h b/api/api/deprecated/Stream.h deleted file mode 100644 index 4118ccb7..00000000 --- a/api/api/deprecated/Stream.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including Stream.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../Stream.h" - - diff --git a/api/api/deprecated/Udp.h b/api/api/deprecated/Udp.h deleted file mode 100644 index f03a64b4..00000000 --- a/api/api/deprecated/Udp.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (c) 2016 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 -*/ - -// including Udp.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../Udp.h" - - diff --git a/api/api/deprecated/WString.h b/api/api/deprecated/WString.h deleted file mode 100644 index 1a3a79fc..00000000 --- a/api/api/deprecated/WString.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Copyright 2016, 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 -*/ - -// including WString.h is deprecated, for all future projects use Arduino.h instead - -// This include is added for compatibility, it will be removed on the next -// major release of the API -#include "../String.h" - diff --git a/api/api/itoa.h b/api/api/itoa.h deleted file mode 100644 index c2077833..00000000 --- a/api/api/itoa.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - itoa.h - Integer to ASCII conversion - Copyright (c) 2016 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 -*/ - -#pragma once - -// Standard C functions required in Arduino API -// If these functions are not provided by the standard library, the -// core should supply an implementation of them. - -#ifdef __cplusplus -extern "C" { -#endif - -extern char* itoa(int value, char *string, int radix); -extern char* ltoa(long value, char *string, int radix); -extern char* utoa(unsigned value, char *string, int radix); -extern char* ultoa(unsigned long value, char *string, int radix); - -#ifdef __cplusplus -} // extern "C" -#endif - diff --git a/api/deprecated-avr-comp/avr/pgmspace.h b/api/deprecated-avr-comp/avr/pgmspace.h index 660c4dcd..a80e4a51 100644 --- a/api/deprecated-avr-comp/avr/pgmspace.h +++ b/api/deprecated-avr-comp/avr/pgmspace.h @@ -100,48 +100,12 @@ typedef const void* uint_farptr_t; #define sprintf_P(s, f, ...) sprintf((s), (f), __VA_ARGS__) #define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__) -#define vsprintf_P(s, f, ...) vsprintf((s), (f), __VA_ARGS__) -#define vsnprintf_P(s, f, ...) vsnprintf((s), (f), __VA_ARGS__) -#if 0 -// Requires natural aligned addresses #define pgm_read_byte(addr) (*(const unsigned char *)(addr)) #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) (*(void *const *)(addr)) -#else -// Supports misaligned addresses -#ifdef __cplusplus -extern "C"{ -#endif -static inline unsigned char pgm_read_byte(const void *addr) { - return *(const unsigned char *)(addr); -} -static inline unsigned short pgm_read_word(const void *addr) { - const unsigned char *a = (const unsigned char *)addr; - return pgm_read_byte(a) | ( pgm_read_byte(a + 1) << 8 ); -} -static inline unsigned long pgm_read_dword(const void *addr) { - const unsigned char *a = (const unsigned char *)addr; - return pgm_read_byte(a) | ( pgm_read_byte(a + 1) << 8 ) | ( pgm_read_byte(a + 2) << 16 ) | ( pgm_read_byte(a + 3) << 24 ); -} -static inline void *pgm_read_ptr(const void *addr) { - return (void*) pgm_read_dword(addr); -} -static inline float pgm_read_float(const void *addr) { - union { - void *p; - float f; - } x; - x.p = pgm_read_ptr(addr); - return x.f; -} -#ifdef __cplusplus -} -#endif - -#endif #define pgm_read_byte_near(addr) pgm_read_byte(addr) #define pgm_read_word_near(addr) pgm_read_word(addr) diff --git a/test/.gitignore b/test/.gitignore index c795b054..faa6a97b 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1 +1,19 @@ -build \ No newline at end of file +build +### CMake ### +CMakeLists.txt.user +CMakeCache.txt +CMakeFiles +CMakeScripts +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +_deps + +### CMake Patch ### +CMakeUserPresets.json + +# External projects +*-prefix/ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 31b75483..d8050249 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -8,11 +8,20 @@ cmake_minimum_required(VERSION 2.8) project(test-ArduinoCore-API) +Include(FetchContent) + +FetchContent_Declare( + Catch2 + GIT_REPOSITORY https://github.com/catchorg/Catch2.git + GIT_TAG v3.4.0 +) + +FetchContent_MakeAvailable(Catch2) + ########################################################################## include_directories(..) include_directories(include) -include_directories(external/catch/v2.13.9/include) ########################################################################## @@ -118,7 +127,6 @@ set(TEST_DUT_SRCS ########################################################################## set(TEST_TARGET_SRCS - src/main.cpp src/dtostrf.cpp src/itoa.cpp src/MillisFake.cpp @@ -144,5 +152,7 @@ add_executable( ${TEST_TARGET_SRCS} ) +target_link_libraries( ${TEST_TARGET} Catch2WithMain ) + ########################################################################## diff --git a/test/external/catch/v2.13.1/include/catch.hpp b/test/external/catch/v2.13.1/include/catch.hpp deleted file mode 100644 index 94e20c21..00000000 --- a/test/external/catch/v2.13.1/include/catch.hpp +++ /dev/null @@ -1,17802 +0,0 @@ -/* - * Catch v2.13.1 - * Generated: 2020-09-07 12:12:38.090364 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved. - * - * Distributed under the Boost Software License, Version 1.0. (See accompanying - * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - */ -#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -// start catch.hpp - - -#define CATCH_VERSION_MAJOR 2 -#define CATCH_VERSION_MINOR 13 -#define CATCH_VERSION_PATCH 1 - -#ifdef __clang__ -# pragma clang system_header -#elif defined __GNUC__ -# pragma GCC system_header -#endif - -// start catch_suppress_warnings.h - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(push) -# pragma warning(disable: 161 1682) -# else // __ICC -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ - // Because REQUIREs trigger GCC's -Wparentheses, and because still - // supported version of g++ have only buggy support for _Pragmas, - // Wparentheses have to be suppressed globally. -# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wpadded" -#endif -// end catch_suppress_warnings.h -#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -# define CATCH_IMPL -# define CATCH_CONFIG_ALL_PARTS -#endif - -// In the impl file, we want to have access to all parts of the headers -// Can also be used to sanely support PCHs -#if defined(CATCH_CONFIG_ALL_PARTS) -# define CATCH_CONFIG_EXTERNAL_INTERFACES -# if defined(CATCH_CONFIG_DISABLE_MATCHERS) -# undef CATCH_CONFIG_DISABLE_MATCHERS -# endif -# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) -# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER -# endif -#endif - -#if !defined(CATCH_CONFIG_IMPL_ONLY) -// start catch_platform.h - -#ifdef __APPLE__ -# include -# if TARGET_OS_OSX == 1 -# define CATCH_PLATFORM_MAC -# elif TARGET_OS_IPHONE == 1 -# define CATCH_PLATFORM_IPHONE -# endif - -#elif defined(linux) || defined(__linux) || defined(__linux__) -# define CATCH_PLATFORM_LINUX - -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) -# define CATCH_PLATFORM_WINDOWS -#endif - -// end catch_platform.h - -#ifdef CATCH_IMPL -# ifndef CLARA_CONFIG_MAIN -# define CLARA_CONFIG_MAIN_NOT_DEFINED -# define CLARA_CONFIG_MAIN -# endif -#endif - -// start catch_user_interfaces.h - -namespace Catch { - unsigned int rngSeed(); -} - -// end catch_user_interfaces.h -// start catch_tag_alias_autoregistrar.h - -// start catch_common.h - -// start catch_compiler_capabilities.h - -// Detect a number of compiler features - by compiler -// The following features are defined: -// -// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? -// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? -// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? -// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled? -// **************** -// Note to maintainers: if new toggles are added please document them -// in configuration.md, too -// **************** - -// In general each macro has a _NO_ form -// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature. -// Many features, at point of detection, define an _INTERNAL_ macro, so they -// can be combined, en-mass, with the _NO_ forms later. - -#ifdef __cplusplus - -# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) -# define CATCH_CPP14_OR_GREATER -# endif - -# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) -# define CATCH_CPP17_OR_GREATER -# endif - -#endif - -#if defined(__cpp_lib_uncaught_exceptions) -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -// We have to avoid both ICC and Clang, because they try to mask themselves -// as gcc, and we want only GCC in this block -#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) - -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) - -#endif - -#if defined(__clang__) - -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic pop" ) - -// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug -// which results in calls to destructors being emitted for each temporary, -// without a matching initialization. In practice, this can result in something -// like `std::string::~string` being called on an uninitialized value. -// -// For example, this code will likely segfault under IBM XL: -// ``` -// REQUIRE(std::string("12") + "34" == "1234") -// ``` -// -// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented. -# if !defined(__ibmxl__) -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */ -# endif - -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ - _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") - -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) - -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wunused-template\"" ) - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// Assume that non-Windows platforms support posix signals by default -#if !defined(CATCH_PLATFORM_WINDOWS) - #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS -#endif - -//////////////////////////////////////////////////////////////////////////////// -// We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) - #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -#endif - -#ifdef __OS400__ -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# define CATCH_CONFIG_COLOUR_NONE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Android somehow still does not support std::to_string -#if defined(__ANDROID__) -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING -# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Not all Windows environments support SEH properly -#if defined(__MINGW32__) -# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH -#endif - -//////////////////////////////////////////////////////////////////////////////// -// PS4 -#if defined(__ORBIS__) -# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Cygwin -#ifdef __CYGWIN__ - -// Required for some versions of Cygwin to declare gettimeofday -// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin -# define _BSD_SOURCE -// some versions of cygwin (most) do not support std::to_string. Use the libstd check. -// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 -# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING - -# endif -#endif // __CYGWIN__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#if defined(_MSC_VER) - -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) - -# if _MSC_VER >= 1900 // Visual Studio 2015 or newer -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -# endif - -// Universal Windows platform does not support SEH -// Or console colours (or console at all...) -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -# define CATCH_CONFIG_COLOUR_NONE -# else -# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH -# endif - -// MSVC traditional preprocessor needs some workaround for __VA_ARGS__ -// _MSVC_TRADITIONAL == 0 means new conformant preprocessor -// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor -# if !defined(__clang__) // Handle Clang masquerading for msvc -# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) -# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -# endif // MSVC_TRADITIONAL -# endif // __clang__ - -#endif // _MSC_VER - -#if defined(_REENTRANT) || defined(_MSC_VER) -// Enable async processing, as -pthread is specified or no additional linking is required -# define CATCH_INTERNAL_CONFIG_USE_ASYNC -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// -// Check if we are compiled with -fno-exceptions or equivalent -#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) -# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED -#endif - -//////////////////////////////////////////////////////////////////////////////// -// DJGPP -#ifdef __DJGPP__ -# define CATCH_INTERNAL_CONFIG_NO_WCHAR -#endif // __DJGPP__ - -//////////////////////////////////////////////////////////////////////////////// -// Embarcadero C++Build -#if defined(__BORLANDC__) - #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// Use of __COUNTER__ is suppressed during code analysis in -// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly -// handled by it. -// Otherwise all supported compilers support COUNTER macro, -// but user still might want to turn it off -#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) - #define CATCH_INTERNAL_CONFIG_COUNTER -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// RTX is a special version of Windows that is real time. -// This means that it is detected as Windows, but does not provide -// the same set of capabilities as real Windows does. -#if defined(UNDER_RTSS) || defined(RTX64_BUILD) - #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH - #define CATCH_INTERNAL_CONFIG_NO_ASYNC - #define CATCH_CONFIG_COLOUR_NONE -#endif - -#if !defined(_GLIBCXX_USE_C99_MATH_TR1) -#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER -#endif - -// Various stdlib support checks that require __has_include -#if defined(__has_include) - // Check if string_view is available and usable - #if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW - #endif - - // Check if optional is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - - // Check if byte is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # include - # if __cpp_lib_byte > 0 - # define CATCH_INTERNAL_CONFIG_CPP17_BYTE - # endif - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - - // Check if variant is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # if defined(__clang__) && (__clang_major__ < 8) - // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 - // fix should be in clang 8, workaround in libstdc++ 8.2 - # include - # if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) - # define CATCH_CONFIG_NO_CPP17_VARIANT - # else - # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT - # endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) - # else - # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT - # endif // defined(__clang__) && (__clang_major__ < 8) - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) -#endif // defined(__has_include) - -#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) -# define CATCH_CONFIG_COUNTER -#endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) -# define CATCH_CONFIG_WINDOWS_SEH -#endif -// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. -#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_CONFIG_POSIX_SIGNALS -#endif -// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. -#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) -# define CATCH_CONFIG_WCHAR -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) -# define CATCH_CONFIG_CPP11_TO_STRING -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) -# define CATCH_CONFIG_CPP17_OPTIONAL -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) -# define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) -# define CATCH_CONFIG_CPP17_STRING_VIEW -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) -# define CATCH_CONFIG_CPP17_VARIANT -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) -# define CATCH_CONFIG_CPP17_BYTE -#endif - -#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) -# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) -# define CATCH_CONFIG_NEW_CAPTURE -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -# define CATCH_CONFIG_DISABLE_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) -# define CATCH_CONFIG_POLYFILL_ISNAN -#endif - -#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) -# define CATCH_CONFIG_USE_ASYNC -#endif - -#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) -# define CATCH_CONFIG_ANDROID_LOGWRITE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) -# define CATCH_CONFIG_GLOBAL_NEXTAFTER -#endif - -// Even if we do not think the compiler has that warning, we still have -// to provide a macro that can be used by the code. -#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION) -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION -#endif -#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS -#endif - -// The goal of this macro is to avoid evaluation of the arguments, but -// still have the compiler warn on problems inside... -#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN) -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) -#endif - -#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10) -# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#elif defined(__clang__) && (__clang_major__ < 5) -# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#endif - -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#endif - -#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -#define CATCH_TRY if ((true)) -#define CATCH_CATCH_ALL if ((false)) -#define CATCH_CATCH_ANON(type) if ((false)) -#else -#define CATCH_TRY try -#define CATCH_CATCH_ALL catch (...) -#define CATCH_CATCH_ANON(type) catch (type) -#endif - -#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) -#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#endif - -// end catch_compiler_capabilities.h -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) -#ifdef CATCH_CONFIG_COUNTER -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) -#else -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) -#endif - -#include -#include -#include - -// We need a dummy global operator<< so we can bring it into Catch namespace later -struct Catch_global_namespace_dummy {}; -std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); - -namespace Catch { - - struct CaseSensitive { enum Choice { - Yes, - No - }; }; - - class NonCopyable { - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; - - protected: - NonCopyable(); - virtual ~NonCopyable(); - }; - - struct SourceLineInfo { - - SourceLineInfo() = delete; - SourceLineInfo( char const* _file, std::size_t _line ) noexcept - : file( _file ), - line( _line ) - {} - - SourceLineInfo( SourceLineInfo const& other ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo( SourceLineInfo&& ) noexcept = default; - SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; - - bool empty() const noexcept { return file[0] == '\0'; } - bool operator == ( SourceLineInfo const& other ) const noexcept; - bool operator < ( SourceLineInfo const& other ) const noexcept; - - char const* file; - std::size_t line; - }; - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); - - // Bring in operator<< from global namespace into Catch namespace - // This is necessary because the overload of operator<< above makes - // lookup stop at namespace Catch - using ::operator<<; - - // Use this in variadic streaming macros to allow - // >> +StreamEndStop - // as well as - // >> stuff +StreamEndStop - struct StreamEndStop { - std::string operator+() const; - }; - template - T const& operator + ( T const& value, StreamEndStop ) { - return value; - } -} - -#define CATCH_INTERNAL_LINEINFO \ - ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) - -// end catch_common.h -namespace Catch { - - struct RegistrarForTagAliases { - RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); - }; - -} // end namespace Catch - -#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ - CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ - CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ - CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION - -// end catch_tag_alias_autoregistrar.h -// start catch_test_registry.h - -// start catch_interfaces_testcase.h - -#include - -namespace Catch { - - class TestSpec; - - struct ITestInvoker { - virtual void invoke () const = 0; - virtual ~ITestInvoker(); - }; - - class TestCase; - struct IConfig; - - struct ITestCaseRegistry { - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; - }; - - bool isThrowSafe( TestCase const& testCase, IConfig const& config ); - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); - std::vector const& getAllTestCasesSorted( IConfig const& config ); - -} - -// end catch_interfaces_testcase.h -// start catch_stringref.h - -#include -#include -#include -#include - -namespace Catch { - - /// A non-owning string class (similar to the forthcoming std::string_view) - /// Note that, because a StringRef may be a substring of another string, - /// it may not be null terminated. - class StringRef { - public: - using size_type = std::size_t; - using const_iterator = const char*; - - private: - static constexpr char const* const s_empty = ""; - - char const* m_start = s_empty; - size_type m_size = 0; - - public: // construction - constexpr StringRef() noexcept = default; - - StringRef( char const* rawChars ) noexcept; - - constexpr StringRef( char const* rawChars, size_type size ) noexcept - : m_start( rawChars ), - m_size( size ) - {} - - StringRef( std::string const& stdString ) noexcept - : m_start( stdString.c_str() ), - m_size( stdString.size() ) - {} - - explicit operator std::string() const { - return std::string(m_start, m_size); - } - - public: // operators - auto operator == ( StringRef const& other ) const noexcept -> bool; - auto operator != (StringRef const& other) const noexcept -> bool { - return !(*this == other); - } - - auto operator[] ( size_type index ) const noexcept -> char { - assert(index < m_size); - return m_start[index]; - } - - public: // named queries - constexpr auto empty() const noexcept -> bool { - return m_size == 0; - } - constexpr auto size() const noexcept -> size_type { - return m_size; - } - - // Returns the current start pointer. If the StringRef is not - // null-terminated, throws std::domain_exception - auto c_str() const -> char const*; - - public: // substrings and searches - // Returns a substring of [start, start + length). - // If start + length > size(), then the substring is [start, size()). - // If start > size(), then the substring is empty. - auto substr( size_type start, size_type length ) const noexcept -> StringRef; - - // Returns the current start pointer. May not be null-terminated. - auto data() const noexcept -> char const*; - - constexpr auto isNullTerminated() const noexcept -> bool { - return m_start[m_size] == '\0'; - } - - public: // iterators - constexpr const_iterator begin() const { return m_start; } - constexpr const_iterator end() const { return m_start + m_size; } - }; - - auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; - auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; - - constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { - return StringRef( rawChars, size ); - } -} // namespace Catch - -constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { - return Catch::StringRef( rawChars, size ); -} - -// end catch_stringref.h -// start catch_preprocessor.hpp - - -#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ -#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) - -#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ -// MSVC needs more evaluations -#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) -#else -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) -#endif - -#define CATCH_REC_END(...) -#define CATCH_REC_OUT - -#define CATCH_EMPTY() -#define CATCH_DEFER(id) id CATCH_EMPTY() - -#define CATCH_REC_GET_END2() 0, CATCH_REC_END -#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 -#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 -#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT -#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) -#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) - -#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) - -#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) - -// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, -// and passes userdata as the first parameter to each invocation, -// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) -#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) -#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ -#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ -#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) -#else -// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) -#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) -#endif - -#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ -#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) - -#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) - -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) -#else -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) -#endif - -#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ - CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) - -#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) -#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) -#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) -#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) -#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) -#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) -#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6) -#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) -#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) -#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) -#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) - -#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N - -#define INTERNAL_CATCH_TYPE_GEN\ - template struct TypeList {};\ - template\ - constexpr auto get_wrapper() noexcept -> TypeList { return {}; }\ - template class...> struct TemplateTypeList{};\ - template class...Cs>\ - constexpr auto get_wrapper() noexcept -> TemplateTypeList { return {}; }\ - template\ - struct append;\ - template\ - struct rewrap;\ - template class, typename...>\ - struct create;\ - template class, typename>\ - struct convert;\ - \ - template \ - struct append { using type = T; };\ - template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ - struct append, L2, Rest...> { using type = typename append, Rest...>::type; };\ - template< template class L1, typename...E1, typename...Rest>\ - struct append, TypeList, Rest...> { using type = L1; };\ - \ - template< template class Container, template class List, typename...elems>\ - struct rewrap, List> { using type = TypeList>; };\ - template< template class Container, template class List, class...Elems, typename...Elements>\ - struct rewrap, List, Elements...> { using type = typename append>, typename rewrap, Elements...>::type>::type; };\ - \ - template