nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/knx

Browse Source 
# Conflicts:
#	ChangeLog.md
This commit is contained in:
John
2022-05-14 08:19:38 +02:00
parent 5422f4c29a 458c8dfbc7
commit 9b6fcd3330
9 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/bug_report.yml
+1
View File
@@ -36,6 +36,7 @@ body:
options: options:
- current source from git - current source from git
- latest release - latest release
- '22.3'
- '22.2' - '22.2'
- '22.1' - '22.1'
- '21.3' - '21.3'
CMakeLists.txt
+3 -2
View File
@@ -175,5 +175,6 @@ if(EXISTS "${ROOT}/etc/debian_version")
install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/) install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/)
endif() endif()
if(HAVE_MQTT) if(HAVE_MQTT)
install(FILES ${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg DESTINATION /etc/ebusd/) FILE(GLOB MQTT_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg")
endif(HAVE_MQTT) install(FILES ${MQTT_CFG_FILES} DESTINATION /etc/ebusd/)
endif(HAVE_MQTT)
ChangeLog.md
+2 -2
View File
@@ -5,7 +5,7 @@
* fix missing MQTT topic prefix with "--mqttint=..." * fix missing MQTT topic prefix with "--mqttint=..."
* fix weird SSL connect errors * fix weird SSL connect errors
* fix for /decode endpoint * fix for /decode endpoint
* fix long updatecheck result string for Home Assistant MQTT integration * fix for Home Assistant MQTT discovery config to truncate long updatecheck string
## Features ## Features
* add timeout check to arbitration * add timeout check to arbitration
@@ -13,7 +13,7 @@
* add "isreverse" to /datatype endpoint * add "isreverse" to /datatype endpoint
* add high speed serial mode to enhanced protocol * add high speed serial mode to enhanced protocol
* add support for flashing via network to ebuspicloader * add support for flashing via network to ebuspicloader
* add allow using "--mqttvar=" multiple times * add allow using "--mqttvar=..." multiple times to ease overriding integration settings
# 22.2 (2022-02-27) # 22.2 (2022-02-27)
README.md
+1
View File
@@ -11,6 +11,7 @@ ebusd is a daemon for handling communication with eBUS devices connected to a
[![Docker Downloads](https://img.shields.io/docker/pulls/john30/ebusd)](https://hub.docker.com/repository/docker/john30/ebusd) [![Docker Downloads](https://img.shields.io/docker/pulls/john30/ebusd)](https://hub.docker.com/repository/docker/john30/ebusd)
[![Release](https://img.shields.io/github/v/release/john30/ebusd)](https://github.com/john30/ebusd/releases/latest) [![Release](https://img.shields.io/github/v/release/john30/ebusd)](https://github.com/john30/ebusd/releases/latest)
[![GitHub Discussions](https://img.shields.io/github/discussions/john30/ebusd)](https://github.com/john30/ebusd/discussions) [![GitHub Discussions](https://img.shields.io/github/discussions/john30/ebusd)](https://github.com/john30/ebusd/discussions)
[![Sponsors](https://img.shields.io/github/sponsors/john30)](https://github.com/sponsors/john30)
Features Features
-------- --------
VERSION
+1 -1
View File
@@ -1 +1 @@
22.2 22.3
contrib/alpine/APKBUILD
+2 -4
View File
@@ -1,7 +1,7 @@
# Contributor: Tim <timstanleydev@gmail.com> # Contributor: Tim <timstanleydev@gmail.com>
# Maintainer: Tim <timstanleydev@gmail.com> # Maintainer: Tim <timstanleydev@gmail.com>
pkgname=ebusd pkgname=ebusd
pkgver=22.2 pkgver=22.3
pkgrel=0 pkgrel=0
pkgdesc="Daemon for communication with eBUS heating systems" pkgdesc="Daemon for communication with eBUS heating systems"
url="https://github.com/john30/ebusd" url="https://github.com/john30/ebusd"
@@ -25,10 +25,8 @@ check() {
package() { package() {
DESTDIR="$pkgdir" cmake --install build DESTDIR="$pkgdir" cmake --install build
install -D -m 644 "$srcdir"/"$pkgname-$pkgver"/contrib/etc/ebusd/mqtt-hassio.cfg "$pkgdir"/etc/ebusd/mqtt-hassio.cfg
install -D -m 644 "$srcdir"/"$pkgname-$pkgver"/contrib/etc/ebusd/mqtt-integration.cfg "$pkgdir"/etc/ebusd/mqtt-integration.cfg
} }
sha512sums=" sha512sums="
e98471b56d1a875f1fdc966a1f91776d8675d244836c7c8e2987fef9dce48d76b55b612fe51dfeab4a134763f20ca9ec6e1ef5f814690f63505c8c56570432cb ebusd-22.2.tar.gz 565a2a95841680825a29a67dfed2277188951574b3bee7ac75667e264163288d7ebda03112ca5dbeafa96f44e22480203dcde50a46b8cc82597e385e4fa134c2 ebusd-22.3.tar.gz
" "
contrib/archlinux/PKGBUILD
+2 -2
View File
@@ -2,7 +2,7 @@
# Contributor: Milan Knizek <knizek volny cz> # Contributor: Milan Knizek <knizek volny cz>
# Usage: makepkg # Usage: makepkg
pkgname=ebusd pkgname=ebusd
pkgver=22.2 pkgver=22.3
pkgrel=1 pkgrel=1
pkgdesc="ebusd, the daemon for communication with eBUS heating systems." pkgdesc="ebusd, the daemon for communication with eBUS heating systems."
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -41,4 +41,4 @@ package() {
install -m 0644 contrib/etc/ebusd/mqtt-integration.cfg "${pkgdir}/etc/ebusd/mqtt-integration.cfg" install -m 0644 contrib/etc/ebusd/mqtt-integration.cfg "${pkgdir}/etc/ebusd/mqtt-integration.cfg"
} }
# update md5sums: updpkgsums # update md5sums: updpkgsums
md5sums=('88c67b36d4fc90d1e2026cdbb9b496e3') md5sums=('8e2d7e6fe8021dc792e381f4a7468e9d')
contrib/archlinux/PKGBUILD.git
+1 -1
View File
@@ -3,7 +3,7 @@
# Usage: makepkg -p PKGBUILD.git # Usage: makepkg -p PKGBUILD.git
pkgname=ebusd-git pkgname=ebusd-git
_gitname=ebusd _gitname=ebusd
pkgver=22.2 pkgver=22.3
pkgrel=1 pkgrel=1
pkgdesc="ebusd, the daemon for communication with eBUS heating systems." pkgdesc="ebusd, the daemon for communication with eBUS heating systems."
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
src/ebusd/main.cpp
+34 -34
View File
@@ -158,40 +158,40 @@ static HttpClient* s_configHttpClient = nullptr;
static const char argpdoc[] = static const char argpdoc[] =
"A daemon for communication with eBUS heating systems."; "A daemon for communication with eBUS heating systems.";
#define O_INISND 1 #define O_INISND -2
#define O_DEVLAT (O_INISND+1) #define O_DEVLAT (O_INISND-1)
#define O_CFGLNG (O_DEVLAT+1) #define O_CFGLNG (O_DEVLAT-1)
#define O_CHKCFG (O_CFGLNG+1) #define O_CHKCFG (O_CFGLNG-1)
#define O_DMPCFG (O_CHKCFG+1) #define O_DMPCFG (O_CHKCFG-1)
#define O_DMPCTO (O_DMPCFG+1) #define O_DMPCTO (O_DMPCFG-1)
#define O_POLINT (O_DMPCTO+1) #define O_POLINT (O_DMPCTO-1)
#define O_CAFILE (O_POLINT+1) #define O_CAFILE (O_POLINT-1)
#define O_CAPATH (O_CAFILE+1) #define O_CAPATH (O_CAFILE-1)
#define O_ANSWER (O_CAPATH+1) #define O_ANSWER (O_CAPATH-1)
#define O_ACQTIM (O_ANSWER+1) #define O_ACQTIM (O_ANSWER-1)
#define O_ACQRET (O_ACQTIM+1) #define O_ACQRET (O_ACQTIM-1)
#define O_SNDRET (O_ACQRET+1) #define O_SNDRET (O_ACQRET-1)
#define O_RCVTIM (O_SNDRET+1) #define O_RCVTIM (O_SNDRET-1)
#define O_MASCNT (O_RCVTIM+1) #define O_MASCNT (O_RCVTIM-1)
#define O_GENSYN (O_MASCNT+1) #define O_GENSYN (O_MASCNT-1)
#define O_ACLDEF (O_GENSYN+1) #define O_ACLDEF (O_GENSYN-1)
#define O_ACLFIL (O_ACLDEF+1) #define O_ACLFIL (O_ACLDEF-1)
#define O_HEXCMD (O_ACLFIL+1) #define O_HEXCMD (O_ACLFIL-1)
#define O_DEFCMD (O_HEXCMD+1) #define O_DEFCMD (O_HEXCMD-1)
#define O_PIDFIL (O_DEFCMD+1) #define O_PIDFIL (O_DEFCMD-1)
#define O_LOCAL (O_PIDFIL+1) #define O_LOCAL (O_PIDFIL-1)
#define O_HTTPPT (O_LOCAL+1) #define O_HTTPPT (O_LOCAL-1)
#define O_HTMLPA (O_HTTPPT+1) #define O_HTMLPA (O_HTTPPT-1)
#define O_UPDCHK (O_HTMLPA+1) #define O_UPDCHK (O_HTMLPA-1)
#define O_LOG (O_UPDCHK+1) #define O_LOG (O_UPDCHK-1)
#define O_LOGARE (O_LOG+1) #define O_LOGARE (O_LOG-1)
#define O_LOGLEV (O_LOGARE+1) #define O_LOGLEV (O_LOGARE-1)
#define O_RAW (O_LOGLEV+1) #define O_RAW (O_LOGLEV-1)
#define O_RAWFIL (O_RAW+1) #define O_RAWFIL (O_RAW-1)
#define O_RAWSIZ (O_RAWFIL+1) #define O_RAWSIZ (O_RAWFIL-1)
#define O_DMPFIL (O_RAWSIZ+1) #define O_DMPFIL (O_RAWSIZ-1)
#define O_DMPSIZ (O_DMPFIL+1) #define O_DMPSIZ (O_DMPFIL-1)
#define O_DMPFLU (O_DMPSIZ+1) #define O_DMPFLU (O_DMPSIZ-1)
/** the definition of the known program arguments. */ /** the definition of the known program arguments. */
static const struct argp_option argpoptions[] = { static const struct argp_option argpoptions[] = {