Skip to content

Commit d52b6ea

Browse files
authored
Merge pull request #14 from dmadison/upstream-1.8.4
Merge upstream tag '1.8.4'
2 parents f47a975 + 6f58814 commit d52b6ea

File tree

40 files changed

+381
-149
lines changed

40 files changed

+381
-149
lines changed

.codespellrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See: https://github.com/codespell-project/codespell#using-a-config-file
2+
[codespell]
3+
# 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
5+
builtin = clear
6+
check-filenames =
7+
check-hidden =
8+
skip = ./.git,./firmwares/arduinoISP,./firmwares/wifishield,./bootloaders

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build
33
on: [push, pull_request, workflow_dispatch]
44

55
env:
6-
IDE_VERSION: 1.8.13
6+
IDE_VERSION: 1.8.19
77
IDE_LOCATION: /usr/local/share/arduino
88

99
jobs:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Lastly, you need to know where the 'reset' button is on your Arduino. If your bo
4747
To upload to the board:
4848
* Press the 'Upload' button in the IDE
4949
* Wait until the status bar says "Uploading..."
50-
* Press the reset button
50+
* Press the reset button twice, quickly
5151

5252
If you timed it properly, the board should reset to the bootloader and the upload should begin. AVRDUDE will do its thing and you should see `avrdude done. Thank you.` near the bottom of the output window.
5353

boards.txt

Lines changed: 124 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See: http://code.google.com/p/arduino/wiki/Platforms
1+
# See: https://arduino.github.io/arduino-cli/latest/platform-specification/
22

33
menu.cpu=Processor
44

@@ -15,8 +15,19 @@ yun.vid.2=0x2A03
1515
yun.pid.2=0x0041
1616
yun.vid.3=0x2A03
1717
yun.pid.3=0x8041
18+
yun.upload_port.0.vid=0x2341
19+
yun.upload_port.0.pid=0x0041
20+
yun.upload_port.1.vid=0x2341
21+
yun.upload_port.1.pid=0x8041
22+
yun.upload_port.2.vid=0x2A03
23+
yun.upload_port.2.pid=0x0041
24+
yun.upload_port.3.vid=0x2A03
25+
yun.upload_port.3.pid=0x8041
26+
yun.upload_port.4.board=yun
1827

1928
yun.upload.tool=avrdude
29+
yun.upload.tool.default=avrdude
30+
yun.upload.tool.network=arduino_ota
2031
yun.upload.protocol=avr109
2132
yun.upload.maximum_size=28672
2233
yun.upload.maximum_data_size=2560
@@ -26,6 +37,7 @@ yun.upload.use_1200bps_touch=true
2637
yun.upload.wait_for_upload_port=true
2738

2839
yun.bootloader.tool=avrdude
40+
yun.bootloader.tool.default=avrdude
2941
yun.bootloader.low_fuses=0xff
3042
yun.bootloader.high_fuses=0xd8
3143
yun.bootloader.extended_fuses=0xfb
@@ -55,8 +67,19 @@ leonardo.vid.2=0x2A03
5567
leonardo.pid.2=0x0036
5668
leonardo.vid.3=0x2A03
5769
leonardo.pid.3=0x8036
70+
leonardo.upload_port.0.vid=0x2341
71+
leonardo.upload_port.0.pid=0x0036
72+
leonardo.upload_port.1.vid=0x2341
73+
leonardo.upload_port.1.pid=0x8036
74+
leonardo.upload_port.2.vid=0x2A03
75+
leonardo.upload_port.2.pid=0x0036
76+
leonardo.upload_port.3.vid=0x2A03
77+
leonardo.upload_port.3.pid=0x8036
78+
leonardo.upload_port.4.board=leonardo
5879

5980
leonardo.upload.tool=avrdude
81+
leonardo.upload.tool.default=avrdude
82+
leonardo.upload.tool.network=arduino_ota
6083
leonardo.upload.protocol=avr109
6184
leonardo.upload.maximum_size=28672
6285
leonardo.upload.maximum_data_size=2560
@@ -66,6 +89,7 @@ leonardo.upload.use_1200bps_touch=true
6689
leonardo.upload.wait_for_upload_port=true
6790

