Update ESP-IDF examples

Author: valeros

examples/espidf-arduino-blink/platformio.ini

@@ -7,35 +7,21 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:esp32dev]
+[env]
 platform = espressif32
 framework = arduino, espidf
-board = esp32dev
 build_flags = 
     -D CONFIG_BLINK_GPIO=2
 monitor_speed = 115200
 platform_packages =
   ; use a special branch
   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0 
 
+[env:esp32dev]
+board = esp32dev
+
 [env:espea32]
-platform = espressif32
-framework = arduino, espidf
 board = espea32
-build_flags = 
-    -D CONFIG_BLINK_GPIO=2
-monitor_speed = 115200
-platform_packages =
-  ; use a special branch
-  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0 
 
 [env:esp320]
-platform = espressif32
-framework = arduino, espidf
 board = esp320
-build_flags = 
-    -D CONFIG_BLINK_GPIO=2
-monitor_speed = 115200
-platform_packages =
-  ; use a special branch
-  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0 

examples/espidf-arduino-wifiscan/platformio.ini

@@ -7,22 +7,16 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:esp32dev]
+[env]
 platform = espressif32
 framework = arduino, espidf
-board = esp32dev
-build_flags = -DCONFIG_WIFI_SSID=\"ESP_AP\" -DCONFIG_WIFI_PASSWORD=\"MYPASS\"
 monitor_speed = 115200
 platform_packages =
   ; use a special branch
   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0
 
+[env:esp32dev]
+board = esp32dev
+
 [env:esp-wrover-kit]
-platform = espressif32
-framework = arduino
 board = esp-wrover-kit
-build_flags = -DCONFIG_WIFI_SSID=\"ESP_AP\" -DCONFIG_WIFI_PASSWORD=\"MYPASS\"
-monitor_speed = 115200
-platform_packages =
-  ; use a special branch
-  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0

examples/espidf-arduino-wifiscan/sdkconfig.defaults

@@ -15,4 +15,7 @@ CONFIG_ARDUHAL_PARTITION_SCHEME="default"
 CONFIG_AUTOCONNECT_WIFI=y
 CONFIG_ARDUINO_SELECTIVE_WiFi=y
 CONFIG_MBEDTLS_PSK_MODES=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+# Example configs
+CONFIG_EXAMPLE_WIFI_SSID="MYSSID"
+CONFIG_EXAMPLE_WIFI_PASSWORD="MYPASS"

examples/espidf-aws-iot/components/esp-aws-iot/.gitlab-ci.yml

@@ -5,7 +5,7 @@ variables:
   BATCH_BUILD: "1"
   V: "0"
   MAKEFLAGS: "-j5 --no-keep-going"
-  IDF_PATH: "$CI_PROJECT_DIR/idf/esp-idf"
+  IDF_PATH: "$CI_PROJECT_DIR/esp-idf"
 
 build_demo:
   stage: build
@@ -23,12 +23,11 @@ build_demo:
     - echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
     - git --version
     - git submodule update --init --recursive
-    - mkdir idf
-    - cd idf
-    - git clone --depth 1 $GITLAB_SSH_SERVER/idf/esp-idf.git
-    - pushd esp-idf
-    - ./tools/ci/mirror-submodule-update.sh
-    - popd
+    - git clone --recursive --depth 1 $GITLAB_SSH_SERVER/idf/esp-idf.git
+    - export PATH="$IDF_PATH/tools:$PATH"
+    - cd esp-idf
+    - ./install.sh
+    - . export.sh
     - cd ..
     - cd examples/thing_shadow
     - cat sdkconfig.ci >> sdkconfig.defaults

