Merge branch 'master' of https://github.com/thelsing/knx

thelsing · May 7, 2020 · 16de204 · 16de204
2 parents c97bcc2 + 31319a6
commit 16de204
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,6 @@
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
       cache:
         directories:
-          - ~/arduino_ide
-          - ~/.arduino15/packages/
       git:
         depth: false
         quiet: true
@@ -36,6 +34,7 @@
     - language: cpp
       os: linux
       env:
+          - ARDUINO_IDE_VERSION="1.8.11"
       cache:
         directories:
           - ~/arduino_ide
@@ -52,13 +51,15 @@
           - sed -i 's#compiler.warning_level=all#compiler.warning_level=default#' ~/.arduino15/preferences.txt
           # changes for bsec lib
           # samd
-          - sed -ri 's#(recipe.c.combine.pattern=[^$]*\{archive_file\}")( -Wl,--end-group)#\1 {compiler.libraries.ldflags}\2#' ~/.arduino15/packages/arduino/hardware/samd/1.8.4/platform.txt
-          - sed -i 's#compiler.elf2hex.extra_flags=#compiler.elf2hex.extra_flags=\ncompiler.libraries.ldflags=#' ~/.arduino15/packages/arduino/hardware/samd/1.8.4/platform.txt
+          - ls -l ~/.arduino15/packages/arduino/hardware/samd
+          - sed -ri 's#(recipe.c.combine.pattern=[^$]*\{archive_file\}")( -Wl,--end-group)#\1 {compiler.libraries.ldflags}\2#' ~/.arduino15/packages/arduino/hardware/samd/1.8.6/platform.txt
+          - sed -i 's#compiler.elf2hex.extra_flags=#compiler.elf2hex.extra_flags=\ncompiler.libraries.ldflags=#' ~/.arduino15/packages/arduino/hardware/samd/1.8.6/platform.txt
           # esp8266
-          - sed -ri 's#(recipe.c.combine.pattern=[^$]*\{compiler.c.elf.libs\})( -Wl,--end-group  "-L\{build.path\}")#\1 {compiler.libraries.ldflags}\2#' ~/.arduino15/packages/esp8266/hardware/esp8266/2.6.3/platform.txt
-          - sed -i 's#compiler.elf2hex.extra_flags=#compiler.elf2hex.extra_flags=\ncompiler.libraries.ldflags=#' ~/.arduino15/packages/esp8266/hardware/esp8266/2.6.3/platform.txt
-          - sed -i '/^.*libalgobsec.*$/d' ~/.arduino15/packages/esp8266/hardware/esp8266/2.6.3/tools/sdk/ld/eagle.app.v6.common.ld.h
-          - sed -ri 's#(\*libwps\.a:\(\.literal\.\* \.text\.\*\))#\1\n    *libalgobsec.a:(.literal.* .text.*)#' ~/.arduino15/packages/esp8266/hardware/esp8266/2.6.3/tools/sdk/ld/eagle.app.v6.common.ld.h
+          - ls -l ~/.arduino15/packages/esp8266/hardware/esp8266
+          - sed -ri 's#(recipe.c.combine.pattern=[^$]*\{compiler.c.elf.libs\})( -Wl,--end-group  "-L\{build.path\}")#\1 {compiler.libraries.ldflags}\2#' ~/.arduino15/packages/esp8266/hardware/esp8266/2.7.0/platform.txt
+          - sed -i 's#compiler.elf2hex.extra_flags=#compiler.elf2hex.extra_flags=\ncompiler.libraries.ldflags=#' ~/.arduino15/packages/esp8266/hardware/esp8266/2.7.0/platform.txt
+          - sed -i '/^.*libalgobsec.*$/d' ~/.arduino15/packages/esp8266/hardware/esp8266/2.7.0/tools/sdk/ld/eagle.app.v6.common.ld.h
+          - sed -ri 's#(\*libwps\.a:\(\.literal\.\* \.text\.\*\))#\1\n    *libalgobsec.a:(.literal.* .text.*)#' ~/.arduino15/packages/esp8266/hardware/esp8266/2.7.0/tools/sdk/ld/eagle.app.v6.common.ld.h
 
           # the HDC100X lib is not properly set up in githup so move things around a bit
           - rm -rf $HOME/arduino_ide/libraries/HDC100X_Arduino_Library-master
@@ -79,7 +80,7 @@
     # Test build for PlatformIO based projects
     - language: python
       python:
-        - "2.7"
+        - "3.8"
       cache:
         directories:
           - "~/.platformio"

diff --git a/examples/knx-usb/platformio-ci.ini b/examples/knx-usb/platformio-ci.ini
@@ -19,10 +19,10 @@ board_build.usb_product="KNX RF - USB Interface"
 
 lib_deps =
   SPI
-  Adafruit TinyUSB Library
+  Adafruit TinyUSB Library@0.7.1
   https://github.com/thelsing/FlashStorage.git
   knx
-
+  
 build_flags =
   -DMEDIUM_TYPE=2
   -DUSE_USB