6891
leonardo.bootloader.tool=avrdude
92+
leonardo.bootloader.tool.default=avrdude
6993
leonardo.bootloader.low_fuses=0xff
7094
leonardo.bootloader.high_fuses=0xd8
7195
leonardo.bootloader.extended_fuses=0xcb
@@ -90,8 +114,15 @@ leonardoeth.vid.0=0x2a03
90114
leonardoeth.pid.0=0x0040
91115
leonardoeth.vid.1=0x2a03
92116
leonardoeth.pid.1=0x8040
117+
leonardoeth.upload_port.0.vid=0x2a03
118+
leonardoeth.upload_port.0.pid=0x0040
119+
leonardoeth.upload_port.1.vid=0x2a03
120+
leonardoeth.upload_port.1.pid=0x8040
121+
leonardoeth.upload_port.2.board=leonardoeth
93122

94123
leonardoeth.upload.tool=avrdude
124+
leonardoeth.upload.tool.default=avrdude
125+
leonardoeth.upload.tool.network=arduino_ota
95126
leonardoeth.upload.protocol=avr109
96127
leonardoeth.upload.maximum_size=28672
97128
leonardoeth.upload.maximum_data_size=2560
@@ -101,6 +132,7 @@ leonardoeth.upload.use_1200bps_touch=true
101132
leonardoeth.upload.wait_for_upload_port=true
102133

103134
leonardoeth.bootloader.tool=avrdude
135+
leonardoeth.bootloader.tool.default=avrdude
104136
leonardoeth.bootloader.low_fuses=0xff
105137
leonardoeth.bootloader.high_fuses=0xd8
106138
leonardoeth.bootloader.extended_fuses=0xcb
@@ -134,8 +166,23 @@ micro.vid.4=0x2341
134166
micro.pid.4=0x0237
135167
micro.vid.5=0x2341
136168
micro.pid.5=0x8237
169+
micro.upload_port.0.vid=0x2341
170+
micro.upload_port.0.pid=0x0037
171+
micro.upload_port.1.vid=0x2341
172+
micro.upload_port.1.pid=0x8037
173+
micro.upload_port.2.vid=0x2A03
174+
micro.upload_port.2.pid=0x0037
175+
micro.upload_port.3.vid=0x2A03
176+
micro.upload_port.3.pid=0x8037
177+
micro.upload_port.4.vid=0x2341
178+
micro.upload_port.4.pid=0x0237
179+
micro.upload_port.5.vid=0x2341
180+
micro.upload_port.5.pid=0x8237
181+
micro.upload_port.6.board=micro
137182

138183
micro.upload.tool=avrdude
184+
micro.upload.tool.default=avrdude
185+
micro.upload.tool.network=arduino_ota
139186
micro.upload.protocol=avr109
140187
micro.upload.maximum_size=28672
141188
micro.upload.maximum_data_size=2560
@@ -145,6 +192,7 @@ micro.upload.use_1200bps_touch=true
145192
micro.upload.wait_for_upload_port=true
146193

147194
micro.bootloader.tool=avrdude
195+
micro.bootloader.tool.default=avrdude
148196
micro.bootloader.low_fuses=0xff
149197
micro.bootloader.high_fuses=0xd8
150198
micro.bootloader.extended_fuses=0xcb
@@ -173,8 +221,19 @@ esplora.vid.2=0x2A03
173221
esplora.pid.2=0x003C
174222
esplora.vid.3=0x2A03
175223
esplora.pid.3=0x803C
224+
esplora.upload_port.0.vid=0x2341
225+
esplora.upload_port.0.pid=0x003C
226+
esplora.upload_port.1.vid=0x2341
227+
esplora.upload_port.1.pid=0x803C
228+
esplora.upload_port.2.vid=0x2A03
229+
esplora.upload_port.2.pid=0x003C
230+
esplora.upload_port.3.vid=0x2A03
231+
esplora.upload_port.3.pid=0x803C
232+
esplora.upload_port.4.board=esplora
176233

177234
esplora.upload.tool=avrdude
235+
esplora.upload.tool.default=avrdude
236+
esplora.upload.tool.network=arduino_ota
178237
esplora.upload.protocol=avr109
179238
esplora.upload.maximum_size=28672
180239
esplora.upload.maximum_data_size=2560
@@ -184,6 +243,7 @@ esplora.upload.use_1200bps_touch=true
184243
esplora.upload.wait_for_upload_port=true
185244

