1
0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Commit Graph

158 Commits

Author SHA1 Message Date
e3491aaa45 doorlockd: Flask: disable use_reloader
This spawns the process twice which duplicates the UART thread, which,
of course, leads to silly races.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-07 22:04:24 +02:00
9f3062340c doorlockd, avr: Don't respond on commands
No need to read back the AVR.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-07 22:02:41 +02:00
95c35e7c06 Let scriptdir depend on PREFIX
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 22:31:37 +00:00
60633bbc49 Flask: specify correct root_path
We need that for package installation.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 22:31:37 +00:00
e5fb445287 move sound specification from config to source
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 22:18:59 +00:00
c2c6e00651 Rename config.cfg -> doorlockd.cfg
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 20:22:16 +00:00
3e8d8a98e3 Rename doorlockd.py -> doorlockd
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 18:44:07 +00:00
71bc36a557 remove old code
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-23 22:22:50 +00:00
Ralf Ramsauer
020ac1b38b scripts: simplify mqtt
Only publish door status topic, rest will be done by the opennhab server.

Username, password and mqtt's hostname are stored in user's local .config.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2018-01-06 22:29:30 +01:00
Ralf Ramsauer
9ae9304551 scripts: replace mac
we have a new cash-desk PC

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2017-01-07 00:29:58 +01:00
Ralf Ramsauer
d04ba6ef63 doorlock-client: add mainwindow.showFullscreen() call
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-08-01 21:51:55 +02:00
Ralf Ramsauer
d1d0d5b160 Fix QT quirk
So far, we used QT interfaces in a wrong way. QT is not thread safe, so
use its signal/slot concept and move network communication stuff to a
separate QThread.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-31 15:48:19 +02:00
Ralf Ramsauer
4ccf8e4f24 doorlock-client: refactor run to app_run
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:57:31 +02:00
Ralf Ramsauer
48d0fcaf6f doorlock-client: be even more verbose
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:50:32 +02:00
Ralf Ramsauer
42f168ff19 doorlick-client: remove misleading comment line
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:40:45 +02:00
Ralf Ramsauer
ee481009e1 doorlock-client: Add more error output
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:40:32 +02:00
Ralf Ramsauer
951e1de987 Door: Redirect output to logfile
And use nohup for detached call.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:48:58 +02:00
Ralf Ramsauer
c058e1e4d0 door, logic: propagate new logfile to Door class
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:48:54 +02:00
Ralf Ramsauer
7e522e59af Door: Refactor system() to own function
Preparatory work for script logging

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:17:00 +02:00
Ralf Ramsauer
573d9e7c65 Door: fix coding style
Consequently use _ for private member variables/functions.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:12:51 +02:00
Ralf Ramsauer
f713ef6124 Doorlockd: Replace logfile by logdir
In future, we might have several different logfiles.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:12:46 +02:00
Ralf Ramsauer
3721259f3e scripts: add nodered twitter sink
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 19:22:43 +02:00
Ralf Ramsauer
660a7297ee scripts: Wake up cashdesk PC
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-18 21:17:30 +02:00
Ralf Ramsauer
8503a2114f Mainwindow: Show huge token
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-17 23:00:08 +02:00
Ralf Ramsauer
62ac4f26e0 clientmessage: add token regex and getter
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-17 23:00:05 +02:00
Ralf Ramsauer
474d941918 clientmessage: Refactor token to web_address
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-17 22:57:54 +02:00
Ralf Ramsauer
5355749c6b UI: refactor tokenLabel to address_label
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-17 22:38:01 +02:00
Ralf Ramsauer
367afb4092 doorlockd: Improve error handling
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-17 22:29:31 +02:00
Ralf Ramsauer
34417b8ddb Cmake: Gcc: do not warn on unused results
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-17 22:18:17 +02:00
Ralf Ramsauer
f5c67445e9 startup scripts: use mosquitto
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-06-23 19:35:43 +02:00
Ralf Ramsauer
40d871b2d2 Version 1.4
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-24 22:16:18 +02:00
Ralf Ramsauer
99feb14036 Use aplay command for playing sounds
This basically reverts 5c8ca78c99.
Using libao + sndfile was a bad idea...

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-24 22:08:21 +02:00
Ralf Ramsauer
88926613e7 Improve version nomenclature
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-24 21:32:56 +02:00
Andreas Augustin
b15e7960cb Fix boost include bug
Signed-off-by: Andreas Augustin <andy.augustin@t-online.de>
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-24 01:58:08 +02:00
Andreas Augustin
61c5ce5e5e Add debugging output to CMakeLists.txt
Signed-off-by: Andreas Augustin <andy.augustin@t-online.de>
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-24 01:58:08 +02:00
Ralf Ramsauer
eb19aaa47f Adjust homer http port
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-24 01:54:46 +02:00
Ralf Ramsauer
76d0491518 Version: 1.3
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-11 18:13:29 +02:00
c4a78e48e5 Adjust DEFAULT_BINDDN to new LDAP scheme
Signed-off-by: Markus Hauschild <markus@moepman.eu>
2016-04-11 18:12:26 +02:00
Ralf Ramsauer
9c549d1d27 Logic: Allow tokens of arbitrary length
Make token size dynamically adjustable. Shorter tokens are absolutely
sufficient and simplify the manual copying of tokens

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-04-03 17:05:23 +02:00
Ralf Ramsauer
5abe7b642c Doorlockd version 1.2.1
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-01-23 12:41:37 +01:00
Ralf Ramsauer
ab8f33ebb1 Fix JSON Bug
Json::Values do not necessarily need to be JSON objects. This Patch
checks if the JSON::Value is in deed an object.

Reported-by: Markus Dollinger <dolli@ignifax.de>
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2015-10-27 16:05:09 +01:00
Ralf Ramsauer
c31deb10dc Version: 1.2
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2015-10-11 19:58:04 +02:00
Ralf Ramsauer
ac0c5f3dba Improved GUI 2015-10-11 19:54:42 +02:00
Ralf Ramsauer
d504b191d5 Small bugfix 2015-10-11 19:38:06 +02:00
Ralf Ramsauer
5c8ca78c99 Cached playback of audio files
doorlock_client now caches wave files in memory for faster playback.
LibAO is used for audio playback and libsndfile for wave file header
parsing.
2015-10-11 19:33:19 +02:00
Ralf Ramsauer
811917b334 Asynchronous Wave playback 2015-10-11 19:15:50 +02:00
Ralf Ramsauer
4865a6bb9f Added new wave class to CMakeLists.txt 2015-10-11 19:07:03 +02:00
Ralf Ramsauer
365bdb755c Added new Class for playing WAVE files from memory
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2015-10-11 19:06:05 +02:00
Ralf Ramsauer
bb703cb5b5 Defaulted location of LED pictures 2015-10-07 17:44:45 +02:00
Ralf Ramsauer
6634d1fd71 Playing different sounds on different actions
still bloody beta
2015-10-07 17:42:52 +02:00