Skip to content

Commit 3633f4d

Browse files
committed
Merge branch 'master' of github.com:arduino/Arduino
2 parents 0ec73fa + 6f2fd2f commit 3633f4d

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

hardware/arduino/avr/boards.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -887,12 +887,12 @@ circuitplay32u4cat.bootloader.extended_fuses=0xcb
887887
circuitplay32u4cat.bootloader.file=caterina/Caterina-Circuitplay32u4.hex
888888
circuitplay32u4cat.bootloader.unlock_bits=0x3F
889889
circuitplay32u4cat.bootloader.lock_bits=0x2F
890-
circuitplay32u4cat.bootloader.tool=arduino:avrdude
890+
circuitplay32u4cat.bootloader.tool=avrdude
891891
circuitplay32u4cat.build.mcu=atmega32u4
892892
circuitplay32u4cat.build.f_cpu=8000000L
893893
circuitplay32u4cat.build.vid=0x239A
894894
circuitplay32u4cat.build.pid=0x8011
895-
circuitplay32u4cat.build.core=arduino:arduino
895+
circuitplay32u4cat.build.core=arduino
896896
circuitplay32u4cat.build.variant=circuitplay32u4
897897
circuitplay32u4cat.build.board=AVR_CIRCUITPLAY
898898
circuitplay32u4cat.build.usb_product="Circuit Playground"
@@ -904,7 +904,7 @@ circuitplay32u4cat.upload.speed=57600
904904
circuitplay32u4cat.upload.disable_flushing=true
905905
circuitplay32u4cat.upload.use_1200bps_touch=true
906906
circuitplay32u4cat.upload.wait_for_upload_port=true
907-
circuitplay32u4cat.upload.tool=arduino:avrdude
907+
circuitplay32u4cat.upload.tool=avrdude
908908
circuitplay32u4cat.vid.0=0x239A
909909
circuitplay32u4cat.pid.0=0x8011
910910

hardware/package_index_bundled.json

+9-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
},
2020
"url": "http://downloads.arduino.cc/cores/avr-1.6.16.tar.bz2",
2121
"archiveFileName": "avr-1.6.16.tar.bz2",
22-
"checksum": "SHA-256:c222efcabbdf6fa63ba3d64afb8d149f83fa73693c413aa05a2ccd9f986ed2fa",
23-
"size": "4993959",
22+
"checksum": "SHA-256:07b7a4b68c132e021d112c424cde1286a210dbf728884a214607cc8c4e602d6a",
23+
"size": "5011038",
2424
"boards": [
2525
{"name": "Arduino Yún"},
2626
{"name": "Arduino/Genuino Uno"},
@@ -29,6 +29,7 @@
2929
{"name": "Arduino/Genuino Mega"},
3030
{"name": "Arduino MegaADK"},
3131
{"name": "Arduino Leonardo"},
32+
{"name": "Arduino Leonardo Ethernet"},
3233
{"name": "Arduino/Genuino Micro"},
3334
{"name": "Arduino Esplora"},
3435
{"name": "Arduino Mini"},
@@ -42,7 +43,10 @@
4243
{"name": "Arduino Robot Control"},
4344
{"name": "Arduino Robot Motor"},
4445
{"name": "Arduino Gemma"},
45-
{"name": "Adafruit Circuit Playground"}
46+
{"name": "Adafruit Circuit Playground"},
47+
{"name": "Arduino Yún Mini"},
48+
{"name": "Arduino Industrial 101"},
49+
{"name": "Linino One"}
4650
],
4751
"toolsDependencies": [
4852
{
@@ -79,14 +83,14 @@
7983
},
8084
{
8185
"size": "711544",
82-
"checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
86+
"checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
8387
"host": "x86_64-linux-gnu",
8488
"archiveFileName": "avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2",
8589
"url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2"
8690
},
8791
{
8892
"size": "701718",
89-
"checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
93+
"checksum": "SHA-256:8e2e4bc71d22e9d11ed143763b97f3aa2d164cdeee678a9deaf5b36e245b2d20",
9094
"host": "i686-linux-gnu",
9195
"archiveFileName": "avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2",
9296
"url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2"

0 commit comments

Comments
 (0)