Skip to content

Commit 44bcd20

Browse files
committed
Merge branch 'master' into ide-1.5.x
Conflicts: app/src/processing/app/Base.java build/build.xml todo.txt
2 parents 5f67650 + 90bd172 commit 44bcd20

File tree

3 files changed

+8
-205
lines changed

3 files changed

+8
-205
lines changed

build/shared/revisions.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ ARDUINO 1.5 BETA - 2012.10.22
318318
* For more info refer to this press release:
319319
http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/
320320

321-
ARDUINO 1.0.6 - not yet released
321+
ARDUINO 1.0.6 - 2014.09.16
322322

323323
[core]
324324
* avr: Improved USB-CDC write speed (Justin Rajewski)
@@ -330,6 +330,7 @@ ARDUINO 1.0.6 - not yet released
330330
* Backported Print class from IDE 1.5.x
331331
* Backported digitalPinToInterrupt macro from IDE 1.5.x
332332
* Added initVariant() hook to allow 3rd party variant-specific initialization
333+
* Added replacement stub for cstdlib atexit() function (Christopher Andrews)
333334

334335
[ide]
335336
* Added compatibility for IDE 1.5.x libraries layout
@@ -342,6 +343,7 @@ ARDUINO 1.0.6 - not yet released
342343
* Robot_Control: updated turning algorithm (Xun Yang)
343344
* Esplora: added reading form Tinkerkit inputs
344345
* SoftwareSerial: Fix idle level when initializing with inverted logic (Jens-Christian Skibakk)
346+
* fixed a bunch of examples
345347

346348
[firmware]
347349
* Wifishield: fixed paths on firmware upgrade scripts

hardware/arduino/avr/firmwares/atmegaxxu2/arduino-usbserial/Descriptors.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* number of device configurations. The descriptor is read out by the USB host when the enumeration
5555
* process begins.
5656
*/
57-
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
57+
const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
5858
{
5959
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
6060

@@ -82,7 +82,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
8282
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
8383
* a configuration so that the host may correctly communicate with the USB device.
8484
*/
85-
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
85+
const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
8686
{
8787
.Config =
8888
{
@@ -190,7 +190,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
190190
* the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
191191
* via the language ID table available at USB.org what languages the device supports for its string descriptors.
192192
*/
193-
USB_Descriptor_String_t PROGMEM LanguageString =
193+
const USB_Descriptor_String_t PROGMEM LanguageString =
194194
{
195195
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
196196

@@ -201,7 +201,7 @@ USB_Descriptor_String_t PROGMEM LanguageString =
201201
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
202202
* Descriptor.
203203
*/
204-
USB_Descriptor_String_t PROGMEM ManufacturerString =
204+
const USB_Descriptor_String_t PROGMEM ManufacturerString =
205205
{
206206
.Header = {.Size = USB_STRING_LEN(24), .Type = DTYPE_String},
207207

@@ -212,7 +212,7 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
212212
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
213213
* Descriptor.
214214
*/
215-
USB_Descriptor_String_t PROGMEM ProductString =
215+
const USB_Descriptor_String_t PROGMEM ProductString =
216216
{
217217
#if (ARDUINO_MODEL_PID == ARDUINO_UNO_PID)
218218
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

todo.txt

-199
This file was deleted.

0 commit comments

Comments
 (0)