Skip to content

Commit 73e5775

Browse files
jfjlarosjfjlaros
authored
Merge branch 'arduino:master' into eeprom
2 parents fcb276c + eabd762 commit 73e5775

File tree

20 files changed

+44
-36
lines changed

20 files changed

+44
-36
lines changed

‎.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See: https://github.com/codespell-project/codespell#using-a-config-file
22
[codespell]
33
# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
4-
ignore-words-list = hart,pullrequest
4+
ignore-words-list = clen,hart,pullrequest
55
builtin = clear
66
check-filenames =
77
check-hidden =

‎boards.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ yun.build.extra_flags={build.usb_flags}
5858

5959
##############################################################
6060

61-
uno.name=Arduino Uno
61+
uno.name=Arduino UNO
6262

6363
uno.vid.0=0x2341
6464
uno.pid.0=0x0043
@@ -68,6 +68,8 @@ uno.vid.2=0x2A03
6868
uno.pid.2=0x0043
6969
uno.vid.3=0x2341
7070
uno.pid.3=0x0243
71+
uno.vid.4=0x2341
72+
uno.pid.4=0x006A
7173
uno.upload_port.0.vid=0x2341
7274
uno.upload_port.0.pid=0x0043
7375
uno.upload_port.1.vid=0x2341
@@ -76,7 +78,9 @@ uno.upload_port.2.vid=0x2A03
7678
uno.upload_port.2.pid=0x0043
7779
uno.upload_port.3.vid=0x2341
7880
uno.upload_port.3.pid=0x0243
79-
uno.upload_port.4.board=uno
81+
uno.upload_port.4.vid=0x2341
82+
uno.upload_port.4.pid=0x006A
83+
uno.upload_port.5.board=uno
8084

8185
uno.upload.tool=avrdude
8286
uno.upload.tool.default=avrdude
@@ -103,7 +107,7 @@ uno.build.variant=standard
103107

104108
##############################################################
105109

106-
unomini.name=Arduino Uno Mini
110+
unomini.name=Arduino UNO Mini
107111

108112
unomini.vid.0=0x2341
109113
unomini.pid.0=0x0062
@@ -1268,7 +1272,7 @@ one.build.extra_flags={build.usb_flags}
12681272

12691273
##############################################################
12701274

1271-
unowifi.name=Arduino Uno WiFi
1275+
unowifi.name=Arduino UNO WiFi
12721276
unowifi.vid.0=0x2A03
12731277
unowifi.pid.0=0x0057
12741278
unowifi.upload_port.0.vid=0x2A03

‎bootloaders/atmega/ATmegaBOOT_168.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ int main(void)
387387
UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
388388

389389
/* Enable internal pull-up resistor on pin D0 (RX), in order
390-
to supress line noise that prevents the bootloader from
390+
to suppress line noise that prevents the bootloader from
391391
timing out (DAM: 20070509) */
392392
DDRD &= ~_BV(PIND0);
393393
PORTD |= _BV(PIND0);
@@ -408,7 +408,7 @@ int main(void)
408408

409409
#if defined __AVR_ATmega1280__
410410
/* Enable internal pull-up resistor on pin D0 (RX), in order
411-
to supress line noise that prevents the bootloader from
411+
to suppress line noise that prevents the bootloader from
412412
timing out (DAM: 20070509) */
413413
/* feature added to the Arduino Mega --DC: 080930 */
414414
DDRE &= ~_BV(PINE0);
@@ -447,7 +447,7 @@ int main(void)
447447

448448

449449
/* Request programmer ID */
450-
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
450+
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary */
451451
/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
452452
else if(ch=='1') {
453453
if (getch() == ' ') {
@@ -730,7 +730,7 @@ int main(void)
730730
if (!flags.rampz) putch(pgm_read_byte_near(address.word));
731731
#if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
732732
else putch(pgm_read_byte_far(address.word + 0x10000));
733-
// Hmmmm, yuck FIXME when m256 arrvies
733+
// Hmmmm, yuck FIXME when m256 arrives
734734
#endif
735735
address.word++;
736736
}

‎bootloaders/atmega8/ATmegaBOOT.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ int main(void)
199199
}
200200

