fix sdkconfig for esp32s2

Author: marcelkottmann

.github/workflows/ci.yml

@@ -10,7 +10,8 @@ jobs:
       - name: Build
         run: |
           docker build  -t esp32-javascript:latest -f tools/Dockerfile .
-          docker run --name esp32-javascript-build -t esp32-javascript:latest bash -c './tools/build.sh'
+          docker run --name esp32-javascript-build-esp32 -t esp32-javascript:latest bash -c './tools/build.sh'
+          docker run --name esp32-javascript-build-esp32s2 --env IDF_TARGET=esp32s2 -t esp32-javascript:latest bash -c './tools/build.sh'
 
 #### Commented out due to unavailability of e2e api
 #          docker cp 'esp32-javascript-build:/opt/esp32-javascript/build.tar.gz' .

.gitignore

@@ -3,3 +3,4 @@ sdkconfig.old*
 main/project.cpp
 main/project.c
 node_modules
+sdkconfig

README.md

@@ -37,12 +37,20 @@ Change into ~/esp/esp32-javascript.
 
 Maybe you want to change the BOARD_VARIANT in the ./CMakeLists.txt file.
 
+
 First build the project with
 
 ```shell
+    #for ESP32
     idf.py build
+
+    #for ESP32-S2
+    idf.py -DIDF_TARGET=esp32s2 build
 ```
 
+If you have an ESP32-S2 device build it like this:
+
+
 Connect your ESP32 Dev Board via USB and run
 
 ```shell
@@ -95,6 +103,7 @@ You can clean the project by executing
     idf.py fullclean
 ```
 
+If you want to use all the esp32-javascript defaults for your sdkconfig. Remove `./sdkconfig` file. This file will be recreated the next build with all the defaults. 
 ### Factory reset
 
 You can erase the persistent flash memory, which will be equivalent to a factory reset, by executing
@@ -105,8 +114,10 @@ You can erase the persistent flash memory, which will be equivalent to a factory
 
 ## Compatibility
 
+### Devices
+Tested with ESP32 WROVER and ESP-S2 WROVER devices.
+### ESP-IDF
 Tested with esp-idf [release/v4.2](https://github.com/espressif/esp-idf/tree/release/v4.2)
-
 ## API
 
 [API documentation](docs/README.md)

babel.config.json

@@ -1,4 +1,3 @@
 {
-  "presets": ["minify"],
-  "plugins": ["transform-remove-console"]
+  "presets": ["minify"]
 }

components/arduino-esp32/CMakeLists.txt

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

components/arduino-esp32/include/esp32/hal/adc_hal.h

@@ -0,0 +1,72 @@
+// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*******************************************************************************
+ * NOTICE
+ * The hal is not public api, don't use in application code.
+ * See readme.md in hal/include/hal/readme.md
+ ******************************************************************************/
+
+// The HAL layer for ADC (esp32 specific part)
+
+#pragma once
+
+#include "hal/adc_ll.h"
+#include "hal/adc_types.h"
+
+#include_next "hal/adc_hal.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*---------------------------------------------------------------
+                    Digital controller setting
+---------------------------------------------------------------*/
+
+/**
+ * Set I2S DMA data source for digital controller.
+ *
+ * @param src i2s data source.
+ */
+#define adc_hal_digi_set_data_source(src) adc_ll_digi_set_data_source(src)
+
+/*---------------------------------------------------------------
+                    Common setting
+---------------------------------------------------------------*/
+
+/*---------------------------------------------------------------
+                    Hall sensor setting
+---------------------------------------------------------------*/
+
+/**
+ * Enable hall sensor.
+ */
+#define adc_hal_hall_enable() adc_ll_hall_enable()
+
+/**
+ * Disable hall sensor.
+ */
+#define adc_hal_hall_disable() adc_ll_hall_disable()
+
+/**
+ *  Start hall convert and return the hall value.
+ *
+ *  @return Hall value.
+ */
+int adc_hal_hall_convert(void);
+
+#ifdef __cplusplus
+}
+#endif

components/arduino-esp32/include/esp32/hal/adc_hal_conf.h

@@ -0,0 +1,31 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#define SOC_ADC1_DATA_INVERT_DEFAULT    (1)
+#define SOC_ADC2_DATA_INVERT_DEFAULT    (1)
+
+#define SOC_ADC_DIGI_DATA_INVERT_DEFAULT(PERIPH_NUM) (1)
+
+#define SOC_ADC_FSM_RSTB_WAIT_DEFAULT       (8)
+#define SOC_ADC_FSM_START_WAIT_DEFAULT      (SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT)
+#define SOC_ADC_FSM_STANDBY_WAIT_DEFAULT    (100)
+#define ADC_FSM_SAMPLE_CYCLE_DEFAULT        (2)
+
+#define SOC_ADC_PWDET_CCT_DEFAULT           (4)
+
+#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2)
+
+#define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT    (16)