diff --git a/.travis.yml b/.travis.yml index 28f538573..4f0de059e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ os: linux language: python python: - - '2.7' + - "2.7" cache: directories: @@ -9,7 +9,7 @@ cache: env: global: -# - BUILDER_TOTAL_THREADS=4 + # - BUILDER_TOTAL_THREADS=4 - BUILDER_TOTAL_THREADS=1 - OWNER=${TRAVIS_REPO_SLUG%/*} - DEV=${OWNER/proddy/dev} @@ -33,15 +33,15 @@ script: stages: - name: Release -# if: type IN (cron, api) +# 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 + - 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 @@ -55,11 +55,13 @@ deploy: provider: releases edge: branch: master - token: ${GITHUB_TOKEN} + token: ${GITHUB_TOKEN} file_glob: true + # file: "firmware/*.bin" file: "*.bin" name: latest development build - release_notes: Automatic firmware builds of the latest EMS-ESP $TRAVIS_BRANCH branch + release_notes: + Automatic firmware builds of the current EMS-ESP $TRAVIS_BRANCH branch (commit $TRAVIS_COMMIT). Built by Travis CI on $(date +'%F %T %Z'). cleanup: false prerelease: true @@ -74,9 +76,9 @@ notifications: 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 +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-esp.cpp b/src/ems-esp.cpp index 2c2631389..fe45dc3da 100644 --- a/src/ems-esp.cpp +++ b/src/ems-esp.cpp @@ -116,7 +116,7 @@ static const command_t project_cmds[] PROGMEM = { {true, "publish_time ", "set frequency for publishing data to MQTT (0=off)"}, {true, "publish_always ", "set to on to skip payload comparison since last publish"}, - {true, "tx_mode ", "changes Tx logic. 1=ems generic, 2=ems+, 3=Junkers HT3"}, + {true, "tx_mode ", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"}, {false, "info", "show current captured on the devices"}, {false, "log ", "set logging mode to none, basic, thermostat only, solar module only, raw, jabber or verbose"}, @@ -237,7 +237,7 @@ void showInfo() { myDebug_P(PSTR("\n%sEMS Bus stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF); if (ems_getBusConnected()) { - myDebug_P(PSTR(" Bus is connected, protocol: %s"), ((EMS_Sys_Status.emsIDMask == 0x80) ? "Junkers HT3" : "Buderus")); + myDebug_P(PSTR(" Bus is connected, protocol: %s"), ((EMS_Sys_Status.emsIDMask == 0x80) ? "HT3" : "Buderus")); myDebug_P(PSTR(" Rx: # successful read requests=%d, # CRC errors=%d"), EMS_Sys_Status.emsRxPgks, EMS_Sys_Status.emxCrcErr); if (ems_getTxCapable()) {