Skip to content

Commit 62b7233

Browse files
cmagliecmaglie
committed
Merged 1.0.5
Merge remote-tracking branch 'arduino/master' into ide-1.5.x Conflicts: app/src/processing/app/Base.java build/shared/revisions.txt hardware/arduino/avr/cores/arduino/malloc.c hardware/arduino/cores/arduino/avr-libc/malloc.c hardware/arduino/cores/arduino/malloc.c todo.txt
2 parents 03a7529 + c3b581b commit 62b7233

File tree

151 files changed

+52104
-18938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+52104
-18938
lines changed

‎build/shared/examples/05.Control/Arrays/Arrays.ino

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ int ledPins[] = {
2727
int pinCount = 6; // the number of pins (i.e. the length of the array)
2828

2929
void setup() {
30-
int thisPin;
3130
// the array elements are numbered from 0 to (pinCount - 1).
3231
// use a for loop to initialize each pin as an output:
3332
for (int thisPin = 0; thisPin < pinCount; thisPin++) {

‎build/shared/revisions.txt

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

99-
ARDUINO 1.0.4 - Not yet released.
99+
ARDUINO 1.0.5 - 2013.03.29
100+
101+
[core]
102+
103+
* [avr] malloc bug: backported avr-libc 1.8.0 implementation
104+
* [avr] removed deprecated interrupt handlers causing compiler issues
105+
with newer avr-gcc.
106+
107+
[libraries]
108+
109+
* Upgrades to WiFi library
110+
111+
[firmwares]
112+
113+
* Upgrades to WiFi firmwares
114+
115+
ARDUINO 1.0.4 - 2013.03.11
100116

101117
[core]
102118

@@ -107,6 +123,7 @@ ARDUINO 1.0.4 - Not yet released.
107123
* Fixed memory leak when calling Ethernet.begin() multiple times.
108124
* Fixed SD example listfiles.ino
109125
* Fixed a lot of Esplora examples
126+
* Added GSM library
110127

111128
[environment]
112129

@@ -115,6 +132,11 @@ ARDUINO 1.0.4 - Not yet released.
115132
* Fixed NPE due to permissions IO error
116133
* Updated drivers for Windows (all-in-one, signature for Win8)
117134

135+
[bootloaders]
136+
137+
* Fixed a bunch of bugs on Mega2560's bootloader (Mark Sproul)
138+
(https://github.com/arduino/Arduino/pull/1183)
139+
118140
ARDUINO 1.0.3 - 2012.12.10
119141

120142
[hardware]

‎build/shared/tools/howto.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ regarding the usefulness of including (by default) a Tool that mangles code.)
7171

7272
The folder should be called Mangler (note the capitalization), and contain:
7373

74-
sketchbook/Mangler -> tool folder
75-
sketchbook/Mangler/tool -> location for code
76-
sketchbook/Mangler/tool/mangle.jar -> jar with one or more classes
74+
sketchbook/tools/Mangler -> tool folder
75+
sketchbook/tools/Mangler/tool -> location for code
76+
sketchbook/tools/Mangler/tool/mangle.jar -> jar with one or more classes
7777

7878
The naming of jar and zip files in the tool/* directory doesn't matter.
7979

‎build/windows/dist/drivers/arduino.cat

-6 Bytes
Binary file not shown.

‎build/windows/dist/drivers/arduino.inf

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ leonardo.bootloader.name="Arduino Leonardo bootloader"
1313
leonardo.sketch.name="Arduino Leonardo"
1414
lilypadUSB.bootloader.name="Arduino LilyPad USB bootloader"
1515
lilypadUSB.sketch.name="Arduino LilyPad USB"
16+
mega2560.name="Arduino Mega 2560"
1617
mega2560rev3.name="Arduino Mega 2560"
1718
megaADK.name="Arduino Mega ADK"
1819
megaADKrev3.name="Arduino Mega ADK"

‎hardware/arduino/avr/bootloaders/stk500v2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ CINCS =
124124
CFLAGS = -g$(DEBUG)
125125
CFLAGS += $(CDEFS) $(CINCS)
126126
CFLAGS += -O$(OPT)
127-
CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -mno-tablejump
127+
CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -fno-jump-tables
128128
CFLAGS += -Wall -Wstrict-prototypes
129129
CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
130130
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

‎hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnproj

100755100644
File mode changed.

‎hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnps

100755100644
File mode changed.

‎hardware/arduino/avr/bootloaders/stk500v2/avr_cpunames.h

+189
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
//**************************************************************************************************
2+
//*
3+
//* Atmel AVR CPU name strings
4+
//*
5+
//**************************************************************************************************
6+
//* Sep 19, 2010 <MLS> Started on avr_cpunames.h
7+
//**************************************************************************************************
8+
9+
//#include "avr_cpunames.h"
10+
11+
//**************************************************************************************************
12+
13+
14+
#if defined (__AVR_AT94K__)
15+
#define _AVR_CPU_NAME_ "AT94k"
16+
#elif defined (__AVR_AT43USB320__)
17+
#elif defined (__AVR_AT43USB355__)
18+
#elif defined (__AVR_AT76C711__)
19+
#elif defined (__AVR_AT86RF401__)
20+
#elif defined (__AVR_AT90PWM1__)
21+
#elif defined (__AVR_AT90PWM2__)
22+
#elif defined (__AVR_AT90PWM2B__)
23+
#elif defined (__AVR_AT90PWM3__)
24+
#elif defined (__AVR_AT90PWM3B__)
25+
#elif defined (__AVR_AT90PWM216__)
26+
#elif defined (__AVR_AT90PWM316__)
27+
#elif defined (__AVR_ATmega32C1__)
28+
#elif defined (__AVR_ATmega32M1__)
29+
#elif defined (__AVR_ATmega32U4__)
30+
#define _AVR_CPU_NAME_ "ATmega32U4"
31+
#elif defined (__AVR_ATmega32U6__)
32+
#define _AVR_CPU_NAME_ "ATmega32U6"
33+
#elif defined (__AVR_ATmega128__)
34+
#define _AVR_CPU_NAME_ "Atmega128"
35+
#elif defined (__AVR_ATmega1280__)
36+
#define _AVR_CPU_NAME_ "ATmega1280"
37+
#elif defined (__AVR_ATmega1281__)
38+
#define _AVR_CPU_NAME_ "ATmega1281"
39+
#elif defined (__AVR_ATmega1284P__)
40+
#define _AVR_CPU_NAME_ "ATmega1284"
41+
#elif defined (__AVR_ATmega128RFA1__)
42+
#define _AVR_CPU_NAME_ "ATmega128RFA1"
43+
#elif defined (__AVR_ATmega2560__)
44+
#define _AVR_CPU_NAME_ "ATmega2560"
45+
#elif defined (__AVR_ATmega2561__)
46+
#define _AVR_CPU_NAME_ "ATmega2561"
47+
#elif defined (__AVR_AT90CAN32__)
48+
#define _AVR_CPU_NAME_ "AT90CAN32"
49+
#elif defined (__AVR_AT90CAN64__)
50+
#define _AVR_CPU_NAME_ "AT90CAN64"
51+
#elif defined (__AVR_AT90CAN128__)
52+
#define _AVR_CPU_NAME_ "AT90CAN128"
53+
#elif defined (__AVR_AT90USB82__)
54+
#define _AVR_CPU_NAME_ "AT90USB82"
55+
#elif defined (__AVR_AT90USB162__)
56+
#define _AVR_CPU_NAME_ "AT90USB162"
57+
#elif defined (__AVR_AT90USB646__)
58+
#define _AVR_CPU_NAME_ "AT90USB646"
59+
#elif defined (__AVR_AT90USB647__)
60+
#define _AVR_CPU_NAME_ "AT90USB647"
61+
#elif defined (__AVR_AT90USB1286__)
62+
#define _AVR_CPU_NAME_ "AT90USB1286"
63+
#elif defined (__AVR_AT90USB1287__)
64+
#define _AVR_CPU_NAME_ "AT90USB1287"
65+
#elif defined (__AVR_ATmega64__)
66+
#define _AVR_CPU_NAME_ "ATmega64"
67+
#elif defined (__AVR_ATmega640__)
68+
#define _AVR_CPU_NAME_ "ATmega640"
69+
#elif defined (__AVR_ATmega644__)
70+
#define _AVR_CPU_NAME_ "ATmega644"
71+
#elif defined (__AVR_ATmega644P__)
72+
#define _AVR_CPU_NAME_ "ATmega644P"
73+
#elif defined (__AVR_ATmega645__)
74+
#define _AVR_CPU_NAME_ "ATmega645"
75+
#elif defined (__AVR_ATmega6450__)
76+
#define _AVR_CPU_NAME_ "ATmega6450"
77+
#elif defined (__AVR_ATmega649__)
78+
#define _AVR_CPU_NAME_ "ATmega649"
79+
#elif defined (__AVR_ATmega6490__)
80+
#define _AVR_CPU_NAME_ "ATmega6490"
81+
#elif defined (__AVR_ATmega103__)
82+
#define _AVR_CPU_NAME_ "ATmega103"
83+
#elif defined (__AVR_ATmega32__)
84+
#define _AVR_CPU_NAME_ "Atmega32"
85+
#elif defined (__AVR_ATmega323__)
86+
#define _AVR_CPU_NAME_ "ATmega323"
87+
#elif defined (__AVR_ATmega324P__)
88+
#define _AVR_CPU_NAME_ "ATmega324P"
89+
#elif defined (__AVR_ATmega325__)
90+
#define _AVR_CPU_NAME_ "ATmega325"
91+
#elif defined (__AVR_ATmega325P__)
92+
#define _AVR_CPU_NAME_ "ATmega325P"
93+
#elif defined (__AVR_ATmega3250__)
94+
#define _AVR_CPU_NAME_ "ATmega3250"
95+
#elif defined (__AVR_ATmega3250P__)
96+
#define _AVR_CPU_NAME_ "ATmega3250P"
97+
#elif defined (__AVR_ATmega328P__)
98+
#define _AVR_CPU_NAME_ "ATmega328P"
99+
#elif defined (__AVR_ATmega329__)
100+
#define _AVR_CPU_NAME_ "ATmega329"
101+
#elif defined (__AVR_ATmega329P__)
102+
#define _AVR_CPU_NAME_ "ATmega329P"
103+
#elif defined (__AVR_ATmega3290__)
104+
#define _AVR_CPU_NAME_ "ATmega3290"
105+
#elif defined (__AVR_ATmega3290P__)
106+
#define _AVR_CPU_NAME_ "ATmega3290P"
107+
#elif defined (__AVR_ATmega32HVB__)
108+
#define _AVR_CPU_NAME_ "ATmega32HVB"
109+
#elif defined (__AVR_ATmega406__)
110+
#define _AVR_CPU_NAME_ "ATmega406"
111+
#elif defined (__AVR_ATmega16__)
112+
#define _AVR_CPU_NAME_ "Atmega16"
113+
#elif defined (__AVR_ATmega161__)
114+
#define _AVR_CPU_NAME_ "ATmega161"
115+
#elif defined (__AVR_ATmega162__)
116+
#define _AVR_CPU_NAME_ "ATmega162"
117+
#elif defined (__AVR_ATmega163__)
118+
#define _AVR_CPU_NAME_ "ATmega163"
119+
#elif defined (__AVR_ATmega164P__)
120+
#define _AVR_CPU_NAME_ "ATmega164P"
121+
#elif defined (__AVR_ATmega165__)
122+
#define _AVR_CPU_NAME_ "ATmega165"
123+
#elif defined (__AVR_ATmega165P__)
124+
#define _AVR_CPU_NAME_ "ATmega165P"
125+
#elif defined (__AVR_ATmega168__)
126+
#define _AVR_CPU_NAME_ "ATmega168"
127+
#elif defined (__AVR_ATmega168P__)
128+
#define _AVR_CPU_NAME_ "ATmega168P"
129+
#elif defined (__AVR_ATmega169__)
130+
#define _AVR_CPU_NAME_ "Atmega169"
131+
#elif defined (__AVR_ATmega169P__)
132+
#define _AVR_CPU_NAME_ "ATmega169P"
133+
#elif defined (__AVR_ATmega8HVA__)
134+
#define _AVR_CPU_NAME_ "ATmega8HVA"
135+
#elif defined (__AVR_ATmega16HVA__)
136+
#define _AVR_CPU_NAME_ "ATmega16HVA"
137+
#elif defined (__AVR_ATmega8__)
138+
#define _AVR_CPU_NAME_ "ATmega8"
139+
#elif defined (__AVR_ATmega48__)
140+
#define _AVR_CPU_NAME_ "ATmega48"
141+
#elif defined (__AVR_ATmega48P__)
142+
#define _AVR_CPU_NAME_ "ATmega48P"
143+
#elif defined (__AVR_ATmega88__)
144+
#define _AVR_CPU_NAME_ "ATmega88"
145+
#elif defined (__AVR_ATmega88P__)
146+
#define _AVR_CPU_NAME_ "ATmega88P"
147+
#elif defined (__AVR_ATmega8515__)
148+
#define _AVR_CPU_NAME_ "ATmega8515"
149+
#elif defined (__AVR_ATmega8535__)
150+
#define _AVR_CPU_NAME_ "ATmega8535"
151+
#elif defined (__AVR_AT90S8535__)
152+
#elif defined (__AVR_AT90C8534__)
153+
#elif defined (__AVR_AT90S8515__)
154+
#elif defined (__AVR_AT90S4434__)
155+
#elif defined (__AVR_AT90S4433__)
156+
#elif defined (__AVR_AT90S4414__)
157+
#elif defined (__AVR_ATtiny22__)
158+
#elif defined (__AVR_ATtiny26__)
159+
#elif defined (__AVR_AT90S2343__)
160+
#elif defined (__AVR_AT90S2333__)
161+
#elif defined (__AVR_AT90S2323__)
162+
#elif defined (__AVR_AT90S2313__)
163+
#elif defined (__AVR_ATtiny2313__)
164+
#define _AVR_CPU_NAME_ "ATtiny2313"
165+
#elif defined (__AVR_ATtiny13__)
166+
#elif defined (__AVR_ATtiny13A__)
167+
#elif defined (__AVR_ATtiny25__)
168+
#elif defined (__AVR_ATtiny45__)
169+
#elif defined (__AVR_ATtiny85__)
170+
#elif defined (__AVR_ATtiny24__)
171+
#elif defined (__AVR_ATtiny44__)
172+
#elif defined (__AVR_ATtiny84__)
173+
#elif defined (__AVR_ATtiny261__)
174+
#elif defined (__AVR_ATtiny461__)
175+
#elif defined (__AVR_ATtiny861__)
176+
#elif defined (__AVR_ATtiny43U__)
177+
#elif defined (__AVR_ATtiny48__)
178+
#elif defined (__AVR_ATtiny88__)
179+
#elif defined (__AVR_ATtiny167__)
180+
#elif defined (__AVR_ATmega8U2__)
181+
#define _AVR_CPU_NAME_ "ATmega8U2"
182+
#else
183+
#error cpu not defined
184+
#endif
185+
186+
187+
#if !defined (_AVR_CPU_NAME_)
188+
// #define _AVR_CPU_NAME_ "UNKNOWN"
189+
#endif

0 commit comments

Comments
 (0)