Skip to content

Commit 66ee23b

Browse files
cmagliecmaglie
committed
Merged 1.0.3
2 parents 9fdb047 + 6dbc2bf commit 66ee23b

Some content is hidden

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

49 files changed

+24128
-16320
lines changed

‎build/shared/examples/10.StarterKit/p04_ColorMixingLamp/p04_ColorMixingLamp.ino

+17-16
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
three 10 kilohm resistors
1111
3 220 ohm resistors
1212
3 photoresistors
13-
red green aand blue colored gels
13+
red green and blue colored gels
1414
1515
Created 13 September 2012
16+
Modified 14 November 2012
1617
by Scott Fitzgerald
1718
Thanks to Federico Vanzati for improvements
1819
@@ -42,42 +43,42 @@ void setup() {
4243
Serial.begin(9600);
4344

4445
// set the digital pins as outputs
45-
pinMode(greenLedPin,OUTPUT);
46-
pinMode(redLedPin,OUTPUT);
47-
pinMode(blueLedPin,OUTPUT);
46+
pinMode(greenLEDPin,OUTPUT);
47+
pinMode(redLEDPin,OUTPUT);
48+
pinMode(blueLEDPin,OUTPUT);
4849
}
4950

5051
void loop() {
5152
// Read the sensors first:
5253

5354
// read the value from the red-filtered photoresistor:
54-
redsensorValue = analogRead(redsensorPin);
55+
redSensorValue = analogRead(redSensorPin);
5556
// give the ADC a moment to settle
5657
delay(5);
5758
// read the value from the green-filtered photoresistor:
58-
greensensorValue = analogRead(greensensorPin);
59+
greenSensorValue = analogRead(greenSensorPin);
5960
// give the ADC a moment to settle
6061
delay(5);
6162
// read the value from the blue-filtered photoresistor:
62-
bluesensorValue = analogRead(bluesensorPin);
63+
blueSensorValue = analogRead(blueSensorPin);
6364

6465
// print out the values to the serial monitor
6566
Serial.print("raw sensor Values \t red: ");
66-
Serial.print(redsensorValue);
67+
Serial.print(redSensorValue);
6768
Serial.print("\t green: ");
68-
Serial.print(greensensorValue);
69+
Serial.print(greenSensorValue);
6970
Serial.print("\t Blue: ");
70-
Serial.println(bluesensorValue);
71+
Serial.println(blueSensorValue);
7172

7273
/*
7374
In order to use the values from the sensor for the LED,
7475
you need to do some math. The ADC provides a 10-bit number,
7576
but analogWrite() uses 8 bits. You'll want to divide your
7677
sensor readings by 4 to keep them in range of the output.
7778
*/
78-
redValue = redsensorValue/4;
79-
greenValue = greensensorValue/4;
80-
blueValue = bluesensorValue/4;
79+
redValue = redSensorValue/4;
80+
greenValue = greenSensorValue/4;
81+
blueValue = blueSensorValue/4;
8182

8283
// print out the mapped values
8384
Serial.print("Mapped sensor Values \t red: ");
@@ -90,8 +91,8 @@ void loop() {
9091
/*
9192
Now that you have a usable value, it's time to PWM the LED.
9293
*/
93-
analogWrite(redLedPin, redValue);
94-
analogWrite(greenLedPin, greenValue);
95-
analogWrite(blueLedPin, blueValue);
94+
analogWrite(redLEDPin, redValue);
95+
analogWrite(greenLEDPin, greenValue);
96+
analogWrite(blueLEDPin, blueValue);
9697
}
9798

‎build/shared/lib/keywords.txt

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ null KEYWORD1
4848
private KEYWORD1
4949
protected KEYWORD1
5050
public KEYWORD1
51+
register KEYWORD1
5152
return KEYWORD1 Return
5253
short KEYWORD1
5354
signed KEYWORD1

‎build/shared/revisions.txt

+27
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,33 @@ ARDUINO BETA 1.5 - 2012.10.22
5353
* For more info refer to this press release:
5454
http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/
5555

56+
ARDUINO 1.0.3 - 2012.12.10
57+
58+
[hardware]
59+
60+
* Added support for the Arduino Esplora
61+
62+
[environment]
63+
64+
* Signed application for MacOSX 10.8
65+
66+
[core]
67+
68+
* Fixed power-up-starts-bootloader in Leonardo (and derivative)
69+
bootloaders. (Kristian Lauszus)
70+
(https://github.com/arduino/Arduino/pull/118)
71+
72+
* Fixed digital_pin_to_timer_PGM array in Leonardo variant.
73+
74+
* Published updated Wifi firmware
75+
76+
* Updated source code for atmega8 bootloader
77+
78+
[libraries]
79+
80+
* Added 600 baud support in SoftwareSerial (Sébastien Jean)
81+
(http://github.com/arduino/Arduino/issues/1146)
82+
5683
ARDUINO 1.0.2 - 2012.11.05
5784

5885
[hardware]

‎build/windows/dist/drivers/Arduino Esplora.inf

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
;************************************************************
2+
; Windows USB CDC ACM Setup File
3+
; Copyright (c) 2000 Microsoft Corporation
4+
5+
6+
[Version]
7+
Signature="$Windows NT$"
8+
Class=Ports
9+
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
10+
Provider=%MFGNAME%
11+
LayoutFile=layout.inf
12+
CatalogFile=%MFGFILENAME%.cat
13+
DriverVer=11/15/2007,5.1.2600.0
14+
15+
[Manufacturer]
16+
%MFGNAME%=DeviceList, NTamd64
17+
18+
[DestinationDirs]
19+
DefaultDestDir=12
20+
21+
22+
;------------------------------------------------------------------------------
23+
; Windows 2000/XP/Vista-32bit Sections
24+
;------------------------------------------------------------------------------
25+
26+
[DriverInstall.nt]
27+
include=mdmcpq.inf
28+
CopyFiles=DriverCopyFiles.nt
29+
AddReg=DriverInstall.nt.AddReg
30+
31+
[DriverCopyFiles.nt]
32+
usbser.sys,,,0x20
33+
34+
[DriverInstall.nt.AddReg]
35+
HKR,,DevLoader,,*ntkern
36+
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
37+
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
38+
39+
[DriverInstall.nt.Services]
40+
AddService=usbser, 0x00000002, DriverService.nt
41+
42+
[DriverService.nt]
43+
DisplayName=%SERVICE%
44+
ServiceType=1
45+
StartType=3
46+
ErrorControl=1
47+
ServiceBinary=%12%\%DRIVERFILENAME%.sys
48+
49+
;------------------------------------------------------------------------------
50+
; Vista-64bit Sections
51+
;------------------------------------------------------------------------------
52+
53+
[DriverInstall.NTamd64]
54+
include=mdmcpq.inf
55+
CopyFiles=DriverCopyFiles.NTamd64
56+
AddReg=DriverInstall.NTamd64.AddReg
57+
58+
[DriverCopyFiles.NTamd64]
59+
%DRIVERFILENAME%.sys,,,0x20
60+
61+
[DriverInstall.NTamd64.AddReg]
62+
HKR,,DevLoader,,*ntkern
63+
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
64+
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
65+
66+
[DriverInstall.NTamd64.Services]
67+
AddService=usbser, 0x00000002, DriverService.NTamd64
68+
69+
[DriverService.NTamd64]
70+
DisplayName=%SERVICE%
71+
ServiceType=1
72+
StartType=3
73+
ErrorControl=1
74+
ServiceBinary=%12%\%DRIVERFILENAME%.sys
75+
76+
77+
;------------------------------------------------------------------------------
78+
; Vendor and Product ID Definitions
79+
;------------------------------------------------------------------------------
80+
; When developing your USB device, the VID and PID used in the PC side
81+
; application program and the firmware on the microcontroller must match.
82+
; Modify the below line to use your VID and PID. Use the format as shown below.
83+
; Note: One INF file can be used for multiple devices with different VID and PIDs.
84+
; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
85+
;------------------------------------------------------------------------------
86+
[SourceDisksFiles]
87+
[SourceDisksNames]
88+
[DeviceList]
89+
%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_003C
90+
%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_803C&MI_00
91+
92+
[DeviceList.NTamd64]
93+
%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_003C
94+
%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_803C&MI_00
95+
96+
;------------------------------------------------------------------------------
97+
; String Definitions
98+
;------------------------------------------------------------------------------
99+
;Modify these strings to customize your device
100+
;------------------------------------------------------------------------------
101+
[Strings]
102+
MFGFILENAME="CDC_vista"
103+
DRIVERFILENAME ="usbser"
104+
MFGNAME="Arduino LLC (www.arduino.cc)"
105+
INSTDISK="Arduino Esplora Driver Installer"
106+
DESCRIPTION="Arduino Esplora"
107+
SERVICE="USB RS-232 Emulation Driver"

‎hardware/arduino/avr/boards.txt

+28-1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,33 @@ micro.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
206206

207207
##############################################################
208208

209+
esplora.name=Arduino Esplora
210+
esplora.upload.tool=avrdude
211+
esplora.upload.protocol=avr109
212+
esplora.upload.maximum_size=28672
213+
esplora.upload.speed=57600
214+
esplora.upload.disable_flushing=true
215+
esplora.upload.use_1200bps_touch=true
216+
esplora.upload.wait_for_upload_port=true
217+
218+
esplora.bootloader.tool=avrdude
219+
esplora.bootloader.low_fuses=0xff
220+
esplora.bootloader.high_fuses=0xd8
221+
esplora.bootloader.extended_fuses=0xcb
222+
esplora.bootloader.file=caterina/Caterina-Esplora.hex
223+
esplora.bootloader.unlock_bits=0x3F
224+
esplora.bootloader.lock_bits=0x2F
225+
226+
esplora.build.mcu=atmega32u4
227+
esplora.build.f_cpu=16000000L
228+
esplora.build.vid=0x2341
229+
esplora.build.pid=0x8036
230+
esplora.build.core=arduino
231+
esplora.build.variant=leonardo
232+
esplora.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
233+
234+
##############################################################
235+
209236
mini.name=Arduino Mini
210237

211238
mini.upload.tool=avrdude
@@ -501,6 +528,6 @@ menu.cpu.atmegang.atmega8.upload.maximum_size=7168
501528

502529
menu.cpu.atmegang.atmega8.bootloader.low_fuses=0xdf
503530
menu.cpu.atmegang.atmega8.bootloader.high_fuses=0xca
504-
menu.cpu.atmegang.atmega8.bootloader.file=atmegang/ATmegaBOOT.hex
531+
menu.cpu.atmegang.atmega8.bootloader.file=atmega8/ATmegaBOOT.hex
505532

506533
menu.cpu.atmegang.atmega8.build.mcu=atmega8

‎hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
:101C000012C02BC02AC029C028C027C026C025C0AA
2+
:101C100024C023C022C021C020C01FC01EC01DC0C0
3+
:101C20001CC01BC01AC011241FBECFE5D4E0DEBF0C
4+
:101C3000CDBF10E0A0E6B0E0E8EEFFE102C0059005
5+
:101C40000D92A236B107D9F711E0A2E6B0E001C0CB
6+
:101C50001D92AA36B107E1F74FC0D2CFEF92FF92A3
7+
:101C60000F931F93EE24FF24870113C00894E11CF7
8+
:101C7000F11C011D111D81E0E81682E1F8068AE7DA
9+
:101C8000080780E0180728F0E0916200F0916300F7
10+
:101C900009955F9BEBCF8CB1992787FD90951F919C
11+
:101CA0000F91FF90EF9008955D9BFECF8CB9089542
12+
:101CB000D5DF803221F484E1F7DF80E1F5DF08959C
13+
:101CC0001F93182FCBDF803231F484E1EDDF812FB9
14+
:101CD000EBDF80E1E9DF1F9108951F93CF93DF933E
15+
:101CE000182FC0E0D0E002C0B9DF2196C117E0F3A1
16+
:101CF000DF91CF911F910895CFE5D4E0DEBFCDBF36
17+
:101D0000000010BC83E389B988E18AB986E880BD08
18+
:101D1000BD9A1092680130E2E0E0F0E02FE088B375
19+
:101D2000832788BBCF010197F1F7215027FFF7CF19
20+
:101D300020E12093680192DF803381F1813399F4AF
21+
:101D40008DDF8032C1F784E1AFDF81E4ADDF86E56E
22+
:101D5000ABDF82E5A9DF80E2A7DF89E4A5DF83E5C9
23+
:101D6000A3DF80E5C7C0803429F478DF8638B0F07F
24+
:101D700075DF14C0813471F471DF803811F482E0B2
25+
:101D80001DC1813811F481E019C1823809F015C1F3
26+
:101D900082E114C1823421F484E19FDF89DFCBCF5B
27+
:101DA000853411F485E0F9CF8035C1F38135B1F385
28+
:101DB0008235A1F3853539F451DF809364004EDF1D
29+
:101DC00080936500EBCF863519F484E086DFF5C09B
30+
:101DD000843609F093C042DF809367013FDF809330
31+
:101DE0006601809169018E7F8093690137DF8534B8
32+
:101DF00029F480916901816080936901C0E0D0E09D
33+
:101E000006E610E005C02ADFF80181938F012196D4
34+
:101E10008091660190916701C817D907A0F31EDF72
35+
:101E2000803209F088CF8091690180FF1FC020E0D7
36+
:101E300030E0E6E6F0E012C0A0916400B0916500E9
37+
:101E40008191082EC5D08091640090916500019623
38+
:101E500090936500809364002F5F3F4F80916601EF
39+
:101E6000909167012817390738F343C0F894E19936
40+
:101E7000FECF1127E0916400F0916500EE0FFF1F87
41+
:101E8000C6E6D0E0809166019091670180FF01C0B5
42+
:101E90000196103051F422D003E000935700E895EA
43+
:101EA0001DD001E100935700E8950990199016D0D4
44+
:101EB00001E000935700E8951395103258F0112770
45+
:101EC0000DD005E000935700E89508D001E100939C
46+
:101ED0005700E8953296029739F0DBCF0091570012
47+
:101EE00001700130D9F30895103011F00296E7CF58
48+
:101EF000112484E1D9DE80E1D7DE1DCF843709F0DB
49+
:101F00004BC0ACDE80936701A9DE80936601A6DE3C
50+
:101F100090916901853421F49160909369010DC01D
51+
:101F20009E7F909369018091640090916500880F75
52+
:101F3000991F909365008093640090DE803209F0D1
53+
:101F4000FACE84E1B1DEC0E0D0E01EC0809169012C
54+
:101F500080FF07C0A0916400B091650031D0802D52
55+
:101F600008C081FD07C0E0916400F0916500E49134
56+
:101F70008E2F9ADE80916400909165000196909377
57+
:101F800065008093640021968091660190916701BD
58+
:101F9000C817D907D8F2AFCF853761F45FDE80323A
59+
:101FA00009F0C9CE84E180DE8EE17EDE83E97CDE4D
60+
:101FB00087E0A0CF863709F0BECE80E081DEBBCEC1
61+
:101FC000E199FECFBFBBAEBBE09A11960DB208956A
62+
:101FD000E199FECFBFBBAEBB0DBA11960FB6F89418
63+
:081FE000E29AE19A0FBE089598
64+
:021FE800800077
65+
:0400000300001C00DD
66+
:00000001FF

‎hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <avr/pgmspace.h>
3737
#include <avr/eeprom.h>
3838
#include <avr/interrupt.h>
39-
#include <avr/delay.h>
39+
#include <util/delay.h>
4040

4141
//#define F_CPU 16000000
4242

0 commit comments

Comments
 (0)