From cc120cab1dc72dc96ee105b43a83bb77d8553330 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 29 Oct 2019 10:57:43 +0100 Subject: [PATCH] automated builds --- .travis.yml | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ems.cpp | 8 ++++-- 2 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..7b3f44657 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,82 @@ +os: linux +language: python +python: + - '2.7' + +cache: + directories: + - ${HOME}/.pio + +env: + global: +# - BUILDER_TOTAL_THREADS=4 + - BUILDER_TOTAL_THREADS=1 + - OWNER=${TRAVIS_REPO_SLUG%/*} + - DEV=${OWNER/proddy/dev} + - BRANCH=${TRAVIS_BRANCH/dev/} + - TAG=${DEV}${BRANCH:+_}${BRANCH} + +install: + - env | grep TRAVIS + - set -e + - pip install -U platformio + - pio platform update -p + - set +e + +branches: + except: + - /^travis-.*-build$/ + +script: + - ./scripts/build.sh +# - ./scripts/build.sh -p + +stages: + - name: Release +# if: type IN (cron, api) + +jobs: + include: + - stage: Release +# env: BUILDER_THREAD=0 +# - env: BUILDER_THREAD=1 +# - env: BUILDER_THREAD=2 +# - env: BUILDER_THREAD=3 + +before_deploy: + - git tag -f travis-${TAG}-build + - git remote add gh + https://${OWNER}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git + - git push gh :travis-${TAG}-build || true + - git push -f gh travis-${TAG}-build + - git remote remove gh + +deploy: + provider: releases + edge: + branch: master + token: ${GITHUB_TOKEN} + file_glob: true + file: "*.bin" + name: EMS-ESP development build (${TRAVIS_BRANCH}) + release_notes: Automatic EMS-ESP development build of $TRAVIS_BRANCH branch + (commit $TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z'). + cleanup: false + prerelease: true + overwrite: true + target_commitish: $TRAVIS_COMMIT + on: + tags: false + branch: dev + +notifications: + email: + on_success: change + on_failure: change + + #webhooks: + # urls: + # - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4 + # on_success: change # options: [always|never|change] default: always + # on_failure: always # options: [always|never|change] default: always + # on_start: false # default: false diff --git a/src/ems.cpp b/src/ems.cpp index 93c7d1e7d..3af8a630d 100644 --- a/src/ems.cpp +++ b/src/ems.cpp @@ -1520,9 +1520,11 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) { case EMS_OFFSET_RCPLUSStatusMessage_currsetpoint: // current setpoint temp, e.g. Thermostat -> all, telegram: 10 00 FF 06 01 A5 22 EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(0); // value is * 2 break; - case EMS_OFFSET_RCPLUSStatusMessage_mode: // thermostat mode auto/manual - // manual : 10 00 FF 0A 01 A5 02 - // auto : Thermostat -> all, type 0x01A5 telegram: 10 00 FF 0A 01 A5 03 + case EMS_OFFSET_RCPLUSStatusMessage_mode: // thermostat mode auto/manual + // manual : 10 00 FF 0A 01 A5 02 + // auto : Thermostat -> all, type 0x01A5 telegram: 10 00 FF 0A 01 A5 03 + + // TODO this may be bit 2 instead of 1 on an RC300 - still to validate EMS_Thermostat.hc[hc].mode = _bitRead(0, 0); // bit 1, mode (auto=1 or manual=0) EMS_Thermostat.hc[hc].day_mode = _bitRead(0, 1); // get day mode flag