Merge pull request #1700 from particle-iot/feature/merge

Gen 2/3 merge

.buildpackrc

@@ -9,15 +9,15 @@
 export BUILDPACK_VARIATION=gcc-arm-none-eabi-5_3-2016q1
 
 # Platforms for which this firmware is considered stable
-export RELEASE_PLATFORMS=( core photon p1 electron )
+export RELEASE_PLATFORMS=( )
 
 # Platforms for which this firmware is considered experimental
-export PRERELEASE_PLATFORMS=( )
+export PRERELEASE_PLATFORMS=( argon boron xenon )
 # Note: a single platform should be only in release or prerelease list. If
 # added to both it will be considered a prerelease
 
 # Platforms which require modules to be prebuilt
-export MODULAR_PLATFORMS=( photon p1 electron )
+export MODULAR_PLATFORMS=( photon p1 electron argon boron xenon )
 
 # Example GCC ARM version override for FOO platform
 # Replace FOO with (CORE, PHOTON, P1, ELECTRON)

.gitignore

@@ -53,3 +53,14 @@ nbproject/
 build/target/
 build/cores/
 hal/soft-ap/.idea/
+cmake-build-debug
+.vscode
+module_user_memory.ld
+
+# Doxygen documentation
+docs/doxygen/html/
+
+# CMake
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake

.gitmodules

@@ -1,3 +1,46 @@
 [submodule "proto"]
 	path = proto
 	url = https://github.com/particle-iot/firmware-protobuf.git
+[submodule "third_party/nrf5_sdk/nrf5_sdk"]
+	path = third_party/nrf5_sdk/nrf5_sdk
+	url = https://github.com/particle-iot/nrf5_sdk.git
+[submodule "third_party/lwip/lwip"]
+	path = third_party/lwip/lwip
+	url = https://github.com/particle-iot/lwip.git
+	branch = particle
+[submodule "third_party/lwip/lwip-contrib"]
+	path = third_party/lwip/lwip-contrib
+	url = https://github.com/particle-iot/lwip-contrib.git
+	branch = master
+[submodule "third_party/freertos/freertos"]
+	path = third_party/freertos/freertos
+	url = https://github.com/particle-iot/freertos.git
+	branch = particle
+[submodule "third_party/mbedtls/mbedtls"]
+	path = third_party/mbedtls/mbedtls
+	url = https://github.com/particle-iot/mbedtls.git
+	branch = particle-mbedtls-2.4.2
+[submodule "third_party/nanopb/nanopb"]
+	path = third_party/nanopb/nanopb
+	url = https://github.com/particle-iot/nanopb.git
+	branch = particle-nanopb-0.3.9
+[submodule "third_party/openthread/openthread"]
+	path = third_party/openthread/openthread
+	url = https://github.com/particle-iot/openthread.git
+[submodule "third_party/littlefs/littlefs"]
+	path = third_party/littlefs/littlefs
+	url = https://github.com/particle-iot/littlefs.git
+[submodule "third_party/wiznet_driver/wiznet_driver"]
+	path = third_party/wiznet_driver/wiznet_driver
+	url = https://github.com/particle-iot/ioLibrary_Driver.git
+	branch = particle
+[submodule "third_party/miniz/miniz"]
+	path = third_party/miniz/miniz
+	url = https://github.com/particle-iot/miniz.git
+	branch = particle
+[submodule "gsm0710muxer/gsm0710muxer"]
+	path = gsm0710muxer/gsm0710muxer
+	url = https://github.com/particle-iot/gsm0710muxer.git
+[submodule "third_party/catch2/catch2"]
+	path = third_party/catch2/catch2
+	url = https://github.com/particle-iot/Catch2.git

.travis.yml

@@ -33,11 +33,24 @@ script:
 #after_success: ./ci/update-gh-pages.sh
 
 env:
+  # FIXME: Other platforms are currently probably broken
   matrix:
-    - BUILD_PLATFORM=unit-test gcc
-    - BUILD_PLATFORM=photon p1
-    - BUILD_PLATFORM=core newhal
+    - BUILD_PLATFORM=xenon
+    - BUILD_PLATFORM=argon
+    - BUILD_PLATFORM=boron
+    - BUILD_PLATFORM=photon
+    - BUILD_PLATFORM=P1
     - BUILD_PLATFORM=electron
+    - BUILD_PLATFORM=gcc
+    - BUILD_PLATFORM=newhal
+    - BUILD_PLATFORM=unit-test
+    - BUILD_PLATFORM=core
+
+  # matrix:
+  #   - BUILD_PLATFORM=unit-test gcc
+  #   - BUILD_PLATFORM=photon p1
+  #   - BUILD_PLATFORM=core newhal
+  #   - BUILD_PLATFORM=electron xenon
 
   # matrix:
   # - UNIT_TEST=y
@@ -115,5 +128,4 @@ env:
   - secure: A83drTFobkGvgrPNwGwNS3ZSHX35iNELjH6W9h07pw/n1YSssBHxtLF8aVAEwfIF1VyUoHvQ4HYLNd+9RMyo162xxiWne+/4/gSFyUJNi11w3YX5bwodKPl7OwEO/YnJgHYk8YAAfdnZT4470Fpt6ytcOhEhMsB/IFeepMUiZZA=
 
 notifications:
-  slack:
-    secure: VJ+tAeUzLkz4aMAshQ9ohXZb/1+DQ31kDpcZYDS5PZuXOujx57rzOBg4SKxB2awcmNS2JWlSMQRQtNUzfS15YNuLqgWVj57EQAy99QKsEvccOMELIwbpLtEyEInK5WrUk6vk9ymhk6MBT5+3JiQ4bAs5yvIxm+k8YCakV9QlnH4=
+    slack: s:uyDgDeY2Sric20NcE50P11QS