From 475a521d0fe394723b2d86e85c8d4668f9ccb445 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 28 Apr 2016 21:19:31 +0300
Subject: [PATCH] Minor fixes

---
 docs/frameworks/arduino.rst           | 71 +++++++++++++++++++++------
 docs/frameworks/simba.rst             |  8 +--
 docs/platforms/atmelavr.rst           | 67 ++++++++++++++++++++-----
 docs/platforms/atmelsam.rst           |  4 +-
 platformio/__init__.py                |  2 +-
 platformio/platforms/lattice_ice40.py |  3 ++
 6 files changed, 120 insertions(+), 35 deletions(-)

diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 31ff07eb..af3f11b1 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -224,6 +224,13 @@ Arduino
       - 32 Kb
       - 2 Kb
 
+    * - ``chiwawa``
+      - `Arduino Industrial 101 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-industrial-101>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
     * - ``diecimilaatmega168``
       - `Arduino Duemilanove or Diecimila ATmega168 <http://arduino.cc/en/Main/ArduinoBoardDiecimila>`_
       - ATMEGA168
@@ -239,28 +246,28 @@ Arduino
       - 2 Kb
 
     * - ``due``
-      - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - `Arduino Due (Programming Port) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-due>`_
       - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
     * - ``dueUSB``
-      - `Arduino Due (USB Native Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - `Arduino Due (USB Native Port) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-due>`_
       - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
     * - ``esplora``
-      - `Arduino Esplora <http://arduino.cc/en/Main/ArduinoBoardEsplora>`_
+      - `Arduino Esplora <http://www.arduino.org/products/boards/4-arduino-boards/arduino-esplora>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
       - 2.5 Kb
 
     * - ``ethernet``
-      - `Arduino Ethernet <http://arduino.cc/en/Main/ArduinoBoardEthernet>`_
+      - `Arduino Ethernet <http://www.arduino.org/products/boards/4-arduino-boards/arduino-ethernet>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -274,7 +281,14 @@ Arduino
       - 2 Kb
 
     * - ``leonardo``
-      - `Arduino Leonardo <http://arduino.cc/en/Main/arduinoBoardLeonardo>`_
+      - `Arduino Leonardo <http://www.arduino.org/products/boards/4-arduino-boards/arduino-leonardo>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
+    * - ``leonardoeth``
+      - `Arduino Leonardo ETH <http://www.arduino.org/products/boards/4-arduino-boards/arduino-leonardo-eth>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
@@ -295,28 +309,28 @@ Arduino
       - 2 Kb
 
     * - ``megaADK``
-      - `Arduino Mega ADK <http://arduino.cc/en/Main/ArduinoBoardMegaADK>`_
+      - `Arduino Mega ADK <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-adk>`_
       - ATMEGA2560
       - 16 MHz
       - 256 Kb
       - 8 Kb
 
     * - ``megaatmega1280``
-      - `Arduino Mega or Mega 2560 ATmega1280 <http://arduino.cc/en/Main/arduinoBoardMega>`_
+      - `Arduino Mega or Mega 2560 ATmega1280 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-2560>`_
       - ATMEGA1280
       - 16 MHz
       - 128 Kb
       - 8 Kb
 
     * - ``megaatmega2560``
