Backmerge

.gitignore

@@ -4,4 +4,4 @@ tools/esptool
 tools/esptool.exe
 tools/mkspiffs/mkspiffs
 tools/mkspiffs/mkspiffs.exe
-.DS_Store
+.DS_Store

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "libraries/BLE"]
 	path = libraries/BLE
 	url = https://github.com/nkolban/ESP32_BLE_Arduino.git
+[submodule "libraries/AzureIoT"]
+	path = libraries/AzureIoT
+	url = https://github.com/VSChina/ESP32_AzureIoT_Arduino

.travis.yml

@@ -7,52 +7,30 @@ python:
 os:
   - linux
 
+env:
+    global:
+        - secure: "l/4Dt+KQ/mACtGAHDUsPr66fUte840PZoQ4xpPikqWZI0uARu4l+Ym7+sHinnT6fBqrj8AJeBYGz4nFa8NK4LutZn9mSD40w+sxl0wSV4oHV8rzKe3Cd8+sMG3+o33yWoikMNjSvqa73Q0rm+SgrlInNdZbuAyixL+a2alaWSnGPm4F2xwUGj+S33TOy5P/Xp77CYtCV5S8vzyk/eEdNhoF0GYePJVdfuzCOUjXMyT5OWxORkzzQ7Hnn/Ka/RDfV8Si4HgujLQBrK5q6iPnNBFqBSqilYBepSMn4opnOBpIm0SCgePz7XQEFC83buA7GUcnCnfg38bf+dCwHaODf1d1PmqVRYt2QmfinexXtM4afAtL0iBUDtvrfnXHzwW9w82VeZhpbJSVh9DUQvB0IlsZeCz9J9PUBAi3N+SMX+9l+BomYwRUlPuKY+Ef2JKk9q6mxtUkky5R0daAlVxEhpVdQks1rT+T+NMoDMemxQ3SKEiqAHh6EgHecruszffmZ71uLX9MpERpew0qN+UFiafws+jkTjx+3yF9yut0Hf9sMbeAYzzkGzRqJTUEBJ6B29Cql8M0yRXCNN/8wuuTHhG8esstozga4ZQoIVrq7mEAgup376PTcNfr1+imbbWVQ7lJdYIuDe6OS5V3OX6np11vgK/DbhfyzvQv9Z1zAGnM="
+        - REMOTE_URL=https://github.com/$TRAVIS_REPO_SLUG/releases/download/$TRAVIS_TAG
+
 script:
-  #- set -e
-  - echo -e "travis_fold:start:sketch_test_env_prepare"
-  - pip install pyserial
-  - wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
-  - tar xf arduino.tar.xz
-  - mv arduino-nightly $HOME/arduino_ide
-  - mkdir -p $HOME/Arduino/libraries
-  - cd $HOME/arduino_ide/hardware
-  - mkdir espressif
-  - cd espressif
-  - ln -s $TRAVIS_BUILD_DIR esp32
-  - cd esp32
-  - git submodule update --init --recursive
-  - cd tools
-  - python get.py
-  - export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-esp32-elf/bin:$PATH"
-  - which arduino
-  - cd $TRAVIS_BUILD_DIR
-  - source tools/common.sh
-  - echo -e "travis_fold:end:sketch_test_env_prepare"
-  - echo -e "travis_fold:start:sketch_test"
-  - build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries"
-  - echo -e "travis_fold:end:sketch_test"
-  - echo -e "travis_fold:start:size_report"
-  - cat size.log
-  - echo -e "travis_fold:end:size_report"
+  - bash $TRAVIS_BUILD_DIR/tools/build.sh
+
+deploy:
+  provider: script
+  skip_cleanup: true
+  script: bash $TRAVIS_BUILD_DIR/tools/deploy.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
+
+  on:
+    tags: true
 
-  # test library examples with PlatformIO
-  - echo -e "travis_fold:start:platformio_test_env_prepare"
-  - pip install -U https://github.com/platformio/platformio/archive/develop.zip
-  - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage
-  - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json
-  - ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32
-  - echo -e "travis_fold:end:platformio_test_env_prepare"
-  - echo -e "travis_fold:start:platformio_test"
-  - "python -c \"import glob,os,subprocess,sys; map(lambda p: (sys.stdout.write('Library example: %s\\n' % p), subprocess.call(['pio', 'ci', p, '--board', 'esp32dev'])), set([os.path.dirname(p) for p in glob.glob('libraries/*/examples/*/*.ino') + glob.glob('libraries/*/examples/*/*/*.ino')]))\""
-  - echo -e "travis_fold:end:platformio_test"
 
 notifications:
   email:
     on_success: change
     on_failure: change
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/cb057279c430d91a47a8
+        - https://webhooks.gitter.im/e/cb057279c430d91a47a8
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+    on_start: never     # options: [always|never|change] default: always

