From 7a0ad497da0fc3ed4289bc86437228245328fe74 Mon Sep 17 00:00:00 2001
From: Valeriy Koval <valeros@bigmir.net>
Date: Wed, 27 Apr 2016 14:19:38 +0300
Subject: [PATCH] Improve microchippic32 platform

---
 platformio/builder/scripts/microchippic32.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/platformio/builder/scripts/microchippic32.py b/platformio/builder/scripts/microchippic32.py
index 5a1c3fe0..950cf0f8 100644
--- a/platformio/builder/scripts/microchippic32.py
+++ b/platformio/builder/scripts/microchippic32.py
@@ -22,6 +22,14 @@ from SCons.Script import (
     COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default, DefaultEnvironment)
 
 
+def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
+
+    if "program" in COMMAND_LINE_TARGETS:
+        return
+
+    env.AutodetectUploadPort()
+    env.Prepend(UPLOADERFLAGS=["-d", '"$UPLOAD_PORT"'])
+
 env = DefaultEnvironment()
 
 env.Replace(
@@ -62,8 +70,7 @@ env.Replace(
     CPPDEFINES=[
         "F_CPU=$BOARD_F_CPU",
         "MPIDEVER=16777998",
-        "MPIDE=150",
-        "IDE=Arduino"
+        "MPIDE=150"
     ],
 
     LINKFLAGS=[
@@ -82,7 +89,6 @@ env.Replace(
 
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-pic32prog", "pic32prog"),
     UPLOADERFLAGS=[
-        "-d", '"$UPLOAD_PORT"',
         "-b", "$UPLOAD_SPEED"
     ],
     UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES',
@@ -176,7 +182,8 @@ AlwaysBuild(target_size)
 # Target: Upload firmware
 #
 
-upload = env.Alias(["upload", "uploadlazy"], target_firm, "$UPLOADCMD")
+upload = env.Alias(
+    ["upload", "uploadlazy"], target_firm, [BeforeUpload, "$UPLOADCMD"])
 AlwaysBuild(upload)
 
 #