-      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://arduino.cc/en/Main/arduinoBoardMega2560>`_
+      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-2560>`_
       - ATMEGA2560
       - 16 MHz
       - 256 Kb
       - 8 Kb
 
     * - ``micro``
-      - `Arduino Micro <http://arduino.cc/en/Main/ArduinoBoardMicro>`_
+      - `Arduino Micro <http://www.arduino.org/products/boards/4-arduino-boards/arduino-micro>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
@@ -337,14 +351,14 @@ Arduino
       - 2 Kb
 
     * - ``nanoatmega168``
-      - `Arduino Nano ATmega168 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - `Arduino Nano ATmega168 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA168
       - 16 MHz
       - 16 Kb
       - 1 Kb
 
     * - ``nanoatmega328``
-      - `Arduino Nano ATmega328 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - `Arduino Nano ATmega328 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -379,28 +393,35 @@ Arduino
       - 2 Kb
 
     * - ``robotControl``
-      - `Arduino Robot Control <http://arduino.cc/en/Main/Robot>`_
+      - `Arduino Robot Control <http://www.arduino.org/products/boards/4-arduino-boards/arduino-robot>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
       - 2.5 Kb
 
     * - ``robotMotor``
-      - `Arduino Robot Motor <http://arduino.cc/en/Main/Robot>`_
+      - `Arduino Robot Motor <http://www.arduino.org/products/boards/4-arduino-boards/arduino-robot>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
       - 2.5 Kb
 
     * - ``uno``
-      - `Arduino Uno <http://arduino.cc/en/Main/ArduinoBoardUno>`_
+      - `Arduino Uno <http://www.arduino.org/products/boards/4-arduino-boards/arduino-uno>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``yun``
-      - `Arduino Yun <http://arduino.cc/en/Main/ArduinoBoardYun>`_
+      - `Arduino Yun <http://www.arduino.org/products/boards/4-arduino-boards/arduino-yun>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
+    * - ``yunmini``
+      - `Arduino Yun Mini <http://www.arduino.org/products/boards/4-arduino-boards/arduino-yun-mini>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
@@ -897,6 +918,26 @@ LightUp
       - 32 Kb
       - 2.5 Kb
 
+Linino
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``one``
+      - `Linino One <http://www.linino.org/portfolio/linino-one/>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
 LowPowerLab
 ~~~~~~~~~~~
 
diff --git a/docs/frameworks/simba.rst b/docs/frameworks/simba.rst
index c179ebc7..e2c12f20 100644
--- a/docs/frameworks/simba.rst
+++ b/docs/frameworks/simba.rst
@@ -78,28 +78,28 @@ Arduino
       - RAM
 
     * - ``due``
-      - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - `Arduino Due (Programming Port) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-due>`_
       - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
     * - ``megaatmega2560``
-      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://arduino.cc/en/Main/arduinoBoardMega2560>`_
+      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-2560>`_
       - ATMEGA2560
       - 16 MHz
       - 256 Kb
       - 8 Kb
 
     * - ``nanoatmega328``
-      - `Arduino Nano ATmega328 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - `Arduino Nano ATmega328 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``uno``
-      - `Arduino Uno <http://arduino.cc/en/Main/ArduinoBoardUno>`_
+      - `Arduino Uno <http://www.arduino.org/products/boards/4-arduino-boards/arduino-uno>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index da5eac55..4f4b5955 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -214,6 +214,13 @@ Arduino
       - 32 Kb
       - 2 Kb
 
+    * - ``chiwawa``
+      - `Arduino Industrial 101 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-industrial-101>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
     * - ``diecimilaatmega168``
       - `Arduino Duemilanove or Diecimila ATmega168 <http://arduino.cc/en/Main/ArduinoBoardDiecimila>`_
       - ATMEGA168
@@ -229,14 +236,14 @@ Arduino
       - 2 Kb
 
     * - ``esplora``
-      - `Arduino Esplora <http://arduino.cc/en/Main/ArduinoBoardEsplora>`_
+      - `Arduino Esplora <http://www.arduino.org/products/boards/4-arduino-boards/arduino-esplora>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
       - 2.5 Kb
 
     * - ``ethernet``
-      - `Arduino Ethernet <http://arduino.cc/en/Main/ArduinoBoardEthernet>`_
+      - `Arduino Ethernet <http://www.arduino.org/products/boards/4-arduino-boards/arduino-ethernet>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -250,7 +257,14 @@ Arduino
       - 2 Kb
 
     * - ``leonardo``
-      - `Arduino Leonardo <http://arduino.cc/en/Main/arduinoBoardLeonardo>`_
+      - `Arduino Leonardo <http://www.arduino.org/products/boards/4-arduino-boards/arduino-leonardo>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
+    * - ``leonardoeth``
+      - `Arduino Leonardo ETH <http://www.arduino.org/products/boards/4-arduino-boards/arduino-leonardo-eth>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
@@ -271,28 +285,28 @@ Arduino
       - 2 Kb
 
     * - ``megaADK``
-      - `Arduino Mega ADK <http://arduino.cc/en/Main/ArduinoBoardMegaADK>`_
+      - `Arduino Mega ADK <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-adk>`_
       - ATMEGA2560
       - 16 MHz
       - 256 Kb
       - 8 Kb
 
     * - ``megaatmega1280``
