Commit Graph

917 Commits

Author SHA1 Message Date
Jonas Zeunert
64fac7b904 bla 2020-01-09 23:50:57 +01:00
Johannes Wendel
a2c6793f6b Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 23:48:27 +01:00
Johannes Wendel
3efde11f0b Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 23:48:27 +01:00
Johannes Wendel
9c5006cda8 name corrected 2020-01-09 23:48:10 +01:00
Johannes Wendel
2023789338 name corrected 2020-01-09 23:48:10 +01:00
Jonas Zeunert
0d98ee7811 test 2020-01-09 23:45:57 +01:00
Jonas Zeunert
59b76013da test 2020-01-09 23:45:57 +01:00
Jonas Zeunert
c4aec64a93 test 2020-01-09 23:45:35 +01:00
Jonas Zeunert
4c61818211 test 2020-01-09 23:45:35 +01:00
Jonas Zeunert
e4dd4b648e added json wrapper for displays 2020-01-09 23:32:46 +01:00
Jonas Zeunert
10bfc2b157 added json wrapper for displays 2020-01-09 23:32:46 +01:00
Jonas Zeunert
e2748fe9d2 Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 23:28:39 +01:00
Jonas Zeunert
7e1dbcc83a Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 23:28:39 +01:00
Jonas Zeunert
13a23e2e0e added shebang 2020-01-09 23:28:31 +01:00
Jonas Zeunert
7b67b16bcb added shebang 2020-01-09 23:28:31 +01:00
Johannes Wendel
d7217165ac restructured DisplayController 2020-01-09 23:21:45 +01:00
Johannes Wendel
3c61e5bd48 restructured DisplayController 2020-01-09 23:21:45 +01:00
Jonas Zeunert
1b24f71bd7 updated python cli 2020-01-09 23:05:26 +01:00
Jonas Zeunert
4570dd8c3a updated python cli 2020-01-09 23:05:26 +01:00
Jonas Zeunert
9dfd734dd6 updated networking 2020-01-09 23:03:42 +01:00
Jonas Zeunert
5cd9e35a93 updated networking 2020-01-09 23:03:42 +01:00
Johannes Wendel
60367ff8b5 Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 22:33:28 +01:00
Johannes Wendel
eb58a06f49 Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 22:33:28 +01:00
Johannes Wendel
4986eb5368 Changed displays from id to name 2020-01-09 22:33:23 +01:00
Johannes Wendel
1333445bf5 Changed displays from id to name 2020-01-09 22:33:23 +01:00
Jonas Zeunert
cd9a9c1e91 Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 22:33:06 +01:00
Jonas Zeunert
7fad79bf1a Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 22:33:06 +01:00
Jonas Zeunert
0dc96c7540 sanitized display config 2020-01-09 22:32:59 +01:00
Jonas Zeunert
dd0d7e71c5 sanitized display config 2020-01-09 22:32:59 +01:00
Jonas Zeunert
af9d991d3c removed explicit 2020-01-09 22:04:49 +01:00
Jonas Zeunert
2079e398db removed explicit 2020-01-09 22:04:49 +01:00
Johannes Wendel
5b422d9849 fixes little bugs in Sound json 2020-01-09 21:43:12 +01:00
Johannes Wendel
ebf5a158b5 fixes little bugs in Sound json 2020-01-09 21:43:12 +01:00
Johannes Wendel
6af0a7affb Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 21:27:30 +01:00
Johannes Wendel
ac1dbb03f0 Merge branch 'master' of github.com:swinginbird/flippr-code 2020-01-09 21:27:30 +01:00
Johannes Wendel
86edd3d360 Removed deativation time from SoundFactory 2020-01-09 21:27:17 +01:00
Johannes Wendel
c798e82e4c Removed deativation time from SoundFactory 2020-01-09 21:27:17 +01:00
Jonas Zeunert
4844a9e533 added deactivation sound 2020-01-09 21:27:16 +01:00
Jonas Zeunert
edd1b0dcfd added deactivation sound 2020-01-09 21:27:16 +01:00
Jonas Zeunert
5f60719197 removed deactivation time from sounds 2020-01-09 21:24:25 +01:00
Jonas Zeunert
1dcf6360e3 removed deactivation time from sounds 2020-01-09 21:24:25 +01:00
Jonas Zeunert
3871b298b1 asdf 2020-01-09 21:17:15 +01:00
Jonas Zeunert
3acea13581 asdf 2020-01-09 21:17:15 +01:00
Jonas Zeunert
ba5326a3ad commented sound deactivation 2020-01-09 21:13:08 +01:00
Jonas Zeunert
3af3db077e commented sound deactivation 2020-01-09 21:13:08 +01:00
Jonas Zeunert
b6fcef96d2 debug sleep 2020-01-09 21:08:34 +01:00
Jonas Zeunert
f75ade3317 debug sleep 2020-01-09 21:08:34 +01:00
Jonas Zeunert
fdc85f5750 merge 2020-01-09 20:53:21 +01:00
Jonas Zeunert
3e9df6259d merge 2020-01-09 20:53:21 +01:00
Jonas Zeunert
444b41d64d changed pinbase of lamps 2020-01-09 20:48:44 +01:00