andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

text changes and formatting

Browse Source
This commit is contained in:
Paul
2019-10-29 18:02:51 +01:00
parent 6fd0497ecc
commit 15954d0e82
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.travis.yml
View File

@@ -1,7 +1,7 @@
os: linux os: linux
language: python language: python
python: python:
- '2.7' - "2.7"
cache: cache:
directories: directories:
@@ -9,7 +9,7 @@ cache:
env: env:
global: global:
# - BUILDER_TOTAL_THREADS=4 # - BUILDER_TOTAL_THREADS=4
- BUILDER_TOTAL_THREADS=1 - BUILDER_TOTAL_THREADS=1
- OWNER=${TRAVIS_REPO_SLUG%/*} - OWNER=${TRAVIS_REPO_SLUG%/*}
- DEV=${OWNER/proddy/dev} - DEV=${OWNER/proddy/dev}
@@ -33,15 +33,15 @@ script:
stages: stages:
- name: Release - name: Release
# if: type IN (cron, api) # if: type IN (cron, api)
jobs: jobs:
include: include:
- stage: Release - stage: Release
# env: BUILDER_THREAD=0 # env: BUILDER_THREAD=0
# - env: BUILDER_THREAD=1 # - env: BUILDER_THREAD=1
# - env: BUILDER_THREAD=2 # - env: BUILDER_THREAD=2
# - env: BUILDER_THREAD=3 # - env: BUILDER_THREAD=3
before_deploy: before_deploy:
- git tag -f travis-${TAG}-build - git tag -f travis-${TAG}-build
@@ -55,11 +55,13 @@ deploy:
provider: releases provider: releases
edge: edge:
branch: master branch: master
token: ${GITHUB_TOKEN} token: ${GITHUB_TOKEN}
file_glob: true file_glob: true
# file: "firmware/*.bin"
file: "*.bin" file: "*.bin"
name: latest development build 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'). (commit $TRAVIS_COMMIT). Built by Travis CI on $(date +'%F %T %Z').
cleanup: false cleanup: false
prerelease: true prerelease: true
@@ -74,9 +76,9 @@ notifications:
on_success: change on_success: change
on_failure: change on_failure: change
#webhooks: webhooks:
# urls: urls:
# - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4 - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4
# on_success: change # options: [always|never|change] default: always on_success: change # options: [always|never|change] default: always
# on_failure: always # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always
# on_start: false # default: false on_start: false # default: false

4
src/ems-esp.cpp
View File

@@ -116,7 +116,7 @@ static const command_t project_cmds[] PROGMEM = {
{true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"}, {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
{true, "publish_always <on | off>", "set to on to skip payload comparison since last publish"}, {true, "publish_always <on | off>", "set to on to skip payload comparison since last publish"},
{true, "tx_mode <n>", "changes Tx logic. 1=ems generic, 2=ems+, 3=Junkers HT3"}, {true, "tx_mode <n>", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"},
{false, "info", "show current captured on the devices"}, {false, "info", "show current captured on the devices"},
{false, "log <n | b | t | s | r | j | v>", "set logging mode to none, basic, thermostat only, solar module only, raw, jabber or verbose"}, {false, "log <n | b | t | s | r | j | v>", "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); myDebug_P(PSTR("\n%sEMS Bus stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
if (ems_getBusConnected()) { 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); myDebug_P(PSTR(" Rx: # successful read requests=%d, # CRC errors=%d"), EMS_Sys_Status.emsRxPgks, EMS_Sys_Status.emxCrcErr);
if (ems_getTxCapable()) { if (ems_getTxCapable()) {