From e70c412826ddb775f3b3d4a09ef769b4cf3069d2 Mon Sep 17 00:00:00 2001 From: sieren Date: Mon, 26 Aug 2019 17:29:26 +0200 Subject: [PATCH 1/4] Bump Arduino ESP Submodule to hack branch Add hack branch to make this run on ESP IDF 4.0 again. --- components/arduino-esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/arduino-esp32 b/components/arduino-esp32 index 46c12ba..847b600 160000 --- a/components/arduino-esp32 +++ b/components/arduino-esp32 @@ -1 +1 @@ -Subproject commit 46c12ba60be4d0adf2cf94e697e105ed2b61bfb5 +Subproject commit 847b600bbbb61e8b3d80349ad6b5c1eed3f2e9ed From c1af7acef4aef229e1dc1df471260224dea13447 Mon Sep 17 00:00:00 2001 From: sieren Date: Mon, 26 Aug 2019 17:30:37 +0200 Subject: [PATCH 2/4] Fix: Add missing define for M5Stack Add missing TFT_LED Define for M5Stack. --- main/libraries/TFT_eSPI/User_Setup.h | 1 + 1 file changed, 1 insertion(+) diff --git a/main/libraries/TFT_eSPI/User_Setup.h b/main/libraries/TFT_eSPI/User_Setup.h index fd4a55e..b1b8042 100755 --- a/main/libraries/TFT_eSPI/User_Setup.h +++ b/main/libraries/TFT_eSPI/User_Setup.h @@ -206,6 +206,7 @@ //#define TFT_DC 27 // Data Command control pin //#define TFT_RST 33 // Reset pin (could connect to Arduino RESET pin) //#define TFT_BL 32 // LED back-light (required for M5Stack) +//#define TFT_LED 32 // LED back-light (required for M5Stack) // ###### EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP ###### From 8ae3bbd910c2dcc5279001b9eba34cd9cbfe2077 Mon Sep 17 00:00:00 2001 From: sieren Date: Mon, 26 Aug 2019 17:32:06 +0200 Subject: [PATCH 3/4] CI: Move to ESP-IDF 4.0 Release Branch Move to the official ESP-IDF 4.0 release branch. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a695871..b71c3eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: # Get ESP-IDF from github - git clone --recursive https://github.com/espressif/esp-idf.git - cd esp-idf - - git checkout 02f2e63662d0314b689bb4925f5d8efa08cfe033 + - git checkout release/v4.0 - git submodule update --init --recursive - cd ~ - python -m pip install --user -r /home/travis/esp/esp-idf/requirements.txt From 3975d7c0cd7966e83a60ff6e029136cf97474cd2 Mon Sep 17 00:00:00 2001 From: sieren Date: Mon, 26 Aug 2019 17:52:00 +0200 Subject: [PATCH 4/4] Add ESPIDF v4.0 to readme --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 437d1bc..356260b 100644 --- a/README.md +++ b/README.md @@ -47,14 +47,12 @@ It has been tested with In order to build Homepoint, you need the [ESP-IDF SDK](https://github.com/espressif/esp-idf). ### Requirements -HomePoint was built on ESP-IDF master. Unfortunately CMake Support in 3.3 is incomplete and master is currently changing a lot -and breaking the dependency to the ESP32-Arduino submodule. -I plan to make HomePoint compatible to v4.0 once it gets a public release, for the time being, please -use commit `02f2e63662d0314b689bb4925f5d8efa08cfe033` from the ESP-IDF repo. +HomePoint was built on ESP-IDF master. Unfortunately CMake Support in v3.3 is incomplete. +In order to build HomePoint you need ESP-IDF from the `release/v4.0` branch from the ESP-IDF git repository. | Software | Version | | :------------- | :----------------------------------------------------------------------------------------------------------------------:| -| ESP-IDF | master (commit [02f2e63662d0314b689bb4925f5d8efa08cfe033](https://github.com/espressif/esp-idf)) | +| ESP-IDF | [release/v4.0](https://github.com/espressif/esp-idf/tree/release/v4.0)) | | Toolchain | [5.2.0](https://docs.espressif.com/projects/esp-idf/en/stable/get-started-cmake/index.html#step-1-set-up-the-toolchain) | Installation is fairly straight forward, see [Setting up the Toolchain](https://docs.espressif.com/projects/esp-idf/en/stable/get-started-cmake/index.html#step-1-set-up-the-toolchain) in the Espressif Documentation.