migrate to latest esp-idf and cmake

Author: marcelkottmann

.gitignore

@@ -1,3 +1,3 @@
 build
-main/esp32.js
 sdkconfig.old*
+main/project.cpp

CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.5)
+
+### CONFIGURATION OF ESP32 JAVASCRIPT PROJECT ###
+
+# set BOARD_VARIANT to define your ESP32 board. Valid values
+# are the directory names below ./components/arduino-esp32/include/variants/
+# or esp32-javascript/include/variants/
+set(ENV{BOARD_VARIANT} "../esp32-javascript/include/variants/my")
+
+# set ESP32_JS_PROJECT_NAME to define your project component name. 
+# Place your component below ./components directory. Set to ""
+# if you don't have a project component yet.
+set(ENV{ESP32_JS_PROJECT_NAME} "")
+#################################################
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(esp32-javascript)
+
+add_custom_target(cp_modules ALL
+    COMMAND scripts/copy-modules.sh
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+spiffs_create_partition_image(storage build/modules FLASH_IN_PROJECT
+    DEPENDS cp_modules)

main/main.h renamed to LICENSE

@@ -1,7 +1,6 @@
-/*
 MIT License
 
-Copyright (c) 2019 Marcel Kottmann
+Copyright (c) 2020 Marcel Kottmann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-*/
-
-#if !defined(EL_MAIN_H_INCLUDED)
-#define EL_MAIN_H_INCLUDED
-
-#endif

Makefile

@@ -18,39 +18,73 @@ Install [esp-idf](http://esp-idf.readthedocs.io/en/latest/get-started/index.html
 
 ### First install
 Clone esp32-javascript inside your esp directory (normally ~/esp):
-
+```shell
     cd ~/esp
     git clone https://github.com/pepe79/esp32-javascript.git
+```
 
 Change into ~/esp/esp32-javascript.
-
+```shell
     cd ~/esp/esp32-javascript
+```
 
-Open the Makefile and change settings in the configuration section.
+Maybe you want to change the BOARD_VARIANT in the ./CMakeLists.txt file.
 
-Connect your ESP32 Dev Board via USB and run
+First build the project with
+```shell
+    idf.py build
+```
 
-    make flash monitor
+Connect your ESP32 Dev Board via USB and run
+```shell
+    idf.py flash monitor
+```
 
 Use the keyboard shortcut `AltGr + ]` to leave serial monitor.
 
 Now you have installed the pre-configured boot script.
 
-If this is your first install, your onboard LED should blink now. Blinking signals that 
-your board has started a soft ap with the ssid "esp32". With your mobile or desktop connect 
-to the WLAN SSID "esp32" and open http://192.168.4.1/setup (if you have not changed the default 
-credentials your username / password is esp32 / esp32 ).
+If this is your first install, your onboard LED should blink now. Blinking signals that your board has started a soft ap with the ssid "esp32". With your mobile or desktop connect to the WLAN SSID "esp32" and open http://192.168.4.1/setup (if you have not changed the default credentials your username / password is esp32 / esp32 ).
 
 On the Setup page you can configure your WLAN settings and an URL to download your JS main script from.
 
 Please note that the script, does not need to have a main function, because its evaluated entirely. 
 That means, to print out "Hello World", you only have to include one line in your script on the webserver:
 
-        console.log('Hello world!');
+```js
+    console.log('Hello world!');
+```
+
+### C/C++bindings
+
+If you need to create your own C/C++ bindings for your JS code, this are the steps to perform:
+
+1. Create a file named `project.cpp` in the `./main` directory
+2. Implement the esp32_javascript_main callback function inside this `project.ccp`:
+```c
+   extern void esp32_javascript_main(duk_context *ctx)
+   {
+     // do your own duktape bindings here
+   }
+```
+
+See [Duktape Programmer's Guide](https://duktape.org/guide.html) for more information regarding Duktape bindings.
+
+If you need more than this, you can create your own esp-idf component below `./components`. Then delegate the `esp32_javascript_main` function to this component.
+Additionally you have to set your component name in the top level `./CMakeLists.txt`. Refer to the documentation next to the setting `ESP32_JS_PROJECT_NAME`.
+See [ESP Build System](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html) for information on how to create a component with the esp-idf build system.
+
+### Clean        
+
+You can clean the project with
+
+```shell
+    idf.py fullclean
+```
 
 ## Compatibility
 
-Tested with release/v4.0 (ba0f4f17ed91c3372149beacdfbee6af58e4f634) of esp-idf.
+Tested with esp-idf (master branch commit hash 2e14149b).
 
 ## API
 [API documentation](api.md)

README.md

@@ -0,0 +1,3 @@
+idf_component_register(SRC_DIRS "." "./libb64"
+                    INCLUDE_DIRS "include" "$ENV{BOARD_VARIANT}"
+                    REQUIRES "nvs_flash" "app_update" "esp_adc_cal")

components/arduino-esp32/CMakeLists.txt

@@ -0,0 +1,3 @@
+idf_component_register(SRC_DIRS "."
+                    INCLUDE_DIRS "include" "../esp32-javascript/include/variants/my"
+                    REQUIRES "arduino-esp32")

components/arduino-esp32/component.mk

@@ -0,0 +1,4 @@
+idf_component_register(SRC_DIRS "."
+                    INCLUDE_DIRS "include"
+                    REQUIRES "duktape" "esp32-javascript"
+                    EMBED_TXTFILES "loader.js")