Skip to content

Commit 3394f61

Browse files
cmagliecmaglie
committed
Merged 1.0.5
2 parents 4486a92 + 22320db commit 3394f61

File tree

168 files changed

+26202
-20
lines changed

Some content is hidden

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

168 files changed

+26202
-20
lines changed

‎build/shared/examples/02.Digital/toneMultiple/toneMultiple.ino

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plays multiple tones on multiple pins in sequence
55
66
circuit:
7-
* 3 8-ohm speaker on digital pins 6, 7, and 11
7+
* 3 8-ohm speaker on digital pins 6, 7, and 8
88
99
created 8 March 2010
1010
by Tom Igoe
@@ -21,8 +21,8 @@ void setup() {
2121
}
2222

2323
void loop() {
24-
// turn off tone function for pin 11:
25-
noTone(11);
24+
// turn off tone function for pin 8:
25+
noTone(8);
2626
// play a note on pin 6 for 200 ms:
2727
tone(6, 440, 200);
2828
delay(200);
@@ -35,8 +35,7 @@ void loop() {
3535

3636
// turn off tone function for pin 7:
3737
noTone(7);
38-
// play a note on pin 11 for 500 ms:
39-
tone(11, 523, 300);
38+
// play a note on pin 8 for 500 ms:
39+
tone(8, 523, 300);
4040
delay(300);
41-
4241
}

‎build/shared/revisions.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ ARDUINO 1.5.3 BETA
2121
[firmwares]
2222
* Arduino Due: fixed USB2Serial garbage at startup (https://github.com/arduino/Arduino/pull/1267)
2323

24+
[other]
25+
* Merged all improvements made in Arduino IDE 1.0.5
26+
2427
ARDUINO 1.5.2 BETA - 2013.02.06
2528

2629
[ide]
@@ -56,7 +59,7 @@ ARDUINO 1.5.2 BETA - 2013.02.06
5659

5760
[other]
5861
* Merged all improvements made in Arduino IDE 1.0.3
59-
* Merged all improvements made in Arduino IDE 1.0.4 (not yet released)
62+
* Merged all improvements made in Arduino IDE 1.0.4
6063

6164
ARDUINO 1.5.1r2 BETA - 2012.11.06
6265

@@ -112,6 +115,8 @@ ARDUINO 1.0.5 - 2013.05.15
112115

113116
* Upgrades to WiFi library
114117
* Fixed a bunch of examples
118+
* Added Arduino Robot libraries
119+
* Added TFT display library
115120

116121
[firmwares]
117122

@@ -120,7 +125,6 @@ ARDUINO 1.0.5 - 2013.05.15
120125
[ide]
121126

122127
* Backport from 1.5: install Library from .zip file or folder
123-
* Added button "Copy error to clipboard" (Paul Stoffregen)
124128
* Updated windows drivers
125129
* Added Windows installer
126130

@@ -129,6 +133,7 @@ ARDUINO 1.0.4 - 2013.03.11
129133
[core]
130134

131135
* Fixed malloc bug (Paul Stoffregen)
136+
* Added INT6 support for Leonardo (Federico Vanzati)
132137

133138
[libraries]
134139

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

360 Bytes
Binary file not shown.

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

+16
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ micro.sketch.name="Arduino Micro"
2222
uno.name="Arduino Uno"
2323
unoR3.name="Arduino Uno"
2424
usbserial.name="Arduino USB Serial Light Adapter"
25+
robotControl.bootloader.name="Arduino Robot Control bootloader"
26+
robotControl.sketch.name="Arduino Robot"
27+
robotMotor.bootloader.name="Arduino Robot Motor bootloader"
28+
robotMotor.sketch.name="Arduino Robot"
2529

2630
[DefaultInstall]
2731
CopyINF=arduino.inf
@@ -61,6 +65,10 @@ DefaultDestDir=12
6165
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
6266
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
6367
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
68+
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
69+
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
70+
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
71+
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
6472

6573
[DeviceList.NTamd64]
6674
%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
@@ -81,6 +89,10 @@ DefaultDestDir=12
8189
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
8290
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
8391
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
92+
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
93+
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
94+
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
95+
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
8496

8597
[DeviceList.NTia64]
8698
%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
@@ -98,6 +110,10 @@ DefaultDestDir=12
98110
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
99111
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
100112
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
113+
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
114+
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
115+
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
116+
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
101117

102118
[DriverInstall]
103119
include=mdmcpq.inf,usb.inf

‎hardware/arduino/avr/boards.txt

+58
Original file line numberDiff line numberDiff line change
@@ -586,3 +586,61 @@ atmegang.menu.cpu.atmega8.bootloader.file=atmega8/ATmegaBOOT-prod-firmware-2009-
586586

587587
atmegang.menu.cpu.atmega8.build.mcu=atmega8
588588

589+
##############################################################
590+
591+
robotControl.name=Arduino Robot Control
592+
robotControl.upload.tool=avrdude
593+
robotControl.upload.protocol=avr109
594+
robotControl.upload.maximum_size=28672
595+
robotControl.upload.data_size=2560
596+
robotControl.upload.speed=57600
597+
robotControl.upload.disable_flushing=true
598+
robotControl.upload.use_1200bps_touch=true
599+
robotControl.upload.wait_for_upload_port=true
600+
601+
robotControl.bootloader.tool=avrdude
602+
robotControl.bootloader.low_fuses=0xff
603+
robotControl.bootloader.high_fuses=0xd8
604+
robotControl.bootloader.extended_fuses=0xcb
605+
robotControl.bootloader.file=caterina-Arduino_Robot/Caterina-Robot-Control.hex
606+
robotControl.bootloader.unlock_bits=0x3F
607+
robotControl.bootloader.lock_bits=0x2F
608+
609+
robotControl.build.mcu=atmega32u4
610+
robotControl.build.f_cpu=16000000L
611+
robotControl.build.vid=0x2341
612+
robotControl.build.pid=0x8038
613+
robotControl.build.board=AVR_ROBOT_CONTROL
614+
robotControl.build.core=robot
615+
robotControl.build.variant=robot_control
616+
robotControl.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
617+
618+
##############################################################
619+
620+
robotMotor.name=Arduino Robot Motor
621+
robotMotor.upload.tool=avrdude
622+
robotMotor.upload.protocol=avr109
623+
robotMotor.upload.maximum_size=28672
624+
robotMotor.upload.data_size=2560
625+
robotMotor.upload.speed=57600
626+
robotMotor.upload.disable_flushing=true
627+
robotMotor.upload.use_1200bps_touch=true
628+
robotMotor.upload.wait_for_upload_port=true
629+
630+
robotMotor.bootloader.tool=avrdude
631+
robotMotor.bootloader.low_fuses=0xff
632+
robotMotor.bootloader.high_fuses=0xd8
633+
robotMotor.bootloader.extended_fuses=0xcb
634+
robotMotor.bootloader.file=caterina-Arduino_Robot/Caterina-Robot-Motor.hex
635+
robotMotor.bootloader.unlock_bits=0x3F
636+
robotMotor.bootloader.lock_bits=0x2F
637+
638+
robotMotor.build.mcu=atmega32u4
639+
robotMotor.build.f_cpu=16000000L
640+
robotMotor.build.vid=0x2341
641+
robotMotor.build.pid=0x8039
642+
robotMotor.build.board=AVR_ROBOT_MOTOR
643+
robotMotor.build.core=robot
644+
robotMotor.build.variant=robot_motor
645+
robotMotor.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
646+

0 commit comments

Comments
 (0)