CMakeLists.txt

@@ -0,0 +1,200 @@
+set(CORE_SRCS
+  cores/esp32/base64.cpp
+  cores/esp32/cbuf.cpp
+  cores/esp32/esp32-hal-adc.c
+  cores/esp32/esp32-hal-bt.c
+  cores/esp32/esp32-hal-dac.c
+  cores/esp32/esp32-hal-gpio.c
+  cores/esp32/esp32-hal-i2c.c
+  cores/esp32/esp32-hal-ledc.c
+  cores/esp32/esp32-hal-matrix.c
+  cores/esp32/esp32-hal-misc.c
+  cores/esp32/esp32-hal-psram.c
+  cores/esp32/esp32-hal-sigmadelta.c
+  cores/esp32/esp32-hal-spi.c
+  cores/esp32/esp32-hal-time.c
+  cores/esp32/esp32-hal-timer.c
+  cores/esp32/esp32-hal-touch.c
+  cores/esp32/esp32-hal-uart.c
+  cores/esp32/Esp.cpp
+  cores/esp32/HardwareSerial.cpp
+  cores/esp32/IPAddress.cpp
+  cores/esp32/IPv6Address.cpp
+  cores/esp32/libb64/cdecode.c
+  cores/esp32/libb64/cencode.c
+  cores/esp32/MD5Builder.cpp
+  cores/esp32/Print.cpp
+  cores/esp32/stdlib_noniso.c
+  cores/esp32/Stream.cpp
+  cores/esp32/StreamString.cpp
+  cores/esp32/wiring_pulse.c
+  cores/esp32/wiring_shift.c
+  cores/esp32/WMath.cpp
+  cores/esp32/WString.cpp
+  )
+
+set(LIBRARY_SRCS
+  libraries/ArduinoOTA/src/ArduinoOTA.cpp
+  libraries/AsyncUDP/src/AsyncUDP.cpp
+  libraries/BluetoothSerial/src/BluetoothSerial.cpp
+  libraries/DNSServer/src/DNSServer.cpp
+  libraries/EEPROM/EEPROM.cpp
+  libraries/ESPmDNS/src/ESPmDNS.cpp
+  libraries/FS/src/FS.cpp
+  libraries/FS/src/vfs_api.cpp
+  libraries/HTTPClient/src/HTTPClient.cpp
+  libraries/NetBIOS/src/NetBIOS.cpp
+  libraries/Preferences/src/Preferences.cpp
+  libraries/SD_MMC/src/SD_MMC.cpp
+  libraries/SD/src/SD.cpp
+  libraries/SD/src/sd_diskio.cpp
+  libraries/SD/src/sd_diskio_crc.c
+  libraries/SimpleBLE/src/SimpleBLE.cpp
+  libraries/SPIFFS/src/SPIFFS.cpp
+  libraries/SPI/src/SPI.cpp
+  libraries/Ticker/src/Ticker.cpp
+  libraries/Update/src/Updater.cpp
+  libraries/WebServer/src/WebServer.cpp
+  libraries/WebServer/src/Parsing.cpp
+  libraries/WebServer/src/detail/mimetable.cpp
+  libraries/WiFiClientSecure/src/ssl_client.cpp
+  libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
+  libraries/WiFi/src/ETH.cpp
+  libraries/WiFi/src/WiFiAP.cpp
+  libraries/WiFi/src/WiFiClient.cpp
+  libraries/WiFi/src/WiFi.cpp
+  libraries/WiFi/src/WiFiGeneric.cpp
+  libraries/WiFi/src/WiFiMulti.cpp
+  libraries/WiFi/src/WiFiScan.cpp
+  libraries/WiFi/src/WiFiServer.cpp
+  libraries/WiFi/src/WiFiSTA.cpp
+  libraries/WiFi/src/WiFiUdp.cpp
+  libraries/Wire/src/Wire.cpp
+  )
+
+set(AZURE_SRCS
+  libraries/AzureIoT/src/az_iot/azureiotcerts.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/agenttime.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/dns_async.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/freertos/lock.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/freertos/threadapi.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/freertos/tickcounter.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/lwip/sntp_lwip.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/socket_async.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/src/platform_openssl_compact.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/src/tlsio_openssl_compact.c
+  libraries/AzureIoT/src/az_iot/c-utility/pal/tlsio_options.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/base64.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/buffer.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/connection_string_parser.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/consolelogger.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/constbuffer.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/constmap.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/crt_abstractions.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/doublylinkedlist.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/gballoc.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/gb_stdio.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/gb_time.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/hmac.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/hmacsha256.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/httpapiex.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/httpapiexsas.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/httpheaders.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/http_proxy_io.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/map.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/optionhandler.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/sastoken.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/sha1.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/sha224.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/sha384-512.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/singlylinkedlist.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/strings.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/string_tokenizer.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/urlencode.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/usha.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/vector.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/xio.c
+  libraries/AzureIoT/src/az_iot/c-utility/src/xlogging.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/blob.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client_authorization.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client_ll.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client_retry_control.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_message.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransport.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransportmqtt.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransport_mqtt_common.c
+  libraries/AzureIoT/src/az_iot/iothub_client/src/version.c
+  libraries/AzureIoT/src/az_iot/umqtt/src/mqtt_client.c
+  libraries/AzureIoT/src/az_iot/umqtt/src/mqtt_codec.c
+  libraries/AzureIoT/src/az_iot/umqtt/src/mqtt_message.c
+  libraries/AzureIoT/src/AzureIotHub.cpp
+  libraries/AzureIoT/src/Esp32MQTTClient.cpp
+  )
+
+set(BLE_SRCS
+  libraries/BLE/src/BLE2902.cpp
+  libraries/BLE/src/BLE2904.cpp
+  libraries/BLE/src/BLEAddress.cpp
+  libraries/BLE/src/BLEAdvertisedDevice.cpp
+  libraries/BLE/src/BLEAdvertising.cpp
+  libraries/BLE/src/BLEBeacon.cpp
+  libraries/BLE/src/BLECharacteristic.cpp
+  libraries/BLE/src/BLECharacteristicMap.cpp
+  libraries/BLE/src/BLEClient.cpp
+  libraries/BLE/src/BLEDescriptor.cpp
+  libraries/BLE/src/BLEDescriptorMap.cpp
+  libraries/BLE/src/BLEDevice.cpp
+  libraries/BLE/src/BLEExceptions.cpp
+  libraries/BLE/src/BLEHIDDevice.cpp
+  libraries/BLE/src/BLERemoteCharacteristic.cpp
+  libraries/BLE/src/BLERemoteDescriptor.cpp
+  libraries/BLE/src/BLERemoteService.cpp
+  libraries/BLE/src/BLEScan.cpp
+  libraries/BLE/src/BLESecurity.cpp
+  libraries/BLE/src/BLEServer.cpp
+  libraries/BLE/src/BLEService.cpp
+  libraries/BLE/src/BLEServiceMap.cpp
+  libraries/BLE/src/BLEUtils.cpp
+  libraries/BLE/src/BLEUUID.cpp
+  libraries/BLE/src/BLEValue.cpp
+  libraries/BLE/src/FreeRTOS.cpp
+  libraries/BLE/src/GeneralUtils.cpp
+  )
+
+set(COMPONENT_SRCS ${CORE_SRCS} ${LIBRARY_SRCS} ${AZURE_SRCS} ${BLE_SRCS})
+
+set(COMPONENT_ADD_INCLUDEDIRS
+  variants/esp32/
+  cores/esp32/
+  libraries/ArduinoOTA/src
+  libraries/AsyncUDP/src
+  libraries/AzureIoT/src
+  libraries/BLE/src
+  libraries/BluetoothSerial/src
+  libraries/DNSServer/src
+  libraries/ESP32/src
+  libraries/ESPmDNS/src
+  libraries/FS/src
+  libraries/HTTPClient/src
+  libraries/NetBIOS/src
+  libraries/Preferences/src
+  libraries/SD_MMC/src
+  libraries/SD/src
+  libraries/SimpleBLE/src
+  libraries/SPIFFS/src
+  libraries/SPI/src
+  libraries/Ticker/src
+  libraries/Update/src
+  libraries/WebServer/src
+  libraries/WiFiClientSecure/src
+  libraries/WiFi/src
+  libraries/Wire/src
+  )
+
+set(COMPONENT_PRIV_INCLUDEDIRS cores/esp32/libb64)
+
+set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet)
+set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl)
+
+register_component()