186245
esplora.bootloader.tool=avrdude
246+
esplora.bootloader.tool.default=avrdude
187247
esplora.bootloader.low_fuses=0xff
188248
esplora.bootloader.high_fuses=0xd8
189249
esplora.bootloader.extended_fuses=0xcb
@@ -208,8 +268,15 @@ LilyPadUSB.vid.0=0x1B4F
208268
LilyPadUSB.pid.0=0x9207
209269
LilyPadUSB.vid.1=0x1B4F
210270
LilyPadUSB.pid.1=0x9208
271+
LilyPadUSB.upload_port.0.vid=0x1B4F
272+
LilyPadUSB.upload_port.0.pid=0x9207
273+
LilyPadUSB.upload_port.1.vid=0x1B4F
274+
LilyPadUSB.upload_port.1.pid=0x9208
275+
LilyPadUSB.upload_port.2.board=LilyPadUSB
211276

212277
LilyPadUSB.upload.tool=avrdude
278+
LilyPadUSB.upload.tool.default=avrdude
279+
LilyPadUSB.upload.tool.network=arduino_ota
213280
LilyPadUSB.upload.protocol=avr109
214281
LilyPadUSB.upload.maximum_size=28672
215282
LilyPadUSB.upload.maximum_data_size=2560
@@ -219,6 +286,7 @@ LilyPadUSB.upload.use_1200bps_touch=true
219286
LilyPadUSB.upload.wait_for_upload_port=true
220287

221288
LilyPadUSB.bootloader.tool=avrdude
289+
LilyPadUSB.bootloader.tool.default=avrdude
222290
LilyPadUSB.bootloader.low_fuses=0xff
223291
LilyPadUSB.bootloader.high_fuses=0xd8
224292
LilyPadUSB.bootloader.extended_fuses=0xce
@@ -247,8 +315,19 @@ robotControl.vid.2=0x2A03
247315
robotControl.pid.2=0x0038
248316
robotControl.vid.3=0x2A03
249317
robotControl.pid.3=0x8038
318+
robotControl.upload_port.0.vid=0x2341
319+
robotControl.upload_port.0.pid=0x0038
320+
robotControl.upload_port.1.vid=0x2341
321+
robotControl.upload_port.1.pid=0x8038
322+
robotControl.upload_port.2.vid=0x2A03
323+
robotControl.upload_port.2.pid=0x0038
324+
robotControl.upload_port.3.vid=0x2A03
325+
robotControl.upload_port.3.pid=0x8038
326+
robotControl.upload_port.4.board=robotControl
250327

251328
robotControl.upload.tool=avrdude
329+
robotControl.upload.tool.default=avrdude
330+
robotControl.upload.tool.network=arduino_ota
252331
robotControl.upload.protocol=avr109
253332
robotControl.upload.maximum_size=28672
254333
robotControl.upload.maximum_data_size=2560
@@ -258,6 +337,7 @@ robotControl.upload.use_1200bps_touch=true
258337
robotControl.upload.wait_for_upload_port=true
259338

260339
robotControl.bootloader.tool=avrdude
340+
robotControl.bootloader.tool.default=avrdude
261341
robotControl.bootloader.low_fuses=0xff
262342
robotControl.bootloader.high_fuses=0xd8
263343
robotControl.bootloader.extended_fuses=0xcb
@@ -286,8 +366,19 @@ robotMotor.vid.2=0x2A03
286366
robotMotor.pid.2=0x0039
287367
robotMotor.vid.3=0x2A03
288368
robotMotor.pid.3=0x8039
369+
robotMotor.upload_port.0.vid=0x2341
370+
robotMotor.upload_port.0.pid=0x0039
371+
robotMotor.upload_port.1.vid=0x2341
372+
robotMotor.upload_port.1.pid=0x8039
373+
robotMotor.upload_port.2.vid=0x2A03
374+
robotMotor.upload_port.2.pid=0x0039
375+
robotMotor.upload_port.3.vid=0x2A03
376+
robotMotor.upload_port.3.pid=0x8039
377+
robotMotor.upload_port.4.board=robotMotor
289378