201201
/* Request programmer ID */
202-
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
202+
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary */
203203
/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
204204
else if(ch=='1') {
205205
if (getch() == ' ') {
@@ -248,7 +248,7 @@ int main(void)
248248
else if(ch=='P') {
249249
nothing_response();
250250
// FIXME: modified only here by DojoCorp, Mumbai, India, 20050626
251-
//time_count=0; // exted the delay once entered prog.mode
251+
//time_count=0; // extend the delay once entered prog.mode
252252
}
253253

254254
/* Leave programming mode */

‎bootloaders/bt/ATmegaBOOT_168.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ putch(0x0D);
465465

466466

467467
/* Request programmer ID */
468-
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
468+
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary */
469469
/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
470470
else if(ch=='1') {
471471
if (getch() == ' ') {
@@ -727,7 +727,7 @@ putch(0x0D);
727727
if (!flags.rampz) putch(pgm_read_byte_near(address.word));
728728
#if defined __AVR_ATmega128__
729729
else putch(pgm_read_byte_far(address.word + 0x10000));
730-
// Hmmmm, yuck FIXME when m256 arrvies
730+
// Hmmmm, yuck FIXME when m256 arrives
731731
#endif
732732
address.word++;
733733
}

‎bootloaders/caterina-Arduino_Robot/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ DEBUG = dwarf-2
191191

192192

193193
# List any extra directories to look for include files here.
194-
# Each directory must be seperated by a space.
194+
# Each directory must be separated by a space.
195195
# Use forward slashes for directory separators.
196196
# For a directory that has spaces, enclose it in quotes.
197197
EXTRAINCDIRS = $(LUFA_PATH)/
@@ -331,7 +331,7 @@ MATH_LIB = -lm
331331

332332

333333
# List any extra directories to look for libraries here.
334-
# Each directory must be seperated by a space.
334+
# Each directory must be separated by a space.
335335
# Use forward slashes for directory separators.
336336
# For a directory that has spaces, enclose it in quotes.
337337
EXTRALIBDIRS =

‎bootloaders/caterina-LilyPadUSB/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ DEBUG = dwarf-2
180180

181181

182182
# List any extra directories to look for include files here.
183-
# Each directory must be seperated by a space.
183+
# Each directory must be separated by a space.
184184
# Use forward slashes for directory separators.
185185
# For a directory that has spaces, enclose it in quotes.
186186
EXTRAINCDIRS = $(LUFA_PATH)/
@@ -320,7 +320,7 @@ MATH_LIB = -lm
320320

321321

322322
# List any extra directories to look for libraries here.
323-
# Each directory must be seperated by a space.
323+
# Each directory must be separated by a space.
324324
# Use forward slashes for directory separators.
325325
# For a directory that has spaces, enclose it in quotes.
326326
EXTRALIBDIRS =

‎bootloaders/caterina/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ DEBUG = dwarf-2
187187

188188

189189
# List any extra directories to look for include files here.
190-
# Each directory must be seperated by a space.
190+
# Each directory must be separated by a space.
191191
# Use forward slashes for directory separators.
192192
# For a directory that has spaces, enclose it in quotes.
193193
EXTRAINCDIRS = $(LUFA_PATH)/
@@ -327,7 +327,7 @@ MATH_LIB = -lm
327327

328328

329329
# List any extra directories to look for libraries here.
330-
# Each directory must be seperated by a space.
330+
# Each directory must be separated by a space.
331331
# Use forward slashes for directory separators.
332332
# For a directory that has spaces, enclose it in quotes.
333333
EXTRALIBDIRS =

‎bootloaders/gemma/avrdude.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
#
171171
# INSTRUCTION FORMATS
172172
#
173-
# Instruction formats are specified as a comma seperated list of
173+
# Instruction formats are specified as a comma separated list of
174174
# string values containing information (bit specifiers) about each
175175
# of the 32 bits of the instruction. Bit specifiers may be one of
176176
# the following formats:
@@ -365,7 +365,7 @@ programmer
365365
# http://flashrom.org/FT2232SPI_Programmer
366366
#
367367
# The drivers will look for a specific device and use the first one found.
368-
# If you have mulitple devices, then look for unique information (like SN)
368+
# If you have multiple devices, then look for unique information (like SN)
369369
# And fill that in here.
370370
#
371371
# Note that the pin numbers for the main ISP signals (reset, sck,

‎bootloaders/lilypad/src/ATmegaBOOT.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ int main(void)
330330
UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
331331

332332
/* Enable internal pull-up resistor on pin D0 (RX), in order
333-
to supress line noise that prevents the bootloader from
333+
to suppress line noise that prevents the bootloader from
334334
timing out (DAM: 20070509) */
335335
DDRD &= ~_BV(PIND0);
336336
PORTD |= _BV(PIND0);
@@ -381,7 +381,7 @@ int main(void)
381381

382382

383383
/* Request programmer ID */
384-
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
384+
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary */
385385
/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
386386
else if(ch=='1') {
387387
if (getch() == ' ') {
@@ -649,7 +649,7 @@ int main(void)
649649
if (!flags.rampz) putch(pgm_read_byte_near(address.word));
650650
#if defined __AVR_ATmega128__
651651
else putch(pgm_read_byte_far(address.word + 0x10000));
652-
// Hmmmm, yuck FIXME when m256 arrvies
652+
// Hmmmm, yuck FIXME when m256 arrives
653653
#endif
654654
address.word++;
655655
}

‎bootloaders/stk500v2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ DEBUG = dwarf-2
9090

9191

9292
# List any extra directories to look for include files here.
93-
# Each directory must be seperated by a space.
93+
# Each directory must be separated by a space.
9494
# Use forward slashes for directory separators.
9595
# For a directory that has spaces, enclose it in quotes.
9696
EXTRAINCDIRS =

‎cores/arduino/CDC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ bool CDC_Setup(USBSetup& setup)
119119
// For future boards save the key in the inproblematic RAMEND
120120
// Which is reserved for the main() return value (which will never return)
121121
if (isLUFAbootloader()) {
122-
// horray, we got a new bootloader!
122+
// hooray, we got a new bootloader!
123123
magic_key_pos = (RAMEND-1);
124124
}
125125
#endif

‎cores/arduino/USBCore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ typedef struct
191191
} EndpointDescriptor;
192192

193193
// Interface Association Descriptor
194-
// Used to bind 2 interfaces together in CDC compostite device
194+
// Used to bind 2 interfaces together in CDC composite device
195195
typedef struct
196196
{
197197
u8 len; // 8

‎drivers/arduino.cat

1.01 KB
Binary file not shown.

‎drivers/arduino.inf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ robotMotor.sketch.name="Arduino Robot"
5555
uno.name="Arduino Uno"
5656
unoR3.name="Arduino Uno"
5757
unomini.name="Arduino Uno Mini"
58+
makeyourunokit.name="Arduino Make Your Uno Kit"
5859
usbserial.name="Arduino USB Serial Light Adapter"
5960
yun.bootloader.name="Arduino Yun bootloader"
6061
yun.sketch.name="Arduino Yun"
@@ -108,6 +109,7 @@ DefaultDestDir=12
108109
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
109110
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
110111
%unomini.name%=DriverInstall, USB\VID_2341&PID_0062
112+
%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
111113
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
112114
%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
113115
%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
@@ -138,6 +140,7 @@ DefaultDestDir=12
138140
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
139141
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
140142
%unomini.name%=DriverInstall, USB\VID_2341&PID_0062
143+
%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
141144
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
142145
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
143146
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
@@ -172,6 +175,7 @@ DefaultDestDir=12
172175
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
173176
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
174177
%unomini.name%=DriverInstall, USB\VID_2341&PID_0062
178+
%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
175179
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
176180
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
177181
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00

‎firmwares/atmegaxxu2/arduino-usbdfu/makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ DEBUG = dwarf-2
171171

172172

173173
# List any extra directories to look for include files here.
174-
# Each directory must be seperated by a space.
174+
# Each directory must be separated by a space.
175175
# Use forward slashes for directory separators.
176176
# For a directory that has spaces, enclose it in quotes.
177177
EXTRAINCDIRS = $(LUFA_PATH)/
@@ -310,7 +310,7 @@ MATH_LIB = -lm
310310

311311

312312
# List any extra directories to look for libraries here.
313-
# Each directory must be seperated by a space.
313+
# Each directory must be separated by a space.
314314
# Use forward slashes for directory separators.
315315
# For a directory that has spaces, enclose it in quotes.
316316
EXTRALIBDIRS =

‎firmwares/atmegaxxu2/arduino-usbserial/makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ DEBUG = dwarf-2
188188

189189

190190
# List any extra directories to look for include files here.
191-
# Each directory must be seperated by a space.
191+
# Each directory must be separated by a space.
192192
# Use forward slashes for directory separators.
193193
# For a directory that has spaces, enclose it in quotes.
194194
EXTRAINCDIRS = $(LUFA_PATH)/
@@ -328,7 +328,7 @@ MATH_LIB = -lm
328328

329329

330330
# List any extra directories to look for libraries here.
331-
# Each directory must be seperated by a space.
331+
# Each directory must be separated by a space.
332332
# Use forward slashes for directory separators.
333333
# For a directory that has spaces, enclose it in quotes.
334334
EXTRALIBDIRS =

‎libraries/Wire/examples/i2c_scanner/i2c_scanner.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// can be found in many places.
77
// For example on the Arduino.cc forum.
88
// The original author is not known.
9-
// Version 2, Juni 2012, Using Arduino 1.0.1
9+
// Version 2, June 2012, Using Arduino 1.0.1
1010
// Adapted to be as simple as possible by Arduino.cc user Krodal
1111
// Version 3, Feb 26 2013
1212
// V3 by louarnold

‎platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# https://arduino.github.io/arduino-cli/latest/platform-specification/
77

88
name=Arduino AVR Boards
9-
version=1.8.5
9+
version=1.8.6
1010

1111
# AVR compile variables
1212
# ---------------------

‎post_install.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
1010

1111
REM dpinst /PATH has problems with relative paths, so use absolute path.
1212
if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
13-
drivers\dpinst-amd64.exe /PATH %cd%\drivers\gemma %ARGS%
13+
drivers\dpinst-amd64.exe /PATH "%cd%\drivers\gemma" %ARGS%
1414
) ELSE IF "%PROCESSOR_ARCHITEW6432%" == "AMD64" (
15-
drivers\dpinst-amd64.exe /PATH %cd%\drivers\gemma %ARGS%
15+
drivers\dpinst-amd64.exe /PATH "%cd%\drivers\gemma" %ARGS%
1616
) ELSE (
17-
drivers\dpinst-x86.exe /PATH %cd%\drivers\gemma %ARGS%
17+
drivers\dpinst-x86.exe /PATH "%cd%\drivers\gemma" %ARGS%
1818
)
1919

2020
exit /b 0

0 commit comments

Comments
 (0)