From 36912c0fe6e57d700fbef591ee3a555732b14473 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 24 Dec 2015 23:39:25 +0200
Subject: [PATCH] Update Arduino framework for Atmel AVR development platform
 to 1.6.7

---
 HISTORY.rst                           |  1 +
 docs/frameworks/arduino.rst           | 21 +++++++++++++++++++++
 docs/platforms/atmelavr.rst           | 21 +++++++++++++++++++++
 platformio/builder/scripts/baseavr.py |  8 ++++----
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 1a99488e..a24e490c 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,6 +9,7 @@ PlatformIO 2.0
 
 * Added support for the new Adafruit boards Bluefruit Micro and Feather
   (`issue #403 <https://github.com/platformio/platformio/issues/403>`_)
+* Updated Arduino framework for Atmel AVR development platform to 1.6.7
 
 2.6.3 (2015-12-21)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 07395193..eb9b54d1 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -63,6 +63,20 @@ Adafruit
       - Flash
       - RAM
 
+    * - ``bluefruitmicro``
+      - `Adafruit Bluefruit Micro <https://www.adafruit.com/products/2661>`_
+      - ATMEGA32U4
+      - 8 MHz
+      - 32 Kb
+      - 2.5 Kb
+
+    * - ``feather32u4``
+      - `Adafruit Feather <https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/>`_
+      - ATMEGA32U4
+      - 8 MHz
+      - 32 Kb
+      - 2.5 Kb
+
     * - ``flora8``
       - `Adafruit Flora <http://www.adafruit.com/product/659>`_
       - ATMEGA32U4
@@ -84,6 +98,13 @@ Adafruit
       - 4096 Kb
       - 80 Kb
 
+    * - ``metro``
+      - `Adafruit Metro <https://www.adafruit.com/products/2466>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+
     * - ``protrinket3``
       - `Adafruit Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 5e750445..57648bc5 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -82,6 +82,20 @@ Adafruit
       - Flash
       - RAM
 
+    * - ``bluefruitmicro``
+      - `Adafruit Bluefruit Micro <https://www.adafruit.com/products/2661>`_
+      - ATMEGA32U4
+      - 8 MHz
+      - 32 Kb
+      - 2.5 Kb
+
+    * - ``feather32u4``
+      - `Adafruit Feather <https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/>`_
+      - ATMEGA32U4
+      - 8 MHz
+      - 32 Kb
+      - 2.5 Kb
+
     * - ``flora8``
       - `Adafruit Flora <http://www.adafruit.com/product/659>`_
       - ATMEGA32U4
@@ -96,6 +110,13 @@ Adafruit
       - 8 Kb
       - 0.5 Kb
 
+    * - ``metro``
+      - `Adafruit Metro <https://www.adafruit.com/products/2466>`_
+      - ATMEGA328P
+      - 16 MHz
+      - 32 Kb
+      - 2 Kb
+
     * - ``protrinket3``
       - `Adafruit Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
       - ATMEGA328P
diff --git a/platformio/builder/scripts/baseavr.py b/platformio/builder/scripts/baseavr.py
index 6f79a030..b84220dd 100644
--- a/platformio/builder/scripts/baseavr.py
+++ b/platformio/builder/scripts/baseavr.py
@@ -39,19 +39,19 @@ env.Replace(
         "-Wall",  # show warnings
         "-ffunction-sections",  # place each function in its own section
         "-fdata-sections",
-        # "-MMD",  # output dependency info
         "-mmcu=$BOARD_MCU"
     ],
 
-    CPPDEFINES=[
-        "F_CPU=$BOARD_F_CPU"
-    ],
+    CFLAGS=["-std=gnu11"],
 
     CXXFLAGS=[
+        "-std=gnu++11",
         "-fno-exceptions",
         "-fno-threadsafe-statics"
     ],
 
+    CPPDEFINES=["F_CPU=$BOARD_F_CPU"],
+
     LINKFLAGS=[
         "-Os",
         "-mmcu=$BOARD_MCU",