290379
robotMotor.upload.tool=avrdude
380+
robotMotor.upload.tool.default=avrdude
381+
robotMotor.upload.tool.network=arduino_ota
291382
robotMotor.upload.protocol=avr109
292383
robotMotor.upload.maximum_size=28672
293384
robotMotor.upload.maximum_data_size=2560
@@ -297,6 +388,7 @@ robotMotor.upload.use_1200bps_touch=true
297388
robotMotor.upload.wait_for_upload_port=true
298389

299390
robotMotor.bootloader.tool=avrdude
391+
robotMotor.bootloader.tool.default=avrdude
300392
robotMotor.bootloader.low_fuses=0xff
301393
robotMotor.bootloader.high_fuses=0xd8
302394
robotMotor.bootloader.extended_fuses=0xcb
@@ -317,14 +409,15 @@ robotMotor.build.extra_flags={build.usb_flags}
317409
##############################################################
318410

319411
# Adafruit Circuit Playground 32u4 w/Caterina Configuration w/ XInput
320-
circuitplay32u4cat.name=Adafruit Circuit Playground
412+
circuitplay32u4cat.name=Adafruit Circuit Playground 32u4 w/ XInput
321413
circuitplay32u4cat.bootloader.low_fuses=0xff
322414
circuitplay32u4cat.bootloader.high_fuses=0xd8
323415
circuitplay32u4cat.bootloader.extended_fuses=0xcb
324416
circuitplay32u4cat.bootloader.file=caterina/Caterina-Circuitplay32u4.hex
325417
circuitplay32u4cat.bootloader.unlock_bits=0x3F
326418
circuitplay32u4cat.bootloader.lock_bits=0x2F
327419
circuitplay32u4cat.bootloader.tool=avrdude
420+
circuitplay32u4cat.bootloader.tool.default=avrdude
328421
circuitplay32u4cat.build.mcu=atmega32u4
329422
circuitplay32u4cat.build.f_cpu=8000000L
330423
circuitplay32u4cat.build.vid=0x045E
@@ -342,8 +435,13 @@ circuitplay32u4cat.upload.disable_flushing=true
342435
circuitplay32u4cat.upload.use_1200bps_touch=true
343436
circuitplay32u4cat.upload.wait_for_upload_port=true
344437
circuitplay32u4cat.upload.tool=avrdude
438+
circuitplay32u4cat.upload.tool.default=avrdude
439+
circuitplay32u4cat.upload.tool.network=arduino_ota
345440
circuitplay32u4cat.vid.0=0x239A
346441
circuitplay32u4cat.pid.0=0x8011
442+
circuitplay32u4cat.upload_port.0.vid=0x239A
443+
circuitplay32u4cat.upload_port.0.pid=0x8011
444+
circuitplay32u4cat.upload_port.1.board=circuitplay32u4cat
347445

348446
##############################################################
349447

@@ -354,8 +452,15 @@ yunmini.vid.0=0x2a03
354452
yunmini.pid.0=0x0050
355453
yunmini.vid.1=0x2a03
356454
yunmini.pid.1=0x8050
455+
yunmini.upload_port.0.vid=0x2a03
456+
yunmini.upload_port.0.pid=0x0050
457+
yunmini.upload_port.1.vid=0x2a03
458+
yunmini.upload_port.1.pid=0x8050
459+
yunmini.upload_port.2.board=yunmini
357460

358461
yunmini.upload.tool=avrdude
462+
yunmini.upload.tool.default=avrdude
463+
yunmini.upload.tool.network=arduino_ota
359464
yunmini.upload.protocol=avr109
360465
yunmini.upload.maximum_size=28672
361466
yunmini.upload.maximum_data_size=2560
@@ -365,6 +470,7 @@ yunmini.upload.use_1200bps_touch=true
365470
yunmini.upload.wait_for_upload_port=true
366471

