mirror of
https://github.com/arduino/Arduino.git
synced 2025-03-13 10:29:35 +01:00
Merge branch 'master' of github.com:arduino/Arduino
This commit is contained in:
commit
3633f4dd25
@ -887,12 +887,12 @@ circuitplay32u4cat.bootloader.extended_fuses=0xcb
|
||||
circuitplay32u4cat.bootloader.file=caterina/Caterina-Circuitplay32u4.hex
|
||||
circuitplay32u4cat.bootloader.unlock_bits=0x3F
|
||||
circuitplay32u4cat.bootloader.lock_bits=0x2F
|
||||
circuitplay32u4cat.bootloader.tool=arduino:avrdude
|
||||
circuitplay32u4cat.bootloader.tool=avrdude
|
||||
circuitplay32u4cat.build.mcu=atmega32u4
|
||||
circuitplay32u4cat.build.f_cpu=8000000L
|
||||
circuitplay32u4cat.build.vid=0x239A
|
||||
circuitplay32u4cat.build.pid=0x8011
|
||||
circuitplay32u4cat.build.core=arduino:arduino
|
||||
circuitplay32u4cat.build.core=arduino
|
||||
circuitplay32u4cat.build.variant=circuitplay32u4
|
||||
circuitplay32u4cat.build.board=AVR_CIRCUITPLAY
|
||||
circuitplay32u4cat.build.usb_product="Circuit Playground"
|
||||
@ -904,7 +904,7 @@ circuitplay32u4cat.upload.speed=57600
|
||||
circuitplay32u4cat.upload.disable_flushing=true
|
||||
circuitplay32u4cat.upload.use_1200bps_touch=true
|
||||
circuitplay32u4cat.upload.wait_for_upload_port=true
|
||||
circuitplay32u4cat.upload.tool=arduino:avrdude
|
||||
circuitplay32u4cat.upload.tool=avrdude
|
||||
circuitplay32u4cat.vid.0=0x239A
|
||||
circuitplay32u4cat.pid.0=0x8011
|
||||
|
||||
|
@ -19,8 +19,8 @@
|
||||
},
|
||||
"url": "http://downloads.arduino.cc/cores/avr-1.6.16.tar.bz2",
|
||||
"archiveFileName": "avr-1.6.16.tar.bz2",
|
||||
"checksum": "SHA-256:c222efcabbdf6fa63ba3d64afb8d149f83fa73693c413aa05a2ccd9f986ed2fa",
|
||||
"size": "4993959",
|
||||
"checksum": "SHA-256:07b7a4b68c132e021d112c424cde1286a210dbf728884a214607cc8c4e602d6a",
|
||||
"size": "5011038",
|
||||
"boards": [
|
||||
{"name": "Arduino Yún"},
|
||||
{"name": "Arduino/Genuino Uno"},
|
||||
@ -29,6 +29,7 @@
|
||||
{"name": "Arduino/Genuino Mega"},
|
||||
{"name": "Arduino MegaADK"},
|
||||
{"name": "Arduino Leonardo"},
|
||||
{"name": "Arduino Leonardo Ethernet"},
|
||||
{"name": "Arduino/Genuino Micro"},
|
||||
{"name": "Arduino Esplora"},
|
||||
{"name": "Arduino Mini"},
|
||||
@ -42,7 +43,10 @@
|
||||
{"name": "Arduino Robot Control"},
|
||||
{"name": "Arduino Robot Motor"},
|
||||
{"name": "Arduino Gemma"},
|
||||
{"name": "Adafruit Circuit Playground"}
|
||||
{"name": "Adafruit Circuit Playground"},
|
||||
{"name": "Arduino Yún Mini"},
|
||||
{"name": "Arduino Industrial 101"},
|
||||
{"name": "Linino One"}
|
||||
],
|
||||
"toolsDependencies": [
|
||||
{
|
||||
@ -79,14 +83,14 @@
|
||||
},
|
||||
{
|
||||
"size": "711544",
|
||||
"checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
|
||||
"checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
|
||||
"host": "x86_64-linux-gnu",
|
||||
"archiveFileName": "avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2",
|
||||
"url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2"
|
||||
},
|
||||
{
|
||||
"size": "701718",
|
||||
"checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
|
||||
"checksum": "SHA-256:8e2e4bc71d22e9d11ed143763b97f3aa2d164cdeee678a9deaf5b36e245b2d20",
|
||||
"host": "i686-linux-gnu",
|
||||
"archiveFileName": "avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2",
|
||||
"url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2"
|
||||
|
Loading…
x
Reference in New Issue
Block a user