Merge branch 'develop' into feature/platformio-30

* develop:
  Fix issue with ``platformio init --ide`` command for Python 2.6
  Version bump to 2.10.3
  Fix issue with appending PIO version to Build Defines
  Add test for `init --ide eclipse`
  Version bump to 2.10.2 (issues #695)
  Fix firmware uploading to Arduino/Genuino 101 // Resolve #695
  Use $PLATFORM from build environment instead from the board config
  Update Intel ARC32 Arduino framework to v1.0.6 // Issue #695
  Update Intel ARC32 Arduino framework to v1.0.6
  Add support for ST Nucleo L031K6 board to ARM mbed framework
  Revert mcu option for genuino101
  Update intel_arc32 platform
  Update HISTORY.rst
  Fix upload size checker
  Process "$BUILD_UNFLAGS" variable
  Restore PIO macros if it was deleted by framework

platformio/builder/tools/pioupload.py

@@ -37,13 +37,15 @@ def FlushSerialBuffer(env, port):
 
 
 def TouchSerialPort(env, port, baudrate):
+    port = env.subst(port)
+    print "Forcing reset using %dbps open/close on port %s" % (baudrate, port)
     if system() != "Windows":
         try:
-            s = Serial(env.subst(port))
+            s = Serial(port)
             s.close()
         except:  # pylint: disable=W0702
             pass
-    s = Serial(port=env.subst(port), baudrate=baudrate)
+    s = Serial(port=port, baudrate=baudrate)
     s.setDTR(False)
     s.close()
     sleep(0.4)

platformio/builder/tools/platformio.py

@@ -36,9 +36,11 @@ SRC_DEFAULT_FILTER = " ".join([
 def BuildProgram(env):
 
     def _append_pio_macros():
-        env.AppendUnique(
+        if any(["PLATFORMIO=" in str(d) for d in env.get("CPPDEFINES", [])]):
+            return
+        env.Append(
             CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
-                *pioversion_to_intstr())],
+                *pioversion_to_intstr())]
         )
 
     _append_pio_macros()