367472
yunmini.bootloader.tool=avrdude
473+
yunmini.bootloader.tool.default=avrdude
368474
yunmini.bootloader.low_fuses=0xff
369475
yunmini.bootloader.high_fuses=0xd8
370476
yunmini.bootloader.extended_fuses=0xfb
@@ -391,8 +497,15 @@ chiwawa.vid.0=0x2a03
391497
chiwawa.pid.0=0x0056
392498
chiwawa.vid.1=0x2a03
393499
chiwawa.pid.1=0x8056
500+
chiwawa.upload_port.0.vid=0x2a03
501+
chiwawa.upload_port.0.pid=0x0056
502+
chiwawa.upload_port.1.vid=0x2a03
503+
chiwawa.upload_port.1.pid=0x8056
504+
chiwawa.upload_port.2.board=chiwawa
394505

395506
chiwawa.upload.tool=avrdude
507+
chiwawa.upload.tool.default=avrdude
508+
chiwawa.upload.tool.network=arduino_ota
396509
chiwawa.upload.protocol=avr109
397510
chiwawa.upload.maximum_size=28672
398511
chiwawa.upload.maximum_data_size=2560
@@ -402,6 +515,7 @@ chiwawa.upload.use_1200bps_touch=true
402515
chiwawa.upload.wait_for_upload_port=true
403516

404517
chiwawa.bootloader.tool=avrdude
518+
chiwawa.bootloader.tool.default=avrdude
405519
chiwawa.bootloader.low_fuses=0xff
406520
chiwawa.bootloader.high_fuses=0xd8
407521
chiwawa.bootloader.extended_fuses=0xfb
@@ -428,8 +542,15 @@ one.vid.0=0x2a03
428542
one.pid.0=0x0001
429543
one.vid.1=0x2a03
430544
one.pid.1=0x8001
545+
one.upload_port.0.vid=0x2a03
546+
one.upload_port.0.pid=0x0001
547+
one.upload_port.1.vid=0x2a03
548+
one.upload_port.1.pid=0x8001
549+
one.upload_port.2.board=one
431550

432551
one.upload.tool=avrdude
552+
one.upload.tool.default=avrdude
553+
one.upload.tool.network=arduino_ota
433554
one.upload.protocol=avr109
434555
one.upload.maximum_size=28672
435556
one.upload.maximum_data_size=2560
@@ -439,6 +560,7 @@ one.upload.use_1200bps_touch=true
439560
one.upload.wait_for_upload_port=true
440561

441562
one.bootloader.tool=avrdude
563+
one.bootloader.tool.default=avrdude
442564
one.bootloader.low_fuses=0xff
443565
one.bootloader.high_fuses=0xd8
444566
one.bootloader.extended_fuses=0xfb

cores/arduino/HardwareSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ void HardwareSerial::flush()
219219
_tx_udr_empty_irq();
220220
}
221221
// If we get here, nothing is queued anymore (DRIE is disabled) and
222-
// the hardware finished tranmission (TXC is set).
222+
// the hardware finished transmission (TXC is set).
223223
}
224224

225225
size_t HardwareSerial::write(uint8_t c)

cores/arduino/HardwareSerial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// using a ring buffer (I think), in which head is the index of the location
3333
// to which to write the next incoming character and tail is the index of the
3434
// location from which to read.
35-
// NOTE: a "power of 2" buffer size is reccomended to dramatically
35+
// NOTE: a "power of 2" buffer size is recommended to dramatically
3636
// optimize all the modulo operations for ring buffers.
3737
// WARNING: When buffer sizes are increased to > 256, the buffer index
3838
// variables are automatically increased in size, but the extra

cores/arduino/HardwareSerial_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#endif
6464
#endif // !defined TXC0
6565

66-
// Check at compiletime that it is really ok to use the bit positions of
66+
// Check at compile time that it is really ok to use the bit positions of
6767
// UART0 for the other UARTs as well, in case these values ever get
6868
// changed for future hardware.
6969
#if defined(TXC1) && (TXC1 != TXC0 || RXEN1 != RXEN0 || RXCIE1 != RXCIE0 || \

cores/arduino/Print.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class Print
5959
}
6060

6161
// default to zero, meaning "a single write may block"
62-
// should be overriden by subclasses with buffering
62+
// should be overridden by subclasses with buffering
6363
virtual int availableForWrite() { return 0; }
6464

6565
size_t print(const __FlashStringHelper *);

0 commit comments

Comments
 (0)