Merge remote-tracking branch 'origin/master' into esp-idf-v4.1-beta1

.travis.yml

@@ -1,14 +1,6 @@
-sudo: false
+dist: bionic
-language: bash
+language: python
-os:
+python: "3.8"
-  - linux
-
-addons:
-  apt:
-    packages:
-      - gperf
-      - python
-      - python-serial
 
 before_install:
   # Save path to the git respository
@@ -29,15 +21,13 @@ install:
   # Make xtensa-esp32-elf available for all terminal sessions
   - export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin
   # Get ESP-IDF from github
-  - git clone --recursive --branch release/v3.0 https://github.com/espressif/esp-idf.git
+  - git clone --recursive --branch v3.3 --single-branch --shallow-submodules https://github.com/espressif/esp-idf.git
   # Set the path to ESP-IDF directory
   - export IDF_PATH=~/esp/esp-idf
+  # Install python dependencies
+  - pip install --requirement $IDF_PATH/requirements.txt
 
 script:
-  # Go back to the git repository
+  # Build project within the original repository
   - cd $PROJECT_PATH
-  # Update configuration so that kconfig doesn't start interactive mode
+  - $IDF_PATH/tools/idf.py build
-  - make defconfig
-  # Build project from the git repository
-  - make
-

README.md

@@ -9,9 +9,7 @@ This is an example application for the Maxim Integrated DS18B20 Programmable Res
 
 It supports a single or multiple devices on the same 1-Wire bus.
 
-It is written and tested for v3.0 of the [ESP-IDF](https://github.com/espressif/esp-idf) environment, using the xtensa-esp32-elf toolchain (gcc version 5.2.0, crosstool-ng-1.22.0-80-g6c4433a).
+It is written and tested for v3.3 of the [ESP-IDF](https://github.com/espressif/esp-idf) environment, using the xtensa-esp32-elf toolchain (gcc version 5.2.0, crosstool-ng-1.22.0-80-g6c4433a).
-
-Support for ESP-IDF v2.1 is available on the [ESP-IDF_v2.1](https://github.com/DavidAntliff/esp32-ds18b20-example/tree/ESP-IDF_v2.1) branch.
 
 Ensure that submodules are cloned:
 
@@ -20,14 +18,9 @@ Ensure that submodules are cloned:
 Build the application with:
 
     $ cd esp32-ds18b20-example
-    $ make menuconfig    # set your serial configuration and the 1-Wire GPIO - see below
+    $ idf.py menuconfig    # set your serial configuration and the 1-Wire GPIO - see below
-    $ make flash monitor
+    $ idf.py build
-
+    $ idf.py -p (PORT) flash monitor
-For version 3.2 or newer of ESP-IDF, you can build with the CMake build system:
-
-    $ $IDF_PATH/tools/idf.py menuconfig  # set your serial configuration and the 1-Wire GPIO - see below
-    $ $IDF_PATH/tools/idf.py build
-    $ $IDF_PATH/tools/idf.py flash monitor
 
 The program should detect your connected devices and periodically obtain temperature readings from them, displaying them on the console.
 
@@ -42,7 +35,7 @@ This application makes use of the following components (included as submodules):
 
 To run this example, connect one or more DS18B20 devices to a single GPIO on the ESP32. Use the recommended pull-up resistor of 4.7 KOhms, connected to the 3.3V supply.
 
-`make menuconfig` can be used to set the 1-Wire GPIO.
+`idf.py menuconfig` can be used to set the 1-Wire GPIO.
 
 If you have several devices and see occasional CRC errors, consider using a 2.2 kOhm pull-up resistor instead. Also consider adding decoupling capacitors between the sensor supply voltage and ground, as close to each sensor as possible.