-      - `Arduino Mega or Mega 2560 ATmega1280 <http://arduino.cc/en/Main/arduinoBoardMega>`_
+      - `Arduino Mega or Mega 2560 ATmega1280 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-2560>`_
       - ATMEGA1280
       - 16 MHz
       - 128 Kb
       - 8 Kb
 
     * - ``megaatmega2560``
-      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://arduino.cc/en/Main/arduinoBoardMega2560>`_
+      - `Arduino Mega or Mega 2560 ATmega2560 (Mega 2560) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-mega-2560>`_
       - ATMEGA2560
       - 16 MHz
       - 256 Kb
       - 8 Kb
 
     * - ``micro``
-      - `Arduino Micro <http://arduino.cc/en/Main/ArduinoBoardMicro>`_
+      - `Arduino Micro <http://www.arduino.org/products/boards/4-arduino-boards/arduino-micro>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
@@ -313,14 +327,14 @@ Arduino
       - 2 Kb
 
     * - ``nanoatmega168``
-      - `Arduino Nano ATmega168 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - `Arduino Nano ATmega168 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA168
       - 16 MHz
       - 16 Kb
       - 1 Kb
 
     * - ``nanoatmega328``
-      - `Arduino Nano ATmega328 <http://arduino.cc/en/Main/ArduinoBoardNano>`_
+      - `Arduino Nano ATmega328 <http://www.arduino.org/products/boards/4-arduino-boards/arduino-nano>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
@@ -355,28 +369,35 @@ Arduino
       - 2 Kb
 
     * - ``robotControl``
-      - `Arduino Robot Control <http://arduino.cc/en/Main/Robot>`_
+      - `Arduino Robot Control <http://www.arduino.org/products/boards/4-arduino-boards/arduino-robot>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
       - 2.5 Kb
 
     * - ``robotMotor``
-      - `Arduino Robot Motor <http://arduino.cc/en/Main/Robot>`_
+      - `Arduino Robot Motor <http://www.arduino.org/products/boards/4-arduino-boards/arduino-robot>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
       - 2.5 Kb
 
     * - ``uno``
-      - `Arduino Uno <http://arduino.cc/en/Main/ArduinoBoardUno>`_
+      - `Arduino Uno <http://www.arduino.org/products/boards/4-arduino-boards/arduino-uno>`_
       - ATMEGA328P
       - 16 MHz
       - 32 Kb
       - 2 Kb
 
     * - ``yun``
-      - `Arduino Yun <http://arduino.cc/en/Main/ArduinoBoardYun>`_
+      - `Arduino Yun <http://www.arduino.org/products/boards/4-arduino-boards/arduino-yun>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
+    * - ``yunmini``
+      - `Arduino Yun Mini <http://www.arduino.org/products/boards/4-arduino-boards/arduino-yun-mini>`_
       - ATMEGA32U4
       - 16 MHz
       - 32 Kb
@@ -579,6 +600,26 @@ LightUp
       - 32 Kb
       - 2.5 Kb
 
+Linino
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``one``
+      - `Linino One <http://www.linino.org/portfolio/linino-one/>`_
+      - ATMEGA32U4
+      - 16 MHz
+      - 32 Kb
+      - 2.5 Kb
+
 LowPowerLab
 ~~~~~~~~~~~
 
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 1113932c..9e232616 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -99,14 +99,14 @@ Arduino
       - RAM
 
     * - ``due``
-      - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - `Arduino Due (Programming Port) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-due>`_
       - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
     * - ``dueUSB``
-      - `Arduino Due (USB Native Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - `Arduino Due (USB Native Port) <http://www.arduino.org/products/boards/4-arduino-boards/arduino-due>`_
       - SAM3X8E
       - 84 MHz
       - 512 Kb
diff --git a/platformio/__init__.py b/platformio/__init__.py
index bc8d2788..b770a33d 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 9, 0)
+VERSION = (2, 9, "1.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/platforms/lattice_ice40.py b/platformio/platforms/lattice_ice40.py
index 1791a51c..35d41ed8 100755
--- a/platformio/platforms/lattice_ice40.py
+++ b/platformio/platforms/lattice_ice40.py
@@ -36,5 +36,8 @@ class Lattice_ice40Platform(BasePlatform):
         }
     }
 
+    def get_name(self):
+        return "Lattice iCE40"
+
     def is_embedded(self):
         return True