Merge pull request #35 from tobozo/lgfx

Update for ESP32-Chimera-Core LovyanGFX Edition

Author: tobozo

.travis.yml

@@ -18,17 +18,17 @@ before_install:
 
   # Formatting checks:
   # Check for files starting with a blank line
-  - find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -print0 | xargs -0 -L1 bash -c 'head -1 "$0" | grep --binary-files=without-match --regexp="^$"; if [[ "$?" == "0" ]]; then echo "Blank line found at start of $0."; false; fi'
+  #- find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -print0 | xargs -0 -L1 bash -c 'head -1 "$0" | grep --binary-files=without-match --regexp="^$"; if [[ "$?" == "0" ]]; then echo "Blank line found at start of $0."; false; fi'
   # don't check for tabs
-  - find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f \( ! -iname ".gitmodules" \) -exec grep --with-filename --line-number --binary-files=without-match --regexp=$'\t' '{}' \; -exec echo 'Tab found.' \; -exec false '{}' +
+  #- find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f \( ! -iname ".gitmodules" \) -exec grep --with-filename --line-number --binary-files=without-match --regexp=$'\t' '{}' \; -exec echo 'Tab found.' \; -exec false '{}' +
   # Check for trailing whitespace
-  - find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -exec grep --with-filename --line-number --binary-files=without-match --regexp='[[:blank:]]$' '{}' \; -exec echo 'Trailing whitespace found.' \; -exec false '{}' +
+  #- find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -exec grep --with-filename --line-number --binary-files=without-match --regexp='[[:blank:]]$' '{}' \; -exec echo 'Trailing whitespace found.' \; -exec false '{}' +
   # Check for non-Unix line endings
-  - find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -exec grep --files-with-matches --binary-files=without-match --regexp=$'\r$' '{}' \; -exec echo 'Non-Unix EOL detected.' \; -exec false '{}' +
+  #- find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -exec grep --files-with-matches --binary-files=without-match --regexp=$'\r$' '{}' \; -exec echo 'Non-Unix EOL detected.' \; -exec false '{}' +
   # Check for blank lines at end of files
-  - find .  -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -print0 | xargs -0 -L1 bash -c 'tail -1 "$0" | grep --binary-files=without-match --regexp="^$"; if [[ "$?" == "0" ]]; then echo "Blank line found at end of $0."; false; fi'
+  #- find .  -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -print0 | xargs -0 -L1 bash -c 'tail -1 "$0" | grep --binary-files=without-match --regexp="^$"; if [[ "$?" == "0" ]]; then echo "Blank line found at end of $0."; false; fi'
   # Check for files that don't end in a newline (https://stackoverflow.com/a/25686825)
-  - find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -print0 | xargs -0 -L1 bash -c 'if test "$(grep --files-with-matches --binary-files=without-match --max-count=1 --regexp='.*' "$0")" && test "$(tail --bytes=1 "$0")"; then echo "No new line at end of $0."; false; fi'
+  #- find . -type d \( -path './.git' -o -path './examples' -o -path './src/Fonts' \) -prune -or -type f -print0 | xargs -0 -L1 bash -c 'if test "$(grep --files-with-matches --binary-files=without-match --max-count=1 --regexp='.*' "$0")" && test "$(tail --bytes=1 "$0")"; then echo "No new line at end of $0."; false; fi'
 
   - git clone https://github.com/per1234/arduino-ci-script.git "${HOME}/scripts/arduino-ci-script"
   - cd "${HOME}/scripts/arduino-ci-script"
@@ -52,11 +52,14 @@ before_install:
 
   # Install the library from the repository
   #- install_library ESP32-Chimera-Core
-  - install_library https://github.com/tobozo/ESP32-Chimera-Core/archive/master.zip
+  - install_library https://github.com/tobozo/ESP32-Chimera-Core/archive/lgfx_test.zip
   - install_library https://github.com/PaulStoffregen/Time/archive/master.zip
-  - install_library M5Stack-SD-Updater
+  #- install_library M5Stack-SD-Updater
+  - install_library "M5Stack-SD-Updater"
   - install_library Sqlite3Esp32
-  - install_library https://github.com/tobozo/ESP32-BLECollector/releases/download/1.3/BLE.zip
+  - install_library https://github.com/mikalhart/TinyGPSPlus/archive/master.zip
+  #- install_library https://github.com/tobozo/ESP32-BLECollector/releases/download/1.3/BLE.zip
+  - install_library https://github.com/tobozo/NimBLE-Arduino/archive/master.zip
   - install_package "esp32:esp32" "https://dl.espressif.com/dl/package_esp32_index.json" #  # esp32:esp32:m5stack-core-esp32
   - pip install pyserial
 
@@ -112,7 +115,7 @@ deploy:
       - "/tmp/BLECollector-binaries/M5stack-BLECollector.bin"
       - "/tmp/BLECollector-binaries/OdroidGo-BLECollector.bin"
       - "/tmp/BLECollector-binaries/M5Fire-BLECollector.bin"
-    #skip_cleanup: true
+    skip_cleanup: true
     # draft: true
     on:
-      branch: master
+      branch: unstable