Merge pull request #173 from EnviroDIY/develop

Develop

.gitignore

@@ -55,10 +55,18 @@ Temporary Items
 .clang_complete
 .gcc-flags.json
 lib/readme.txt
+include/readme.txt
 /platformio.ini
 
+# VSCode
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode
+
 # Other
 logger_test/
 YosemitechDO/
 LongTermLogger/
 barometric_correction/
+3G_Test/

.travis.yml

@@ -1,57 +1,75 @@
-language: python
-python:
-    - "2.7"
+before_install:
+    - git config --global user.email "sdamiano@stroudcenter.org"
+    - git config --global user.name "SRGDamia1"
+
 sudo: false
 git:
   depth: 1
 cache:
     directories:
         - "~/.platformio"
-
-env:
-    # AVR examples
-    - PLATFORMIO_CI_SRC=examples/single_sensor/
-    - PLATFORMIO_CI_SRC=examples/multisensor_print/
-    - PLATFORMIO_CI_SRC=examples/simple_logging/
-    - PLATFORMIO_CI_SRC=examples/logging_to_EnviroDIY/
-    # - PLATFORMIO_CI_SRC=examples/DRWI_CitSci/
-    # - PLATFORMIO_CI_SRC=examples/DRWI_NoCellular/
-    - PLATFORMIO_CI_SRC=examples/double_logger/
-    - PLATFORMIO_CI_SRC=examples/baro_rho_correction/
-    - PLATFORMIO_CI_SRC=examples/data_saving/
-
-    # SAMD examples
-    - PLATFORMIO_CI_SRC=examples/logging_to_EnviroDIY_Zero/ PLATFORMIO_CI_ZERO=1
-
-before_install:
-- git config --global user.email "sdamiano@stroudcenter.org"
-- git config --global user.name "SRGDamia1"
-
+language: python
+python:
+    - "2.7"
 install:
+    # Remove the cloned repo to emulate a user library installation
     - git rm library.json
+    - git rm library.properties
+    - git rm -r pioScripts
+    - git rm -r src
+    # Install PlatformIO (this should be cached!)
     - pip install -U platformio
     - pio upgrade
-    - pio lib -g install 2079  # DS3231
-    - pio lib -g install 311  # EnableInterrupt
-    - pio lib -g install 322  # SdFat
-    - pio lib -g install 344  # soligen2010 fork of Adafruit ADS1X15
-    - pio lib -g install 31  # Adafruit Unified Sensor
-    - pio lib -g install 19  # Adafruit DHT sensor library
-    - pio lib -g install 773  # Adafruit AM2315
-    - pio lib -g install 166  # Adafruit BME280 Library
-    - pio lib -g install 406  # Adafruit MPL115A2
-    - pio lib -g install 1  # OneWire
-    - pio lib -g install 54  # Dallas Temperature
-    - pio lib -g install https://github.com/EnviroDIY/Arduino-SDI-12.git#ExtInts
-    - pio lib -g install https://github.com/EnviroDIY/TinyGSM.git
-    - pio lib -g install 1824  # SensorModbusMaster
-    - pio lib -g install 2078  # YosemitechModbus
-    - pio lib -g install 5431 # MS5803
-    - pio lib -g install https://github.com/EnviroDIY/KellerModbus.git
-    - pio lib -g install 873  # RTCZero
+    # Uninstall any old version of the current library from the Travis cache
+    # - pio lib -g uninstall EnviroDIY_ModularSensors
+    # Get the current branch
+    - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
+    - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
+    # Install this library from the branch we're working on
+    - pio lib -g install https://github.com/EnviroDIY/ModularSensors.git#$BRANCH
+    # Install serial libraries needed for most examples
     - pio lib -g install https://github.com/PaulStoffregen/AltSoftSerial.git  # #73, but need the git until Paul S. has a new release
     - pio lib -g install https://github.com/EnviroDIY/SoftwaterSerial_ExternalInts.git
-    # - pio lib -g install https://github.com/todbot/SoftI2CMaster.git
     - pio update
+script:
+    - platformio ci -v --project-option="lib_ignore = RTCZero" --project-option="lib_ldf_mode = deep+" --board=mayfly
+
+matrix:
+    include:
+      - language: node_js
+        install: npm install -g jsonlint
+        script: jsonlint -q library.json
+
+      - env:
+          - PLATFORMIO_CI_SRC=examples/single_sensor/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/multisensor_print/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/simple_logging/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/logging_to_EnviroDIY/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/DRWI_CitSci/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/DRWI_NoCellular/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/double_logger/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/baro_rho_correction/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+      - env:
+          - PLATFORMIO_CI_SRC=examples/data_saving/
+          - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
 
-script: make travis-build
+      - env:
+        - PLATFORMIO_CI_SRC=examples/logging_to_EnviroDIY_Zero/
+        - PLATFORMIO_BUILD_FLAGS="-D SDI12_EXTERNAL_PCINT"
+        script:
+            - platformio ci -v --project-option="lib_ignore = SoftwareSerial_ExtInts, AltSoftSerial, SoftI2CMaster"  --project-option="lib_ldf_mode = deep+" --board=adafruit_feather_m0