From 715aeeec0e1bcbbb8bac16c6250e3857185adad0 Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Tue, 4 Jun 2019 00:09:40 +0200 Subject: [PATCH] build more sketches --- .travis.yml | 10 +++++++--- examples/knx-sonoffS20/knx-sonoffS20.ino | 13 ++++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5aefc59..9692d98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,13 @@ before_install: - if [ "$MODE" = "LINUX" ]; then eval "${MATRIX_EVAL}"; fi - if [ "$MODE" = "ARDUINO" ]; then source <(curl -SLs "https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh"); fi - if [ "$MODE" = "ARDUINO" ]; then downloadArduinoLib FlashStorage "https://github.com/thelsing/FlashStorage/archive/master.zip"; fi + - if [ "$MODE" = "ARDUINO" ]; then downloadArduinoLib BSEC "https://github.com/BoschSensortec/BSEC-Arduino-library/archive/master.zip"; fi + # the HDC100X lib is not properly set up in githup so move things around a bit - if [ "$MODE" = "ARDUINO" ]; then wget -O HDC100X.zip "https://github.com/RFgermany/HDC100X_Arduino_Library/archive/master.zip"; fi - - if [ "$MODE" = "ARDUINO" ]; then unzip -d "$HOME/HDC100X" "HDC100X.zip" && f=("$HOME/HDC100X"/*) && mv "$HOME/HDC100X"/*/* "$HOME/HDC100X" && rmdir "${f[@]}" && mv "$HOME/HDC100X" $HOME/arduino_ide/libraries; fi - - if [ "$MODE" = "ARDUINO" ]; then downloadArduinoLib BSEC "https://github.com/BoschSensortec/BSEC-Arduino-library/archive/master.zip"; fi + - if [ "$MODE" = "ARDUINO" ]; then unzip -d "$HOME/HDC100X-Master" "HDC100X.zip" && f=("$HOME/HDC100X-Master"/*) && mv "$HOME/HDC100X-Master"/*/* "$HOME/HDC100X-Master" && rmdir "${f[@]}" && mv "$HOME/HDC100X-Master" $HOME/arduino_ide/libraries; fi + - buildExampleSketch() { arduino --verify --board $BOARD $PWD/examples/$1/$1.ino; } - - if [ "$MODE" = "ARDUINO" ]; then ls -lR $HOME/arduino_ide/libraries; fi install: - if [ "$MODE" = "ARDUINO" ]; then arduino --install-library "WiFiManager"; fi @@ -44,6 +45,9 @@ script: - if [ "$MODE" = "LINUX" ]; then cmake ..; fi - if [ "$MODE" = "LINUX" ]; then make; fi - if [ "$MODE" = "ARDUINO" ]; then buildExampleSketch knx-demo; fi + - if [ "$MODE" = "ARDUINO" ]; then buildExampleSketch knx-sonoffS20; fi + - if [ "$MODE" = "ARDUINO" ]; then buildExampleSketch knx-bme680; fi + - if [ "$MODE" = "ARDUINO" ]; then buildExampleSketch knx-hdc1008; fi notifications: email: diff --git a/examples/knx-sonoffS20/knx-sonoffS20.ino b/examples/knx-sonoffS20/knx-sonoffS20.ino index d1da050..0086b73 100644 --- a/examples/knx-sonoffS20/knx-sonoffS20.ino +++ b/examples/knx-sonoffS20/knx-sonoffS20.ino @@ -1,5 +1,7 @@ #include +#ifdef ARDUINO_ARCH_ESP8266 #include +#endif #define RELAYPIN 12 @@ -12,20 +14,22 @@ // callback from switch-GO void switchCallback(GroupObject& go) { - if (goBlock.objectReadBool()) + if (goBlock.value().boolValue()) return; - bool value = goSwitch.objectReadBool(); + bool value = goSwitch.value(); digitalWrite(RELAYPIN, value); - goStatus.objectWrite(value); + goStatus.value(value); } void setup() { SerialDBG.begin(115200); +#ifdef ARDUINO_ARCH_ESP8266 WiFiManager wifiManager; wifiManager.autoConnect("knx-sonoffS20"); +#endif // read adress table, association table, groupobject table and parameters from eeprom knx.readMemory(); @@ -34,6 +38,9 @@ void setup() { // register callback for reset GO goSwitch.callback(switchCallback); + goSwitch.dataPointType(Dpt(1, 0)); + goBlock.dataPointType(Dpt(1, 0)); + goStatus.dataPointType(Dpt(1, 0)); } // start the framework. Will get wifi first.