Ralf Ramsauer
|
17516379d7
|
Merge branch 'master' into next
|
2015-09-30 00:59:17 +02:00 |
|
Ralf Ramsauer
|
b2244ed9be
|
Fix segfaults
|
2015-09-30 00:44:06 +02:00 |
|
Ralf Ramsauer
|
1984f6720e
|
bugfix
|
2015-09-29 15:03:43 +02:00 |
|
Ralf Ramsauer
|
2b2ec56a9b
|
Bugfix
|
2015-09-29 15:00:36 +02:00 |
|
Ralf Ramsauer
|
b1ea4426a9
|
Some improvements
|
2015-09-29 14:55:20 +02:00 |
|
Ralf Ramsauer
|
60ed23486b
|
Improved directory structure
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-29 14:33:53 +02:00 |
|
Ralf Ramsauer
|
4366e117d1
|
Improved GUI
|
2015-09-29 02:13:48 +02:00 |
|
Ralf Ramsauer
|
a45fc4ca33
|
Bugfix: QR code generation was case insensitive
Also changed Qstring back to std::string
|
2015-09-29 02:13:35 +02:00 |
|
Ralf Ramsauer
|
2ab091679f
|
Removed sending status code as answer to subscription message
|
2015-09-29 02:12:02 +02:00 |
|
Ralf Ramsauer
|
a3bf378458
|
Added mainwindow.h to CMakeLists.txt
|
2015-09-29 02:11:29 +02:00 |
|
Ralf Ramsauer
|
fb9f5f835e
|
Fixed include bug
|
2015-09-28 17:07:21 +02:00 |
|
Ralf Ramsauer
|
9c7cc532fe
|
Created new MainWindow QT Frontend
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-28 17:05:05 +02:00 |
|
Ralf Ramsauer
|
8f8d8a75b1
|
std::string -> QString
|
2015-09-28 17:03:03 +02:00 |
|
Ralf Ramsauer
|
3d7b6fbe08
|
Moved common code parts to static library
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-25 16:53:17 +02:00 |
|
Ralf Ramsauer
|
13b0b8744a
|
Added simple Qt Qr widget
|
2015-09-25 13:12:07 +02:00 |
|
Ralf Ramsauer
|
69dcbe6b59
|
Write first tokenupdate on session initialization
|
2015-09-25 13:11:02 +02:00 |
|
Ralf Ramsauer
|
b8cb8f9876
|
Added door state to Clientmessage / Doormessage
|
2015-09-25 03:26:07 +02:00 |
|
Ralf Ramsauer
|
404f219b6c
|
added install rule for doorlock-client
|
2015-09-25 01:31:39 +02:00 |
|
Ralf Ramsauer
|
cb5de7eba9
|
First working version of doorlock-client
|
2015-09-25 00:50:11 +02:00 |
|
Ralf Ramsauer
|
b9dc2f5ee1
|
Improved Clientmessage
- Added Clientmessage::fromJson
- Improved JSON key handling
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
aa79228e47
|
Added Response::fromJSON
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
4c05636ff0
|
Improved exception handling
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
80d8610559
|
Added response to subscription
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
b07c0e8f54
|
Bugfix
socket might be closed after session-thread is spawned.
socket might throw errors very early.
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
93fccda5d8
|
Small fix
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
36787b91b3
|
Some refactoring
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
9b58de4b5d
|
Added stub for doorlock-client
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
9e4de23dff
|
Renamed main.cpp to doorlockd.cpp
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
8ed116bf7f
|
Added proper client and doormessage classes
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
92d19bfc98
|
Added subscriptions
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
3de8855dac
|
Added Client messages
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
4f22e652e8
|
Added door callbacks
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
8b4be48811
|
Some refactoring
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
deccb94cd5
|
Added new response code: AccessDenied
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
4cdf16347e
|
Removed unneeded function
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
2234c58371
|
Typos
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
270943e388
|
Added JSON Response handling to PHP software
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
364a1f36fc
|
Logical bugfix
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
1d6719269b
|
Resend version string after redirection stdout
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
85f8e3a3bc
|
Bugfix: Timeout was uninitialized
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
4d2bdba703
|
Simplified version string
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
32ebec327d
|
Added version information
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
201ffe1e44
|
Added baudrate
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
d6b092ea9f
|
Changed default serial port
|
2015-09-25 00:50:10 +02:00 |
|
Ralf Ramsauer
|
dcdc8bcfe2
|
Removed manual change of tokenTimeout
Epaper display is gone, this is not necessary any more.
|
2015-09-25 00:50:09 +02:00 |
|
Ralf Ramsauer
|
7496a0bab2
|
Rearranged code
|
2015-09-25 00:50:09 +02:00 |
|
Ralf Ramsauer
|
542f5518a6
|
TCP connection logging
|
2015-09-25 00:50:09 +02:00 |
|
Ralf Ramsauer
|
c01eb22f91
|
Moved Command handling from logic to main
|
2015-09-25 00:50:09 +02:00 |
|
Ralf Ramsauer
|
211127f9d3
|
Refactored action to command
|
2015-09-25 00:50:09 +02:00 |
|
Ralf Ramsauer
|
0e55a86404
|
Improved coding style
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
2015-09-25 00:50:09 +02:00 |
|