Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-12-18 19:08:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Kunze 2020-05-07 20:15:22 +02:00
commit 16de2048e6
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.travis.yml
View File

@ -13,8 +13,6 @@
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
cache: cache:
directories: directories:
- ~/arduino_ide
- ~/.arduino15/packages/
git: git:
depth: false depth: false
quiet: true quiet: true
@ -36,6 +34,7 @@
- language: cpp - language: cpp
os: linux os: linux
env: env:
- ARDUINO_IDE_VERSION="1.8.11"
cache: cache:
directories: directories:
- ~/arduino_ide - ~/arduino_ide
@ -52,13 +51,15 @@
- sed -i 's#compiler.warning_level=all#compiler.warning_level=default#' ~/.arduino15/preferences.txt - sed -i 's#compiler.warning_level=all#compiler.warning_level=default#' ~/.arduino15/preferences.txt
# changes for bsec lib # changes for bsec lib
# samd # 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 - ls -l ~/.arduino15/packages/arduino/hardware/samd
- sed -i 's#compiler.elf2hex.extra_flags=#compiler.elf2hex.extra_flags=\ncompiler.libraries.ldflags=#' ~/.arduino15/packages/arduino/hardware/samd/1.8.4/platform.txt - 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 # 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 - ls -l ~/.arduino15/packages/esp8266/hardware/esp8266
- 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 -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 '/^.*libalgobsec.*$/d' ~/.arduino15/packages/esp8266/hardware/esp8266/2.6.3/tools/sdk/ld/eagle.app.v6.common.ld.h - 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 -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 - 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 # 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 - rm -rf $HOME/arduino_ide/libraries/HDC100X_Arduino_Library-master
@ -79,7 +80,7 @@
# Test build for PlatformIO based projects # Test build for PlatformIO based projects
- language: python - language: python
python: python:
- "2.7" - "3.8"
cache: cache:
directories: directories:
- "~/.platformio" - "~/.platformio"

4
examples/knx-usb/platformio-ci.ini
View File

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