From 9aa05889b090165431cc9c0c86b5782c713b5316 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 3 Jun 2019 18:00:29 +0200 Subject: [PATCH] Revert "Fix pio compile parameters" This reverts commit efb4d088234bc48342fcd445ad7f025a2900353f. --- pio/http-uploader.py | 4 +--- platformio.ini | 56 ++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/pio/http-uploader.py b/pio/http-uploader.py index 7c204cf1f..b80ee4a09 100644 --- a/pio/http-uploader.py +++ b/pio/http-uploader.py @@ -4,11 +4,9 @@ from base64 import b64decode env.Replace(UPLOADER="pio\espupload.py") env.Replace(UPLOADERFLAGS="") -env.Replace(UPLOADCMD="$UPLOADER -u $UPLOAD_PORT -f $SOURCES") +env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES") ''' -env.Replace(UPLOADCMD="$UPLOADER -u domus1:80/api/upload-arduino.php -f $SOURCES") -env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES") env.Replace(UPLOADCMD="pio\espupload.py -f $SOURCES") # Windows env.Replace(UPLOADCMD="pio/espupload.py -f $SOURCES") # Linux ''' \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 67fe2ea0e..a5c0946d1 100755 --- a/platformio.ini +++ b/platformio.ini @@ -11,34 +11,34 @@ src_dir = sonoff ; *** Uncomment one of the lines below to build/upload only one environment -;default_envs = sonoff -;default_envs = sonoff-minimal -;default_envs = sonoff-basic -;default_envs = sonoff-classic -;default_envs = sonoff-knx -;default_envs = sonoff-sensors -;default_envs = sonoff-display -;default_envs = sonoff-BG -;default_envs = sonoff-BR -;default_envs = sonoff-CN -;default_envs = sonoff-CZ -;default_envs = sonoff-DE -;default_envs = sonoff-ES -;default_envs = sonoff-FR -;default_envs = sonoff-GR -;default_envs = sonoff-HE -;default_envs = sonoff-HU -;default_envs = sonoff-IT -;default_envs = sonoff-KO -;default_envs = sonoff-NL -;default_envs = sonoff-PL -;default_envs = sonoff-PT -;default_envs = sonoff-RU -;default_envs = sonoff-SE -;default_envs = sonoff-SK -;default_envs = sonoff-TR -;default_envs = sonoff-TW -;default_envs = sonoff-UK +;env_default = sonoff +;env_default = sonoff-minimal +;env_default = sonoff-basic +;env_default = sonoff-classic +;env_default = sonoff-knx +;env_default = sonoff-sensors +;env_default = sonoff-display +;env_default = sonoff-BG +;env_default = sonoff-BR +;env_default = sonoff-CN +;env_default = sonoff-CZ +;env_default = sonoff-DE +;env_default = sonoff-ES +;env_default = sonoff-FR +;env_default = sonoff-GR +;env_default = sonoff-HE +;env_default = sonoff-HU +;env_default = sonoff-IT +;env_default = sonoff-KO +;env_default = sonoff-NL +;env_default = sonoff-PL +;env_default = sonoff-PT +;env_default = sonoff-RU +;env_default = sonoff-SE +;env_default = sonoff-SK +;env_default = sonoff-TR +;env_default = sonoff-TW +;env_default = sonoff-UK [esp82xx_defaults] build_flags = -D NDEBUG