Skip to content

Commit

Permalink
merge develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
raburton committed Dec 18, 2015
2 parents d386cc1 + abb4cf3 commit 4c54b76
Show file tree
Hide file tree
Showing 282 changed files with 6,303 additions and 10,376 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
out
language.settings.xml
language.settings.xml
.settings
nbproject
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
sudo: false
language: cpp
install:
- mkdir -p $TRAVIS_BUILD_DIR/opt/esp-open-sdk
- wget https://bintray.com/artifact/download/kireevco/generic/esp-open-sdk-1.2-linux-x86_64.tar.gz
- tar -zxf esp-open-sdk-1.2-linux-x86_64.tar.gz -C $TRAVIS_BUILD_DIR/opt/esp-open-sdk
- export PATH=$PATH:$TRAVIS_BUILD_DIR/opt/esp-open-sdk/sdk:$TRAVIS_BUILD_DIR/opt/esp-open-sdk/xtensa-lx106-elf/bin
- mkdir -p $TRAVIS_BUILD_DIR/opt/esp-alt-sdk
- wget https://bintray.com/artifact/download/kireevco/generic/esp-alt-sdk-1.5.0-linux-x86_64.tar.gz
- tar -zxf esp-alt-sdk-1.5.0-linux-x86_64.tar.gz -C $TRAVIS_BUILD_DIR/opt/esp-alt-sdk
- export SMING_HOME=$TRAVIS_BUILD_DIR/Sming
- export ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-open-sdk
- export ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk
- export ESPTOOl2=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk/esptool2/esptool2
script:
- cd Sming
- cd $SMING_HOME
- make
67 changes: 0 additions & 67 deletions Basic_AirUpdate/.settings/org.eclipse.cdt.codan.core.prefs

This file was deleted.

Loading

0 comments on commit 4c54b76

Please sign in to comment.