diff --git a/controller-testing/PKGBUILD b/controller-testing/PKGBUILD index c8b2051..3bc866b 100644 --- a/controller-testing/PKGBUILD +++ b/controller-testing/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Tobias Reisinger pkgname=emgauwa-controller-testing -pkgver=0.3.7 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 epoch= pkgdesc="" arch=('x86_64' 'armv6h' 'armv7h' 'aarch64') @@ -13,19 +13,20 @@ depends_armv6h=('wiringpi') depends_armv7h=('wiringpi') makedepends=('make' 'cmake' 'gcc') conflicts=('emgauwa-controller') -backup=('etc/emgauwa/controller.ini') +backup=('etc/emgauwa/controller.conf' + 'etc/emgauwa/controller2.conf') source=("https://git.serguzim.me/emgauwa/controller/archive/testing-v$pkgver.tar.gz" - "controller.ini" - "controller2.ini" + "controller.conf" + "controller2.conf" "emgauwa-controller-testing.service" "emgauwa-controller-testing2.service" "emgauwa-controller-testing.sysusers" "emgauwa-controller-testing.tmpfiles") -sha256sums=('569acded9108ebf0e8c8fc5dcd0b27e8872d63b5cdf07b3e960f97bd996e8827' - '16c4fb3323a6d74657c6fd57720406547a89e7fc0af5441ab2d155829a818541' - 'b91003f435b89726b7d578a55f53aa49d344a13118306e61911637f72eb22959' - '0bbc44d680be2011800c553ae863663148be0820f08349993578c88e9a23b143' - '6cd1f42a50e6023566120416309d46f89238f47c4f9bda9332510251ccaf7d5d' +sha256sums=('9bc85905e83ad31cc8b8f72245c8e3470fef4309b4dc47ffe4588211e306c3f3' + '48463574063a4224cc1aaeb4725deaa12789fe1797b7647fd57949bf8b3e3ef0' + '4030e025022e94b328ab38fbf43c7f88b87376cb45bd6f32de14333ff27bb676' + '0b61a8de493e1aef4e00575710b5874f1e8b07c919d298bb0474355236fb76c7' + 'c539ba0bd5b51f1896e2215d205a75ca31f50ecd636ee77c8671c4f19d319897' 'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798' '81f3872318a669e21a8a7b31c97fa3e14dc10f8aed1df74fb983b417ba74be89') @@ -43,8 +44,8 @@ build() { package() { install -Dm755 "controller/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" - install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini" - install -Dm660 "controller2.ini" "${pkgdir}/etc/emgauwa/controller2.ini" + install -Dm660 "controller.conf" "${pkgdir}/etc/emgauwa/controller.conf" + install -Dm660 "controller2.conf" "${pkgdir}/etc/emgauwa/controller2.conf" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" install -Dm644 "${pkgname}2.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}2.service" install -Dm644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" diff --git a/controller-testing/controller.conf b/controller-testing/controller.conf new file mode 100644 index 0000000..3103834 --- /dev/null +++ b/controller-testing/controller.conf @@ -0,0 +1,65 @@ +[controller] +name = "first emgauwa device" +database = "/var/lib/emgauwa/controller/db.sqlite" + +mqtt-host = "localhost" + +[ports] +# 4422 for testing; 4421 for dev-env; 4420 for testing-env; 4419 for prod-env +discovery = 4420 +# 1886 for testing; 1885 for dev-env; 1884 for testing-env; 1883 for prod-env +mqtt = 1884 + +[logging] +level = "debug" +file = "/var/log/emgauwa/controller.log" + +[[relays]] +driver = "gpio" +pin = 5 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 4 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 3 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 2 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 1 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 0 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 16 +inverted = 1 + +[[relays]] +driver = "gpio" +pin = 15 +inverted = 1 + +[[relays]] +driver = "piface" +pin = 1 +inverted = 0 + +[[relays]] +driver = "piface" +pin = 0 +inverted = 0 diff --git a/controller-testing/controller.ini b/controller-testing/controller.ini deleted file mode 100644 index 679ada2..0000000 --- a/controller-testing/controller.ini +++ /dev/null @@ -1,63 +0,0 @@ -[controller] -name = new emgauwa device - -: 4422 for testing; 4421 for dev-env; 4420 for testing-env; 4419 for prod-env -discovery-port = 4420 -: 1886 for testing; 1885 for dev-env; 1884 for testing-env; 1883 for prod-env -mqtt-port = 1884 -mqtt-host = localhost - -relay-count = 10 -database = /var/lib/emgauwa/controller/db.sqlite -log-level = debug -log-file = /var/log/emgauwa/controller.log - -[relay-0] -driver = gpio -pin = 5 -inverted = 1 - -[relay-1] -driver = gpio -pin = 4 -inverted = 1 - -[relay-2] -driver = gpio -pin = 3 -inverted = 1 - -[relay-3] -driver = gpio -pin = 2 -inverted = 1 - -[relay-4] -driver = gpio -pin = 1 -inverted = 1 - -[relay-5] -driver = gpio -pin = 0 -inverted = 1 - -[relay-6] -driver = gpio -pin = 16 -inverted = 1 - -[relay-7] -driver = gpio -pin = 15 -inverted = 1 - -[relay-8] -driver = piface -pin = 1 -inverted = 0 - -[relay-9] -driver = piface -pin = 0 -inverted = 0 diff --git a/controller-testing/controller2.ini b/controller-testing/controller2.conf similarity index 57% rename from controller-testing/controller2.ini rename to controller-testing/controller2.conf index d7923c4..78c70a4 100644 --- a/controller-testing/controller2.ini +++ b/controller-testing/controller2.conf @@ -1,96 +1,98 @@ [controller] -name = second emgauwa device +name = "second emgauwa device" +database = "/var/lib/emgauwa/controller/db2.sqlite" -: 4422 for testing; 4421 for dev-env; 4420 for testing-env; 4419 for prod-env -discovery-port = 4420 -: 1886 for testing; 1885 for dev-env; 1884 for testing-env; 1883 for prod-env -mqtt-port = 1884 -mqtt-host = localhost +mqtt-host = "localhost" -relay-count = 10 -database = /var/lib/emgauwa/controller/db2.sqlite -log-level = debug -log-file = /var/log/emgauwa/controller2.log +[ports] +# 4422 for testing; 4421 for dev-env; 4420 for testing-env; 4419 for prod-env +discovery = 4420 +# 1886 for testing; 1885 for dev-env; 1884 for testing-env; 1883 for prod-env +mqtt = 1884 -[relay-0] +[logging] +level = "debug" +file = "/var/log/emgauwa/controller2.log" + +[[relays]] driver = gpio pin = 8 inverted = 0 -[relay-1] +[[relays]] driver = gpio pin = 9 inverted = 0 -[relay-2] +[[relays]] driver = gpio pin = 7 inverted = 0 -[relay-3] +[[relays]] driver = gpio pin = 0 inverted = 0 -[relay-4] +[[relays]] driver = gpio pin = 2 inverted = 0 -[relay-5] +[[relays]] driver = gpio pin = 3 inverted = 0 -[relay-6] +[[relays]] driver = gpio pin = 12 inverted = 0 -[relay-7] +[[relays]] driver = gpio pin = 13 inverted = 0 -[relay-8] +[[relays]] driver = gpio pin = 14 inverted = 0 -[relay-9] +[[relays]] driver = gpio pin = 11 inverted = 0 -[relay-10] +[[relays]] driver = gpio pin = 10 inverted = 0 -[relay-11] +[[relays]] driver = gpio pin = 6 inverted = 0 -[relay-12] +[[relays]] driver = gpio pin = 5 inverted = 1 pulse-duration = 5 -[relay-13] +[[relays]] driver = gpio pin = 4 inverted = 1 pulse-duration = 5 -[relay-14] +[[relays]] driver = gpio pin = 1 inverted = 1 pulse-duration = 2 -[relay-15] +[[relays]] driver = gpio pin = 16 inverted = 1 diff --git a/controller-testing/emgauwa-controller-testing.service b/controller-testing/emgauwa-controller-testing.service index 235491d..e3eb715 100644 --- a/controller-testing/emgauwa-controller-testing.service +++ b/controller-testing/emgauwa-controller-testing.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=simple WorkingDirectory=/var/lib/emgauwa/controller/ -ExecStart=emgauwa-controller start -c /etc/emgauwa/controller.ini +ExecStart=emgauwa-controller start -c /etc/emgauwa/controller.conf Restart=on-failure [Install] diff --git a/controller-testing/emgauwa-controller-testing2.service b/controller-testing/emgauwa-controller-testing2.service index 1814250..6da1294 100644 --- a/controller-testing/emgauwa-controller-testing2.service +++ b/controller-testing/emgauwa-controller-testing2.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=simple WorkingDirectory=/var/lib/emgauwa/controller/ -ExecStart=emgauwa-controller start -c /etc/emgauwa/controller2.ini +ExecStart=emgauwa-controller start -c /etc/emgauwa/controller2.conf Restart=on-failure [Install] diff --git a/core-testing/PKGBUILD b/core-testing/PKGBUILD index f175333..65ebc49 100644 --- a/core-testing/PKGBUILD +++ b/core-testing/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Tobias Reisinger pkgname=emgauwa-core-testing -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 epoch= pkgdesc="" @@ -17,7 +17,7 @@ source=("https://git.serguzim.me/emgauwa/core/archive/testing-v$pkgver.tar.gz" "emgauwa-core-testing.service" "emgauwa-core-testing.sysusers" "emgauwa-core-testing.tmpfiles") -sha256sums=('9e2dd23b4a49d20917017d27b573052a9b75a7c4814d94b9633b135a2c42b49b' +sha256sums=('88faa22ab02050d26670bd783e1383191ee9ab7ed2dca357253828b230ece90e' 'ac9cb03e0aee8cc7253f25f6c950936fb8195e450d38c2b369325038d3294d93' '541f0c83d883416eec015b5d47061c221ba2aa1ea5683b78a0aaa32145b955e3' 'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798' diff --git a/upgpkg.sh b/upgpkg.sh index 9507484..8f9cecd 100755 --- a/upgpkg.sh +++ b/upgpkg.sh @@ -30,6 +30,7 @@ function upgrade_package() latest_version=$(get_latest_version $2) sed -i "s/pkgver=.*$/pkgver=$latest_version/" PKGBUILD + sed -i "s/pkgrel=.*$/pkgrel=1/" PKGBUILD # reset pkgrel updpkgsums if [ "$current_version" != "$latest_version" ] diff --git a/webapp/PKGBUILD b/webapp/PKGBUILD index ef64c8d..64bfdab 100644 --- a/webapp/PKGBUILD +++ b/webapp/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Tobias Reisinger pkgname=emgauwa-webapp pkgver=0.0.9 -pkgrel=2 +pkgrel=1 epoch= pkgdesc="" arch=('any')