Merge branch 'release/v1.12.1'

ivankravets · ivankravets · commit 671487d8b193 · 2018-12-21T16:26:22.000+02:00
diff --git a/boards/1284p16m.json b/boards/1284p16m.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DARDUINO_AVR_MICRODUINO_CORE_PLUS",
     "f_cpu": "16000000L",
     "mcu": "atmega1284p",
-    "variant": "plus"
+    "variant": "microduino_plus"
   },
   "frameworks": [
     "arduino"
diff --git a/boards/1284p8m.json b/boards/1284p8m.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DARDUINO_AVR_MICRODUINO_CORE_PLUS",
     "f_cpu": "8000000L",
     "mcu": "atmega1284p",
-    "variant": "plus"
+    "variant": "microduino_plus"
   },
   "frameworks": [
     "arduino"
diff --git a/boards/32u416m.json b/boards/32u416m.json
@@ -10,7 +10,7 @@
       ]
     ],
     "mcu": "atmega32u4",
-    "variant": "32u4"
+    "variant": "microduino_32u4"
   },
   "frameworks": [
     "arduino"
diff --git a/boards/644pa16m.json b/boards/644pa16m.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DARDUINO_AVR_MICRODUINO_CORE_PLUS",
     "f_cpu": "16000000L",
     "mcu": "atmega644p",
-    "variant": "plus"
+    "variant": "microduino_plus"
   },
   "frameworks": [
     "arduino"
diff --git a/boards/644pa8m.json b/boards/644pa8m.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DARDUINO_AVR_MICRODUINO_CORE_PLUS",
     "f_cpu": "8000000L",
     "mcu": "atmega644p",
-    "variant": "plus"
+    "variant": "microduino_plus"
   },
   "frameworks": [
     "arduino"
diff --git a/boards/attiny13.json b/boards/attiny13.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "core13",
     "extra_flags": "-DARDUINO_AVR_ATTINY13",
-    "f_cpu": "9600000L",
+    "f_cpu": "1200000L",
     "mcu": "attiny13"
   },
   "frameworks": [
diff --git a/boards/attiny13a.json b/boards/attiny13a.json
@@ -0,0 +1,22 @@
+{
+  "build": {
+    "core": "core13",
+    "extra_flags": "-DARDUINO_AVR_ATTINY13A",
+    "f_cpu": "1200000L",
+    "mcu": "attiny13a"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Generic ATTiny13A",
+  "upload": {
+    "extra_flags": "-e",
+    "maximum_ram_size": 64,
+    "maximum_size": 1024,
+    "protocol": "arduinoisp",
+    "require_upload_port": true,
+    "speed": 19200
+  },
+  "url": "https://www.microchip.com/wwwproducts/en/ATtiny13A",
+  "vendor": "Atmel"
+}
diff --git a/boards/fysetc_f6_13.json b/boards/fysetc_f6_13.json
@@ -0,0 +1,33 @@
+{
+  "build": {
+    "core": "arduino",
+    "extra_flags": "-DARDUINO_AVR_MEGA2560",
+    "f_cpu": "16000000L",
+    "hwids": [
+      [
+        "0x27b2",
+        "0x0002"
+      ]
+    ],
+    "mcu": "atmega2560",
+    "variant": "fysetcf6"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "fuses": {
+    "efuse": "0xFD",
+    "hfuse": "0xD8",
+    "lfuse": "0xFF"
+  },
+  "name": "FYSETC F6 V1.3",
+  "upload": {
+    "maximum_ram_size": 8192,
+    "maximum_size": 258048,
+    "protocol": "wiring",
+    "require_upload_port": true,
+    "speed": 115200
+  },
+  "url": "https://www.fysetc.com/",
+  "vendor": "FYSETC"
+}
diff --git a/boards/megaatmega2560.json b/boards/megaatmega2560.json
@@ -3,6 +3,12 @@
     "core": "arduino",
     "extra_flags": "-DARDUINO_AVR_MEGA2560",
     "f_cpu": "16000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0042"
+      ]
+    ],
     "mcu": "atmega2560",
     "variant": "mega"
   },
diff --git a/builder/main.py b/builder/main.py
@@ -27,7 +27,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         return
 
     if "micronucleus" in env['UPLOADER']:
-        print "Please unplug/plug device ..."
+        print("Please unplug/plug device ...")
 
     upload_options = {}
     if "BOARD" in env:
diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -95,10 +95,6 @@ framework = arduino
 board = panStampAVR
 build_flags = -D LED_BUILTIN=13
 
-[env:1284p16m]
-platform = atmelavr
-framework = arduino
-board = 1284p16m
 
 [env:quirkbot]
 platform = atmelavr
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelavr.git"
   },
-  "version": "1.12.0",
+  "version": "1.12.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",
@@ -36,7 +36,7 @@
     "framework-arduinoavr": {
       "type": "framework",
       "optional": true,
-      "version": "~1.10623.0"
+      "version": "~1.10623.1"
     },
     "framework-simba": {
       "type": "framework",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`]`
`11`	`11`	`],`
`12`	`12`	`"mcu": "atmega32u4",`
`13`		`- "variant": "32u4"`
	`13`	`+ "variant": "microduino_32u4"`
`14`	`14`	`},`
`15`	`15`	`"frameworks": [`
`16`	`16`	`"arduino"`