examples/espidf-aws-iot/components/esp-aws-iot/aws-iot-device-sdk-embedded-C/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+# Ignore executables
+*.o
+IotSdkC_tests
+samples/linux/jobs_sample/jobs_sample
+samples/linux/shadow_sample/shadow_sample
+samples/linux/shadow_sample_console_echo/shadow_console_echo
+samples/linux/subscribe_publish_library_sample/libAwsIotSdk.a
+samples/linux/subscribe_publish_library_sample/subscribe_publish_library_sample
+samples/linux/subscribe_publish_sample/subscribe_publish_sample
+tests/integration/integration_tests_mbedtls
+tests/integration/integration_tests_mbedtls_mt
+
+# Ignore test artifacts
+objs/*
+testLibs/*
+
+# Ignore CppUTest and mbed TLS
+external_libs/CppUTest/*
+external_libs/mbedTLS/*
+
+# Ignore credentials
+certs/*

examples/espidf-aws-iot/components/esp-aws-iot/aws-iot-device-sdk-embedded-C/.gitignore

@@ -1,66 +1,44 @@
 language: c
 
-# Get Coverity certificate.
-before_install:
-  - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
-
-# Coverity configuration.
-addons:
-  coverity_scan:
-    project:
-      name: "aws-iot-device-sdk-embedded-C"
-      description: "SDK for connecting to AWS IoT from a device using embedded C. "
-    notification_email: [email protected]
-    build_command_prepend: "cd tests/integration"
-    build_command: "make app"
-    branch_pattern: master
-
 install:
   # Remove placeholders.
   - rm external_libs/CppUTest/*
-  - rm -rf external_libs/mbedTLS
+  - rm external_libs/mbedTLS/*
 
   # Get mbedtls.
-  - git clone https://github.com/ARMmbed/mbedtls.git external_libs/mbedTLS
+  - wget -qO- https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.5.tar.gz | tar xvz -C external_libs/mbedTLS --strip-components=1
 
   # Get CppUTest.
   - wget -qO- https://github.com/cpputest/cpputest/archive/v3.6.tar.gz | tar xvz -C external_libs/CppUTest --strip-components=1
 
 script:
   # Verify that the samples build.
   - cd samples/linux/jobs_sample
-  - make
+  - make -j2
   - cd ../shadow_sample
-  - make
+  - make -j2
   - cd ../shadow_sample_console_echo
-  - make
+  - make -j2
   - cd ../subscribe_publish_library_sample
-  - make
+  - make -j2
   - cd ../subscribe_publish_sample
-  - make
-
-  # Set the AWS IoT endpoint.
-  - cd ../../../tests/integration
-  - sed -i 's/^.*#define AWS_IOT_MQTT_HOST.*$/#define AWS_IOT_MQTT_HOST "'"$INTEGRATION_TEST_ENDPOINT"'"/' include/aws_iot_config.h
-
-  # Build the integration tests.
-  - make app
-
-  # Build the unit tests.
-  - cd ../../
-  - make build-cpputest
-  - make all_no_tests
-
-  # Execute unit tests.
-  - ./IotSdkC_tests
-
-  # Import credentials.
-  - echo -e $INTEGRATION_TEST_CLIENT_CERT > certs/cert.pem
-  - echo -e $INTEGRATION_TEST_ROOT_CA > certs/rootCA.crt
-  - echo -e $INTEGRATION_TEST_PRIVATE_KEY > certs/privkey.pem
-
-  # Execute integration tests.
-  - cd tests/integration
-  - ./integration_tests_mbedtls
-  - ./integration_tests_mbedtls_mt
-  
+  - make -j2
+
+  # Build and run unit tests.
+  - cd ../../../
+  - make build-cpputest -j2
+  - make all_no_tests -j2
+  - ./IotSdkC_tests -v
+
+  # Set up integration tests if not a pull request.
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd tests/integration; fi
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sed -i 's/^.*#define AWS_IOT_MQTT_HOST.*$/#define AWS_IOT_MQTT_HOST "'"$AWS_IOT_ENDPOINT"'"/' include/aws_iot_config.h; fi
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then make app -j2; fi
+
+  # Import credentials for integration tests.
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then wget https://www.amazontrust.com/repository/AmazonRootCA1.pem -O ../../certs/rootCA.crt; fi
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo -e $AWS_IOT_CLIENT_CERT > ../../certs/cert.pem; fi
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo -e $AWS_IOT_PRIVATE_KEY > ../../certs/privkey.pem; fi
+
+  # Run integration tests.
+  - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./integration_tests_mbedtls; fi

examples/espidf-aws-iot/components/esp-aws-iot/aws-iot-device-sdk-embedded-C/.travis.yml

@@ -4,22 +4,22 @@
 
 Bugfixes:
 
-  - [#167], [#168] Fixed issues reported by Coverity Scan.
-  - [#177] Fixes a memory corruption bug and handling of timeouts.
+  - [#167](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/167), [#168](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/168) Fixed issues reported by Coverity Scan.
+  - [#177](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/177) Fixes a memory corruption bug and handling of timeouts.
 
 Other:
 
   - Add .travis.yml for Travis CI.
   - Removed C++ sample.
   - Removed includes of `inttypes.h`, which doesn't exist on some systems.
-  - [#175] Added comments on static allocation of MQTT topics.
+  - [#175](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/175) Added comments on static allocation of MQTT topics.
 
 ## [3.0.0](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v3.0.0) (Apr 17, 2018)
 
 Bugfixes:
 
-  - [#152] Fixes potential buffer overflows in `parseStringValue` by requiring a size parameter in `jsonStruct_t`.
-  - [#155] Fixes other memory corruption bugs; also improves stability.
+  - [#152](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/152) Fixes potential buffer overflows in `parseStringValue` by requiring a size parameter in `jsonStruct_t`.
+  - [#155](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/155) Fixes other memory corruption bugs; also improves stability.
 
 The two bug fixes above are not backwards compatible with v2.3.0.  Please see [README.md](README.md#migrating-from-2x-to-3x) for details on migrating to v3.0.0.
 
@@ -50,7 +50,7 @@ Pull requests:
 ## [2.2.0](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v2.2.0) (Nov 22, 2017)
 
 New Features:
- 
+
   - Added SDK metrics string into connect packet
 
 Bugfixes:
@@ -79,7 +79,7 @@ Improvements:
   - Change default keepalive interval to 600 seconds
 
 Pull requests:
-  
+
   - [#29](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/29) - three small fixes
   - [#59](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/59) - Fixed MQTT header constructing and parsing
   - [#88](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/88) - Fix username and password are confused
@@ -92,14 +92,14 @@ Pull requests:
 Bugfixes/Improvements:
 
   - Network layer interface improvements to address reported issues
-  - Incorporated GitHub pull request [#41](https://github.com/aws/aws-iot-device-sdk-embedded-c/pull/41) 
+  - Incorporated GitHub pull request [#41](https://github.com/aws/aws-iot-device-sdk-embedded-c/pull/41)
   - Bugfixes for issues [#36](https://github.com/aws/aws-iot-device-sdk-embedded-C/issues/36) and [#33](https://github.com/aws/aws-iot-device-sdk-embedded-C/issues/33)
 
 ## [2.1.0](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v2.1.0) (Jun 15, 2016)
 
 New features:
 
-  - Added unit tests, further details can be found in the testing readme [here](https://github.com/aws/aws-iot-device-sdk-embedded-c/blob/master/tests/README.md)
+  - Added unit tests, further details can be found in the testing readme [here](https://github.com/aws/aws-iot-device-sdk-embedded-c/blob/master/tests/README.md/)
   - Added sample to demonstrate building the SDK as library
   - Added sample to demonstrate building the SDK in C++
 
@@ -109,7 +109,7 @@ Bugfixes/Improvements:
   - Increased default value of MQTT Command Timeout in Shadow Connect to 20 secs
   - Shadow null/length checks
   - Client Id Length not passed correctly in shadow connect
-  - Add extern C to headers and source files, added sample to demonstrate usage with C++ 
+  - Add extern C to headers and source files, added sample to demonstrate usage with C++
   - Delete/Accepted not being reported, callback added for delete/accepted
   - Append IOT_ to all Debug macros (eg. DEBUG is now IOT_DEBUG)
   - Fixed exit on error for subscribe_publish_sample
@@ -134,7 +134,7 @@ Bugfixes/Improvements:
   - Removed Paho Wrapper, Merge MQTT into SDK code, added specific error codes
   - Refactored Network and Timer layer wrappers, added specific error codes
   - Refactored samples and makefiles
-  
+
 ## [1.1.2](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v1.1.2) (April 22,  2016)
 
 Bugfixes/Improvements:
@@ -149,13 +149,13 @@ Bugfixes/Improvements:
   - Removing the Executable bit from all the files in the repository. Fixing [this](https://github.com/aws/aws-iot-device-sdk-embedded-C/issues/14) issue
   - Refactoring MQTT client to remove declaration after statement warnings
   - Fixing [this](https://forums.aws.amazon.com/thread.jspa?threadID=222467&tstart=0) bug
- 
+
 
 ## [1.1.0](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v1.1.0) (February 10, 2016)
 Features:
 
   - Auto Reconnect and Resubscribe
-  
+
 Bugfixes/Improvements:
 
   - MQTT buffer handling incase of bigger message
@@ -169,7 +169,7 @@ Bugfixes/Improvements:
 Bugfixes/Improvements:
 
   - Paho name changed to Eclipse Paho
-  - Renamed the Makefiles in the samples directory 
+  - Renamed the Makefiles in the samples directory
   - Device Shadow - Delete functionality macro fixed
   - `subscribe_publish_sample` updated
 
@@ -182,7 +182,7 @@ Features:
 
 Bugfixes/Improvements:
   - Updated API documentation
- 
+
 ## 0.4.0 (October 5, 2015)
 
 Features:
@@ -191,7 +191,7 @@ Features:
   - aws_iot_config.h file for easy configuration of parameters
   - Sample app for talking with console's Interactive guide
   - disconnect handler for the MQTT client library
-  
+
 Bugfixes/Improvements:
 
   - mbedTLS read times out every 10 ms instead of hanging for ever

examples/espidf-aws-iot/components/esp-aws-iot/aws-iot-device-sdk-embedded-C/CHANGELOG.md

@@ -31,7 +31,7 @@ IOT_CLIENT_DIR = .
 APP_DIR = $(IOT_CLIENT_DIR)/tests/unit
 APP_NAME = aws_iot_sdk_unit_tests
 APP_SRC_FILES = $(shell find $(APP_DIR)/src -name '*.cpp')
-APP_SRC_FILES = $(shell find $(APP_DIR)/src -name '*.c')
+APP_SRC_FILES += $(shell find $(APP_DIR)/src -name '*.c')
 APP_INCLUDE_DIRS = -I $(APP_DIR)/include
 
 CPPUTEST_DIR = $(IOT_CLIENT_DIR)/external_libs/CppUTest