aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino
diff options
context:
space:
mode:
Diffstat (limited to 'cores/arduino')
-rw-r--r--[-rwxr-xr-x]cores/arduino/Arduino.h2
-rw-r--r--cores/arduino/CDC.cpp41
-rw-r--r--cores/arduino/HardwareSerial.cpp123
-rw-r--r--cores/arduino/HardwareSerial.h28
-rw-r--r--cores/arduino/IPAddress.h1
-rw-r--r--[-rwxr-xr-x]cores/arduino/Print.cpp0
-rw-r--r--[-rwxr-xr-x]cores/arduino/Print.h0
-rw-r--r--[-rwxr-xr-x]cores/arduino/Tone.cpp0
-rw-r--r--cores/arduino/USBAPI.h14
-rw-r--r--cores/arduino/USBCore.cpp70
-rw-r--r--cores/arduino/WString.cpp65
-rw-r--r--cores/arduino/WString.h17
-rw-r--r--cores/arduino/hooks.c31
-rw-r--r--cores/arduino/wiring.c1
-rw-r--r--[-rwxr-xr-x]cores/arduino/wiring_private.h0
-rw-r--r--[-rwxr-xr-x]cores/arduino/wiring_pulse.c0
-rw-r--r--[-rwxr-xr-x]cores/arduino/wiring_shift.c0
17 files changed, 228 insertions, 165 deletions
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 3b9ccca..5596c14 100755..100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -15,6 +15,8 @@
extern "C"{
#endif
+void yield(void);
+
#define HIGH 0x1
#define LOW 0x0
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index e1e859d..a691306 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -23,21 +23,6 @@
#if defined(USBCON)
#ifdef CDC_ENABLED
-#if (RAMEND < 1000)
-#define SERIAL_BUFFER_SIZE 16
-#else
-#define SERIAL_BUFFER_SIZE 64
-#endif
-
-struct ring_buffer
-{
- unsigned char buffer[SERIAL_BUFFER_SIZE];
- volatile int head;
- volatile int tail;
-};
-
-ring_buffer cdc_rx_buffer = { { 0 }, 0, 0};
-
typedef struct
{
u32 dwDTERate;
@@ -144,8 +129,7 @@ void Serial_::end(void)
void Serial_::accept(void)
{
- ring_buffer *buffer = &cdc_rx_buffer;
- int i = (unsigned int)(buffer->head+1) % SERIAL_BUFFER_SIZE;
+ int i = (unsigned int)(_rx_buffer_head+1) % SERIAL_BUFFER_SIZE;
// if we should be storing the received character into the location
// just before the tail (meaning that the head would advance to the
@@ -153,42 +137,39 @@ void Serial_::accept(void)
// and so we don't write the character or advance the head.
// while we have room to store a byte
- while (i != buffer->tail) {
+ while (i != _rx_buffer_tail) {
int c = USB_Recv(CDC_RX);
if (c == -1)
break; // no more data
- buffer->buffer[buffer->head] = c;
- buffer->head = i;
+ _rx_buffer[_rx_buffer_head] = c;
+ _rx_buffer_head = i;
- i = (unsigned int)(buffer->head+1) % SERIAL_BUFFER_SIZE;
+ i = (unsigned int)(_rx_buffer_head+1) % SERIAL_BUFFER_SIZE;
}
}
int Serial_::available(void)
{
- ring_buffer *buffer = &cdc_rx_buffer;
- return (unsigned int)(SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % SERIAL_BUFFER_SIZE;
+ return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_BUFFER_SIZE;
}
int Serial_::peek(void)
{
- ring_buffer *buffer = &cdc_rx_buffer;
- if (buffer->head == buffer->tail) {
+ if (_rx_buffer_head == _rx_buffer_tail) {
return -1;
} else {
- return buffer->buffer[buffer->tail];
+ return _rx_buffer[_rx_buffer_tail];
}
}
int Serial_::read(void)
{
- ring_buffer *buffer = &cdc_rx_buffer;
// if the head isn't ahead of the tail, we don't have any characters
- if (buffer->head == buffer->tail) {
+ if (_rx_buffer_head == _rx_buffer_tail) {
return -1;
} else {
- unsigned char c = buffer->buffer[buffer->tail];
- buffer->tail = (unsigned int)(buffer->tail + 1) % SERIAL_BUFFER_SIZE;
+ unsigned char c = _rx_buffer[_rx_buffer_tail];
+ _rx_buffer_tail = (unsigned int)(_rx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
return c;
}
}
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index eb2365f..9a86fa0 100644
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -49,55 +49,17 @@
#endif
#endif
-// 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.
-#if (RAMEND < 1000)
- #define SERIAL_BUFFER_SIZE 16
-#else
- #define SERIAL_BUFFER_SIZE 64
-#endif
-
-struct ring_buffer
-{
- unsigned char buffer[SERIAL_BUFFER_SIZE];
- volatile unsigned int head;
- volatile unsigned int tail;
-};
-
-#if defined(USBCON)
- ring_buffer rx_buffer = { { 0 }, 0, 0};
- ring_buffer tx_buffer = { { 0 }, 0, 0};
-#endif
-#if defined(UBRRH) || defined(UBRR0H)
- ring_buffer rx_buffer = { { 0 }, 0, 0 };
- ring_buffer tx_buffer = { { 0 }, 0, 0 };
-#endif
-#if defined(UBRR1H)
- ring_buffer rx_buffer1 = { { 0 }, 0, 0 };
- ring_buffer tx_buffer1 = { { 0 }, 0, 0 };
-#endif
-#if defined(UBRR2H)
- ring_buffer rx_buffer2 = { { 0 }, 0, 0 };
- ring_buffer tx_buffer2 = { { 0 }, 0, 0 };
-#endif
-#if defined(UBRR3H)
- ring_buffer rx_buffer3 = { { 0 }, 0, 0 };
- ring_buffer tx_buffer3 = { { 0 }, 0, 0 };
-#endif
-
-inline void store_char(unsigned char c, ring_buffer *buffer)
+inline void store_char(unsigned char c, HardwareSerial *s)
{
- int i = (unsigned int)(buffer->head + 1) % SERIAL_BUFFER_SIZE;
+ int i = (unsigned int)(s->_rx_buffer_head + 1) % SERIAL_BUFFER_SIZE;
// 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 (i != buffer->tail) {
- buffer->buffer[buffer->head] = c;
- buffer->head = i;
+ if (i != s->_rx_buffer_tail) {
+ s->_rx_buffer[s->_rx_buffer_head] = c;
+ s->_rx_buffer_head = i;
}
}
@@ -122,14 +84,14 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
#if defined(UDR0)
if (bit_is_clear(UCSR0A, UPE0)) {
unsigned char c = UDR0;
- store_char(c, &rx_buffer);
+ store_char(c, &Serial);
} else {
unsigned char c = UDR0;
};
#elif defined(UDR)
if (bit_is_clear(UCSRA, PE)) {
unsigned char c = UDR;
- store_char(c, &rx_buffer);
+ store_char(c, &Serial);
} else {
unsigned char c = UDR;
};
@@ -148,7 +110,7 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
{
if (bit_is_clear(UCSR1A, UPE1)) {
unsigned char c = UDR1;
- store_char(c, &rx_buffer1);
+ store_char(c, &Serial1);
} else {
unsigned char c = UDR1;
};
@@ -163,7 +125,7 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
{
if (bit_is_clear(UCSR2A, UPE2)) {
unsigned char c = UDR2;
- store_char(c, &rx_buffer2);
+ store_char(c, &Serial2);
} else {
unsigned char c = UDR2;
};
@@ -178,7 +140,7 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
{
if (bit_is_clear(UCSR3A, UPE3)) {
unsigned char c = UDR3;
- store_char(c, &rx_buffer3);
+ store_char(c, &Serial3);
} else {
unsigned char c = UDR3;
};
@@ -218,7 +180,7 @@ ISR(USART0_UDRE_vect)
ISR(USART_UDRE_vect)
#endif
{
- if (tx_buffer.head == tx_buffer.tail) {
+ if (Serial._tx_buffer_head == Serial._tx_buffer_tail) {
// Buffer empty, so disable interrupts
#if defined(UCSR0B)
cbi(UCSR0B, UDRIE0);
@@ -228,8 +190,8 @@ ISR(USART_UDRE_vect)
}
else {
// There is more data in the output buffer. Send the next byte
- unsigned char c = tx_buffer.buffer[tx_buffer.tail];
- tx_buffer.tail = (tx_buffer.tail + 1) % SERIAL_BUFFER_SIZE;
+ unsigned char c = Serial._tx_buffer[Serial._tx_buffer_tail];
+ Serial._tx_buffer_tail = (Serial._tx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
#if defined(UDR0)
UDR0 = c;
@@ -246,14 +208,14 @@ ISR(USART_UDRE_vect)
#ifdef USART1_UDRE_vect
ISR(USART1_UDRE_vect)
{
- if (tx_buffer1.head == tx_buffer1.tail) {
+ if (Serial1._tx_buffer_head == Serial1._tx_buffer_tail) {
// Buffer empty, so disable interrupts
cbi(UCSR1B, UDRIE1);
}
else {
// There is more data in the output buffer. Send the next byte
- unsigned char c = tx_buffer1.buffer[tx_buffer1.tail];
- tx_buffer1.tail = (tx_buffer1.tail + 1) % SERIAL_BUFFER_SIZE;
+ unsigned char c = Serial1._tx_buffer[Serial1._tx_buffer_tail];
+ Serial1._tx_buffer_tail = (Serial1._tx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
UDR1 = c;
}
@@ -263,14 +225,14 @@ ISR(USART1_UDRE_vect)
#ifdef USART2_UDRE_vect
ISR(USART2_UDRE_vect)
{
- if (tx_buffer2.head == tx_buffer2.tail) {
+ if (Serial2._tx_buffer_head == Serial2._tx_buffer_tail) {
// Buffer empty, so disable interrupts
cbi(UCSR2B, UDRIE2);
}
else {
// There is more data in the output buffer. Send the next byte
- unsigned char c = tx_buffer2.buffer[tx_buffer2.tail];
- tx_buffer2.tail = (tx_buffer2.tail + 1) % SERIAL_BUFFER_SIZE;
+ unsigned char c = Serial2._tx_buffer[Serial2._tx_buffer_tail];
+ Serial2._tx_buffer_tail = (Serial2._tx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
UDR2 = c;
}
@@ -280,31 +242,30 @@ ISR(USART2_UDRE_vect)
#ifdef USART3_UDRE_vect
ISR(USART3_UDRE_vect)
{
- if (tx_buffer3.head == tx_buffer3.tail) {
+ if (Serial3._tx_buffer_head == Serial3._tx_buffer_tail) {
// Buffer empty, so disable interrupts
cbi(UCSR3B, UDRIE3);
}
else {
// There is more data in the output buffer. Send the next byte
- unsigned char c = tx_buffer3.buffer[tx_buffer3.tail];
- tx_buffer3.tail = (tx_buffer3.tail + 1) % SERIAL_BUFFER_SIZE;
+ unsigned char c = Serial3._tx_buffer[Serial3._tx_buffer_tail];
+ Serial3._tx_buffer_tail = (Serial3._tx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
UDR3 = c;
}
}
#endif
-
// Constructors ////////////////////////////////////////////////////////////////
-HardwareSerial::HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
+HardwareSerial::HardwareSerial(
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
volatile uint8_t *ucsrc, volatile uint8_t *udr,
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x)
{
- _rx_buffer = rx_buffer;
- _tx_buffer = tx_buffer;
+ _tx_buffer_head = _tx_buffer_tail = 0;
+ _rx_buffer_head = _rx_buffer_tail = 0;
_ubrrh = ubrrh;
_ubrrl = ubrrl;
_ucsra = ucsra;
@@ -412,7 +373,7 @@ try_again:
void HardwareSerial::end()
{
// wait for transmission of outgoing data
- while (_tx_buffer->head != _tx_buffer->tail)
+ while (_tx_buffer_head != _tx_buffer_tail)
;
cbi(*_ucsrb, _rxen);
@@ -421,31 +382,31 @@ void HardwareSerial::end()
cbi(*_ucsrb, _udrie);
// clear any received data
- _rx_buffer->head = _rx_buffer->tail;
+ _rx_buffer_head = _rx_buffer_tail;
}
int HardwareSerial::available(void)
{
- return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % SERIAL_BUFFER_SIZE;
+ return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_BUFFER_SIZE;
}
int HardwareSerial::peek(void)
{
- if (_rx_buffer->head == _rx_buffer->tail) {
+ if (_rx_buffer_head == _rx_buffer_tail) {
return -1;
} else {
- return _rx_buffer->buffer[_rx_buffer->tail];
+ return _rx_buffer[_rx_buffer_tail];
}
}
int HardwareSerial::read(void)
{
// if the head isn't ahead of the tail, we don't have any characters
- if (_rx_buffer->head == _rx_buffer->tail) {
+ if (_rx_buffer_head == _rx_buffer_tail) {
return -1;
} else {
- unsigned char c = _rx_buffer->buffer[_rx_buffer->tail];
- _rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % SERIAL_BUFFER_SIZE;
+ unsigned char c = _rx_buffer[_rx_buffer_tail];
+ _rx_buffer_tail = (unsigned int)(_rx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
return c;
}
}
@@ -459,16 +420,16 @@ void HardwareSerial::flush()
size_t HardwareSerial::write(uint8_t c)
{
- int i = (_tx_buffer->head + 1) % SERIAL_BUFFER_SIZE;
+ int i = (_tx_buffer_head + 1) % SERIAL_BUFFER_SIZE;
// If the output buffer is full, there's nothing for it other than to
// wait for the interrupt handler to empty it a bit
// ???: return 0 here instead?
- while (i == _tx_buffer->tail)
+ while (i == _tx_buffer_tail)
;
- _tx_buffer->buffer[_tx_buffer->head] = c;
- _tx_buffer->head = i;
+ _tx_buffer[_tx_buffer_head] = c;
+ _tx_buffer_head = i;
sbi(*_ucsrb, _udrie);
// clear the TXC bit -- "can be cleared by writing a one to its bit location"
@@ -485,9 +446,9 @@ HardwareSerial::operator bool() {
// Preinstantiate Objects //////////////////////////////////////////////////////
#if defined(UBRRH) && defined(UBRRL)
- HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR, RXEN, TXEN, RXCIE, UDRIE, U2X);
+ HardwareSerial Serial(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR, RXEN, TXEN, RXCIE, UDRIE, U2X);
#elif defined(UBRR0H) && defined(UBRR0L)
- HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UCSR0C, &UDR0, RXEN0, TXEN0, RXCIE0, UDRIE0, U2X0);
+ HardwareSerial Serial(&UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UCSR0C, &UDR0, RXEN0, TXEN0, RXCIE0, UDRIE0, U2X0);
#elif defined(USBCON)
// do nothing - Serial object and buffers are initialized in CDC code
#else
@@ -495,13 +456,13 @@ HardwareSerial::operator bool() {
#endif
#if defined(UBRR1H)
- HardwareSerial Serial1(&rx_buffer1, &tx_buffer1, &UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1, RXEN1, TXEN1, RXCIE1, UDRIE1, U2X1);
+ HardwareSerial Serial1(&UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1, RXEN1, TXEN1, RXCIE1, UDRIE1, U2X1);
#endif
#if defined(UBRR2H)
- HardwareSerial Serial2(&rx_buffer2, &tx_buffer2, &UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2, RXEN2, TXEN2, RXCIE2, UDRIE2, U2X2);
+ HardwareSerial Serial2(&UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2, RXEN2, TXEN2, RXCIE2, UDRIE2, U2X2);
#endif
#if defined(UBRR3H)
- HardwareSerial Serial3(&rx_buffer3, &tx_buffer3, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3, RXEN3, TXEN3, RXCIE3, UDRIE3, U2X3);
+ HardwareSerial Serial3(&UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3, RXEN3, TXEN3, RXCIE3, UDRIE3, U2X3);
#endif
#endif // whole file
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h
index a73117f..0f62262 100644
--- a/cores/arduino/HardwareSerial.h
+++ b/cores/arduino/HardwareSerial.h
@@ -27,13 +27,19 @@
#include "Stream.h"
-struct ring_buffer;
+// 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.
+#if (RAMEND < 1000)
+ #define SERIAL_BUFFER_SIZE 16
+#else
+ #define SERIAL_BUFFER_SIZE 64
+#endif
class HardwareSerial : public Stream
{
- private:
- ring_buffer *_rx_buffer;
- ring_buffer *_tx_buffer;
+ protected:
volatile uint8_t *_ubrrh;
volatile uint8_t *_ubrrl;
volatile uint8_t *_ucsra;
@@ -46,8 +52,20 @@ class HardwareSerial : public Stream
uint8_t _udrie;
uint8_t _u2x;
bool transmitting;
+
public:
- HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
+ volatile uint8_t _rx_buffer_head;
+ volatile uint8_t _rx_buffer_tail;
+ volatile uint8_t _tx_buffer_head;
+ volatile uint8_t _tx_buffer_tail;
+
+ // Don't put any members after these buffers, since only the first
+ // 32 bytes of this struct can be accessed quickly using the ldd
+ // instruction.
+ unsigned char _rx_buffer[SERIAL_BUFFER_SIZE];
+ unsigned char _tx_buffer[SERIAL_BUFFER_SIZE];
+
+ HardwareSerial(
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
volatile uint8_t *ucsrc, volatile uint8_t *udr,
diff --git a/cores/arduino/IPAddress.h b/cores/arduino/IPAddress.h
index 2585aec..078ac97 100644
--- a/cores/arduino/IPAddress.h
+++ b/cores/arduino/IPAddress.h
@@ -26,6 +26,7 @@
#ifndef IPAddress_h
#define IPAddress_h
+#include <stdint.h>
#include <Printable.h>
// A class to make it easier to handle and pass around IP addresses
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index 53961ec..53961ec 100755..100644
--- a/cores/arduino/Print.cpp
+++ b/cores/arduino/Print.cpp
diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
index dc76150..dc76150 100755..100644
--- a/cores/arduino/Print.h
+++ b/cores/arduino/Print.h
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index 9bb6fe7..9bb6fe7 100755..100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
index 7a14285..da2e869 100644
--- a/cores/arduino/USBAPI.h
+++ b/cores/arduino/USBAPI.h
@@ -25,10 +25,16 @@ extern USBDevice_ USBDevice;
//================================================================================
// Serial over CDC (Serial1 is the physical port)
+struct ring_buffer;
+
+#if (RAMEND < 1000)
+#define SERIAL_BUFFER_SIZE 16
+#else
+#define SERIAL_BUFFER_SIZE 64
+#endif
+
class Serial_ : public Stream
{
-private:
- ring_buffer *_cdc_rx_buffer;
public:
void begin(unsigned long);
void begin(unsigned long, uint8_t);
@@ -42,6 +48,10 @@ public:
virtual size_t write(uint8_t);
using Print::write; // pull in write(str) and write(buf, size) from Print
operator bool();
+
+ volatile uint8_t _rx_buffer_head;
+ volatile uint8_t _rx_buffer_tail;
+ unsigned char _rx_buffer[SERIAL_BUFFER_SIZE];
};
extern Serial_ Serial;
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index d3e0170..c46c75f 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -39,8 +39,8 @@ volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
//==================================================================
extern const u16 STRING_LANGUAGE[] PROGMEM;
-extern const u16 STRING_IPRODUCT[] PROGMEM;
-extern const u16 STRING_IMANUFACTURER[] PROGMEM;
+extern const u8 STRING_PRODUCT[] PROGMEM;
+extern const u8 STRING_MANUFACTURER[] PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
@@ -49,31 +49,24 @@ const u16 STRING_LANGUAGE[2] = {
0x0409 // English
};
-const u16 STRING_IPRODUCT[17] = {
- (3<<8) | (2+2*16),
-#if USB_PID == 0x8036
- 'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
-#elif USB_PID == 0x8037
- 'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
-#elif USB_PID == 0x803C
- 'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
-#elif USB_PID == 0x9208
- 'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
-#else
- 'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
+#ifndef USB_PRODUCT
+// If no product is provided, use USB IO Board
+#define USB_PRODUCT "USB IO Board"
#endif
-};
-const u16 STRING_IMANUFACTURER[12] = {
- (3<<8) | (2+2*11),
+const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT;
+
#if USB_VID == 0x2341
- 'A','r','d','u','i','n','o',' ','L','L','C'
+#define USB_MANUFACTURER "Arduino LLC"
#elif USB_VID == 0x1b4f
- 'S','p','a','r','k','F','u','n',' ',' ',' '
-#else
- 'U','n','k','n','o','w','n',' ',' ',' ',' '
+#define USB_MANUFACTURER "SparkFun"
+#elif !defined(USB_MANUFACTURER)
+// Fall through to unknown if no manufacturer name was provided in a macro
+#define USB_MANUFACTURER "Unknown"
#endif
-};
+
+const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;
+
#ifdef CDC_ENABLED
#define DEVICE_CLASS 0x02
@@ -416,6 +409,22 @@ int USB_SendControl(u8 flags, const void* d, int len)
return sent;
}
+// Send a USB descriptor string. The string is stored in PROGMEM as a
+// plain ASCII string but is sent out as UTF-16 with the correct 2-byte
+// prefix
+static bool USB_SendStringDescriptor(const u8*string_P, u8 string_len) {
+ SendControl(2 + string_len * 2);
+ SendControl(3);
+ for(u8 i = 0; i < string_len; i++) {
+ bool r = SendControl(pgm_read_byte(&string_P[i]));
+ r &= SendControl(0); // high byte
+ if(!r) {
+ return false;
+ }
+ }
+ return true;
+}
+
// Does not timeout or cross fifo boundaries
// Will only work for transfers <= 64 bytes
// TODO
@@ -476,7 +485,6 @@ bool SendDescriptor(Setup& setup)
return HID_GetDescriptor(t);
#endif
- u8 desc_length = 0;
const u8* desc_addr = 0;
if (USB_DEVICE_DESCRIPTOR_TYPE == t)
{
@@ -486,20 +494,22 @@ bool SendDescriptor(Setup& setup)
}
else if (USB_STRING_DESCRIPTOR_TYPE == t)
{
- if (setup.wValueL == 0)
+ if (setup.wValueL == 0) {
desc_addr = (const u8*)&STRING_LANGUAGE;
- else if (setup.wValueL == IPRODUCT)
- desc_addr = (const u8*)&STRING_IPRODUCT;
- else if (setup.wValueL == IMANUFACTURER)
- desc_addr = (const u8*)&STRING_IMANUFACTURER;
+ }
+ else if (setup.wValueL == IPRODUCT) {
+ return USB_SendStringDescriptor(STRING_PRODUCT, strlen(USB_PRODUCT));
+ }
+ else if (setup.wValueL == IMANUFACTURER) {
+ return USB_SendStringDescriptor(STRING_MANUFACTURER, strlen(USB_MANUFACTURER));
+ }
else
return false;
}
if (desc_addr == 0)
return false;
- if (desc_length == 0)
- desc_length = pgm_read_byte(desc_addr);
+ u8 desc_length = pgm_read_byte(desc_addr);
USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
return true;
diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
index e19f543..63af6d3 100644
--- a/cores/arduino/WString.cpp
+++ b/cores/arduino/WString.cpp
@@ -38,6 +38,12 @@ String::String(const String &value)
*this = value;
}
+String::String(const __FlashStringHelper *pstr)
+{
+ init();
+ *this = pstr;
+}
+
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String::String(String &&rval)
{
@@ -100,19 +106,20 @@ String::String(unsigned long value, unsigned char base)
*this = buf;
}
-String::String(float value, int decimalPlaces)
+String::String(float value, unsigned char decimalPlaces)
{
init();
char buf[33];
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
-String::String(double value, int decimalPlaces)
+String::String(double value, unsigned char decimalPlaces)
{
init();
char buf[33];
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
+
String::~String()
{
free(buffer);
@@ -127,7 +134,6 @@ inline void String::init(void)
buffer = NULL;
capacity = 0;
len = 0;
- flags = 0;
}
void String::invalidate(void)
@@ -173,6 +179,17 @@ String & String::copy(const char *cstr, unsigned int length)
return *this;
}
+String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
+{
+ if (!reserve(length)) {
+ invalidate();
+ return *this;
+ }
+ len = length;
+ strcpy_P(buffer, (const prog_char *)pstr);
+ return *this;
+}
+
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void String::move(String &rhs)
{
@@ -227,6 +244,14 @@ String & String::operator = (const char *cstr)
return *this;
}
+String & String::operator = (const __FlashStringHelper *pstr)
+{
+ if (pstr) copy(pstr, strlen_P((const prog_char *)pstr));
+ else invalidate();
+
+ return *this;
+}
+
/*********************************************/
/* concat */
/*********************************************/
@@ -270,14 +295,14 @@ unsigned char String::concat(unsigned char num)
unsigned char String::concat(int num)
{
- char buf[7];
+ char buf[12];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned int num)
{
- char buf[6];
+ char buf[11];
utoa(num, buf, 10);
return concat(buf, strlen(buf));
}
@@ -299,17 +324,29 @@ unsigned char String::concat(unsigned long num)
unsigned char String::concat(float num)
{
char buf[20];
- char* string = dtostrf(num, 8, 6, buf);
+ char* string = dtostrf(num, 4, 2, buf);
return concat(string, strlen(string));
}
unsigned char String::concat(double num)
{
char buf[20];
- char* string = dtostrf(num, 8, 6, buf);
+ char* string = dtostrf(num, 4, 2, buf);
return concat(string, strlen(string));
}
+unsigned char String::concat(const __FlashStringHelper * str)
+{
+ if (!str) return 0;
+ int length = strlen_P((const char *) str);
+ if (length == 0) return 1;
+ unsigned int newlen = len + length;
+ if (!reserve(newlen)) return 0;
+ strcpy_P(buffer + len, (const char *) str);
+ len = newlen;
+ return 1;
+}
+
/*********************************************/
/* Concatenate */
/*********************************************/
@@ -383,6 +420,14 @@ StringSumHelper & operator + (const StringSumHelper &lhs, double num)
if (!a.concat(num)) a.invalidate();
return a;
}
+
+StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs)
+{
+ StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
+ if (!a.concat(rhs)) a.invalidate();
+ return a;
+}
+
/*********************************************/
/* Comparison */
/*********************************************/
@@ -567,11 +612,6 @@ int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
return found;
}
-String String::substring( unsigned int left ) const
-{
- return substring(left, len);
-}
-
String String::substring(unsigned int left, unsigned int right) const
{
if (left > right) {
@@ -698,7 +738,6 @@ long String::toInt(void) const
return 0;
}
-
float String::toFloat(void) const
{
if (buffer) return float(atof(buffer));
diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
index 2d372c5..7402430 100644
--- a/cores/arduino/WString.h
+++ b/cores/arduino/WString.h
@@ -58,6 +58,7 @@ public:
// be false).
String(const char *cstr = "");
String(const String &str);
+ String(const __FlashStringHelper *str);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String(String &&rval);
String(StringSumHelper &&rval);
@@ -68,8 +69,8 @@ public:
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, int decimalPlaces=6);
- explicit String(double, int decimalPlaces=6);
+ explicit String(float, unsigned char decimalPlaces=2);
+ explicit String(double, unsigned char decimalPlaces=2);
~String(void);
// memory management
@@ -84,6 +85,7 @@ public:
// marked as invalid ("if (s)" will be false).
String & operator = (const String &rhs);
String & operator = (const char *cstr);
+ String & operator = (const __FlashStringHelper *str);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String & operator = (String &&rval);
String & operator = (StringSumHelper &&rval);
@@ -104,6 +106,7 @@ public:
unsigned char concat(unsigned long num);
unsigned char concat(float num);
unsigned char concat(double num);
+ unsigned char 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)
@@ -115,6 +118,9 @@ public:
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);
@@ -126,6 +132,7 @@ public:
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; }
@@ -164,7 +171,7 @@ public:
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;
+ String substring( unsigned int beginIndex ) const { return substring(beginIndex, len); };
String substring( unsigned int beginIndex, unsigned int endIndex ) const;
// modification
@@ -184,7 +191,6 @@ 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')
- unsigned char flags; // unused, for future features
protected:
void init(void);
void invalidate(void);
@@ -193,6 +199,7 @@ protected:
// copy and move
String & copy(const char *cstr, unsigned int length);
+ String & copy(const __FlashStringHelper *pstr, unsigned int length);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void move(String &rhs);
#endif
@@ -209,6 +216,8 @@ public:
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) {}
};
#endif // __cplusplus
diff --git a/cores/arduino/hooks.c b/cores/arduino/hooks.c
new file mode 100644
index 0000000..641eabc
--- /dev/null
+++ b/cores/arduino/hooks.c
@@ -0,0 +1,31 @@
+/*
+ Copyright (c) 2012 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
+*/
+
+/**
+ * Empty yield() hook.
+ *
+ * This function is intended to be used by library writers to build
+ * libraries or sketches that supports cooperative threads.
+ *
+ * Its defined as a weak symbol and it can be redefined to implement a
+ * real cooperative scheduler.
+ */
+static void __empty() {
+ // Empty
+}
+void yield(void) __attribute__ ((weak, alias("__empty")));
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index a3c4390..5cbe241 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -111,6 +111,7 @@ void delay(unsigned long ms)
uint16_t start = (uint16_t)micros();
while (ms > 0) {
+ yield();
if (((uint16_t)micros() - start) >= 1000) {
ms--;
start += 1000;
diff --git a/cores/arduino/wiring_private.h b/cores/arduino/wiring_private.h
index c366005..c366005 100755..100644
--- a/cores/arduino/wiring_private.h
+++ b/cores/arduino/wiring_private.h
diff --git a/cores/arduino/wiring_pulse.c b/cores/arduino/wiring_pulse.c
index 0d96886..0d96886 100755..100644
--- a/cores/arduino/wiring_pulse.c
+++ b/cores/arduino/wiring_pulse.c
diff --git a/cores/arduino/wiring_shift.c b/cores/arduino/wiring_shift.c
index cfe7867..cfe7867 100755..100644
--- a/cores/arduino/wiring_shift.c
+++ b/cores/arduino/wiring_shift.c
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-22 16:11:51 +0000