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

Merge branch 'master' of github.com:john30/ebusd

Browse Source
This commit is contained in:
john30
2015-03-12 23:56:19 +01:00
parent 2834248e91 2655e570b3
commit bdf0faec1d
12 changed files with 186 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -25,7 +25,8 @@ Installation
------------
Building ebusd from the source requires the following packages:
* autoconf (>=2.65)
* autoconf (>=2.63)
* automake (>=1.11)
* g++
* make
configure.ac
+1 -1
View File
@@ -1,4 +1,4 @@
AC_PREREQ([2.65])
AC_PREREQ([2.63])
AC_INIT([ebusd], [1.0.0], [ebusd@johnm.de], [ebusd], [https://github.com/john30/ebusd])
AC_CONFIG_AUX_DIR([build])
contrib/archlinux/ebusd-git/PKGBUILD
+53
View File
@@ -0,0 +1,53 @@
# Maintainer: Milan Knizek <knizek volny cz>
# Contributor: Milan Knizek <knizek volny cz>
pkgname=ebusd-git
_gitname=ebusd
pkgver=2faab3f
_pkgver=1.0.0
pkgrel=1
pkgdesc="ebusd provides a communication interface to the energy bus (ebus)."
arch=('i686' 'x86_64' 'armv6h')
url=https://github.com/john30/ebusd/
license=('GPL3')
depends=()
makedepends=('git')
optdepends=()
conflicts=('ebusd')
provides=('ebusd')
install=ebusd.install
options=()
backup=('etc/conf.d/ebusd')
source=('git://github.com/john30/ebusd.git' 'ebusd.service' 'ebusd_conf.d')
# This is for -git only
pkgver() {
cd $_gitname
git describe --always | sed 's|-|.|g'
}
build() {
local _gitdir=$srcdir/$_gitname
cd "$_gitdir"
git clean -dfx
git reset --hard
# git apply -v --ignore-space-change --ignore-whitespace ../some.patch
./autogen.sh --prefix=/usr --sysconfdir=/etc
make -j1
}
package() {
cd "$srcdir/$_gitname"
make DESTDIR="$pkgdir" install
install -d "${pkgdir}"/usr/lib/systemd/system
install -m 0644 ../ebusd.service "${pkgdir}"/usr/lib/systemd/system
install -d "${pkgdir}"/etc/conf.d
install -m 0644 ../ebusd_conf.d "${pkgdir}"/etc/conf.d/ebusd
}
md5sums=('SKIP'
'15b2fdb0a219fae6feecd539e8823864'
'a2b4d5557fd90ea30e04358da62597fb')
contrib/archlinux/ebusd-git/ebusd.install
+24
View File
@@ -0,0 +1,24 @@
pkgname=ebusd
post_install() {
echo ">>> Put daemon options to /etc/conf.d/ebusd (especially /dev/tty????)"
echo " Copy your configuration files (csv) to /etc/ebusd"
echo " Start the daemon 'systemctl start ebusd'"
}
pre_upgrade() {
true
}
post_upgrade() {
true
}
pre_remove() {
true
}
post_remove() {
true
}
contrib/archlinux/ebusd-git/ebusd.service
+15
View File
@@ -0,0 +1,15 @@
[Unit]
Description=Communication interface to the energy bus (ebus)
After=local-fs.target
ConditionPathExists=/var/log
[Service]
Type=forking
EnvironmentFile=-/etc/conf.d/ebusd
ExecStart=/usr/bin/ebusd $EBUSD_ARGS
Restart=always
PIDFile=/run/ebusd.pid
[Install]
WantedBy=multi-user.target
contrib/archlinux/ebusd-git/ebusd_conf.d
+5
View File
@@ -0,0 +1,5 @@
# /etc/conf.d/ebusd: config file for ebusd.service
# Options to pass to the ebusd.
# See the ebusd -h for more info.
EBUSD_ARGS=""
contrib/archlinux/ebusd/PKGBUILD
+38
View File
@@ -0,0 +1,38 @@
# Maintainer: Milan Knizek <knizek volny cz>
# Contributor: Milan Knizek <knizek volny cz>
pkgname=ebusd
#_gitname=ebusd
pkgver=1.0.0
_pkgver=1.0.0
pkgrel=1
pkgdesc="ebusd provides a communication interface to the energy bus (ebus)."
arch=('i686' 'x86_64' 'armv6h')
url=https://github.com/john30/ebusd/
license=('GPL3')
depends=()
optdepends=()
conflicts=('ebusd-git')
provides=('ebusd')
install=ebusd.install
options=()
backup=('etc/conf.d/ebusd')
source=("https://github.com/john30/ebusd/archive/v${_pkgver}.tar.gz" 'ebusd.service' 'ebusd')
build() {
cd "${srcdir}"/${pkgname}-${_pkgver}
./autogen.sh --prefix=/usr --sysconfdir=/etc
# This is corrected in master
sed -i 's@\(\[ -d \)\(\$(sysconfdir)/ebusd \] || mkdir -p \)\(\$(sysconfdir)/ebusd\)@\1\$(DESTDIR)\2\$(DESTDIR)\3@' src/ebusd/Makefile.am
make -j1
}
package() {
cd "${srcdir}"/${pkgname}-${_pkgver}
make DESTDIR="$pkgdir" install
install -d "${pkgdir}"/usr/lib/systemd/system
install -m 0644 ../ebusd.service "${pkgdir}"/usr/lib/systemd/system
install -d "${pkgdir}"/etc/conf.d
install -m 0644 ../ebusd_conf.d "${pkgdir}"/etc/conf.d/ebusd
}
contrib/archlinux/ebusd/ebusd.install
+24
View File
@@ -0,0 +1,24 @@
pkgname=ebusd
post_install() {
echo ">>> Put daemon options to /etc/conf.d/ebusd (especially /dev/tty????)"
echo " Copy your configuration files (csv) to /etc/ebusd"
echo " Start the daemon 'systemctl start ebusd'"
}
pre_upgrade() {
true
}
post_upgrade() {
true
}
pre_remove() {
true
}
post_remove() {
true
}
contrib/archlinux/ebusd/ebusd.service
+15
View File
@@ -0,0 +1,15 @@
[Unit]
Description=Communication interface to the energy bus (ebus)
After=local-fs.target
ConditionPathExists=/var/log
[Service]
Type=forking
EnvironmentFile=-/etc/conf.d/ebusd
ExecStart=/usr/bin/ebusd $EBUSD_ARGS
Restart=always
PIDFile=/run/ebusd.pid
[Install]
WantedBy=multi-user.target
contrib/archlinux/ebusd/ebusd_conf.d
+5
View File
@@ -0,0 +1,5 @@
# /etc/conf.d/ebusd: config file for ebusd.service
# Options to pass to the ebusd.
# See the ebusd -h for more info.
EBUSD_ARGS=""
src/lib/ebus/data.cpp
+2 -2
View File
@@ -705,7 +705,7 @@ result_t StringDataField::writeSymbols(istringstream& input,
if ((m_dataType.flags & BCD) != 0)
output[baseOffset + offset - incr] = (unsigned char)((6+daysSinceSunday) % 7); // Sun=0x06
else
output[baseOffset + offset - incr] = (daysSinceSunday==0 ? 7 : daysSinceSunday); // Sun=0x07
output[baseOffset + offset - incr] = (unsigned char)(daysSinceSunday==0 ? 7 : daysSinceSunday); // Sun=0x07
}
if (value >= 2000)
value -= 2000;
@@ -891,7 +891,7 @@ NumberDataField::NumberDataField(const string name, const string comment,
const unsigned char length, const unsigned char bitCount,
const int divisor)
: NumericDataField(name, comment, unit, dataType, partType, length, bitCount,
(dataType.bitCount % 8) == 0 ? 0 : (unsigned char)dataType.divisorOrFirstBit),
(unsigned char)((dataType.bitCount % 8) == 0 ? 0 : dataType.divisorOrFirstBit)),
m_divisor(divisor), m_precision(0)
{
if (divisor > 1)
src/lib/ebus/data.h
+2 -2
View File
@@ -306,7 +306,7 @@ public:
PartType getPartType() const { return m_partType; }
// @copydoc
virtual unsigned char getLength(PartType partType) { return partType == m_partType ? m_length : 0; };
virtual unsigned char getLength(PartType partType) { return partType == m_partType ? m_length : (unsigned char)0; };
// re-use same position as previous field as not all bits of fully consumed yet
/**
@@ -558,7 +558,7 @@ public:
const unsigned char length, const unsigned char bitCount,
const map<unsigned int, string> values)
: NumericDataField(name, comment, unit, dataType, partType, length, bitCount,
(dataType.bitCount < 8) ? (unsigned char)dataType.divisorOrFirstBit : 0),
(unsigned char)((dataType.bitCount < 8) ? dataType.divisorOrFirstBit : 0)),
m_values(values) {}
/**