From 8eecfd21b41838761ecf5a3cb62446e4d53dce36 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sun, 26 Nov 2017 02:22:42 +0200
Subject: [PATCH 1/3] Sync flags with platform.txt; Custom partitions per board
 (#875)

* Sync flags with platform.txt

* Add support for custom partitions per board

* Add "-fstack-protector" to CCFLAGS
---
 tools/platformio-build.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index 9e197e33..c3950451 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -36,16 +36,19 @@ assert isdir(FRAMEWORK_DIR)
 
 env.Prepend(
     CPPDEFINES=[
-        ("ARDUINO", 10610),
-        "ARDUINO_ARCH_ESP32"
+        ("ARDUINO", 10805),
+        "ARDUINO_ARCH_ESP32",
+        ("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', ""))
     ],
 
     CFLAGS=["-Wno-old-style-declaration"],
 
     CCFLAGS=[
         "-Wno-error=deprecated-declarations",
+        "-Wno-error=unused-function",
         "-Wno-unused-parameter",
-        "-Wno-sign-compare"
+        "-Wno-sign-compare",
+        "-fstack-protector"
     ],
 
     CPPPATH=[
@@ -115,7 +118,7 @@ def _get_board_flash_mode(env):
 
 env.Append(
     __get_board_flash_mode=_get_board_flash_mode,
-    
+
     LIBSOURCE_DIRS=[
         join(FRAMEWORK_DIR, "libraries")
     ],
@@ -174,11 +177,11 @@ env.Prepend(LIBS=libs)
 #
 # Generate partition table
 #
-
 partition_table = env.Command(
     join("$BUILD_DIR", "partitions.bin"),
-    join(FRAMEWORK_DIR, "tools", "partitions", "default.csv"),
-    env.VerboseAction('"$PYTHONEXE" "%s" -q $SOURCE $TARGET' %
-                      join(FRAMEWORK_DIR, "tools", "gen_esp32part.py"),
+    join(FRAMEWORK_DIR, "tools", "partitions",
+         "%s.csv" % env.BoardConfig().get("build.partitions", "default")),
+    env.VerboseAction('"$PYTHONEXE" "%s" -q $SOURCE $TARGET' % join(
+        FRAMEWORK_DIR, "tools", "gen_esp32part.py"),
                       "Generating partitions $TARGET"))
 env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table)

From 6fe9202c6c931a04242ba450bbce38c2641b7ab7 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Sun, 26 Nov 2017 19:35:01 +0100
Subject: [PATCH 2/3] Update platformio-build.py

---
 tools/platformio-build.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index c3950451..b3274f4c 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -133,9 +133,9 @@ env.Append(
     ],
 
     UPLOADERFLAGS=[
-        "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),
-        "0x8000", '"%s"' % join("$BUILD_DIR", "partitions.bin"),
-        "0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
+        "0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),
+        "0x8000", join("$BUILD_DIR", "partitions.bin"),
+        "0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
         "0x10000"
     ]
 )

From dac7ae757ac0df98145a2997f2a50abbe4e8eed2 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sun, 26 Nov 2017 20:35:21 +0200
Subject: [PATCH 3/3] Minor fixes for PlatformIO (#881)

* Don't escape folders which are already arguments

* Drop "stage" suffix from @platformio dev/platform
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f1c777e8..3929a491 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ script:
   - echo -e "travis_fold:start:platformio_test_env_prepare"
   - pip install -U https://github.com/platformio/platformio/archive/develop.zip
   - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage
-  - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32_stage/platform.json
+  - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json
   - ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32
   - echo -e "travis_fold:end:platformio_test_env_prepare"
   - echo -e "travis_fold:start:platformio_test"