Commit Graph

947 Commits

Author SHA1 Message Date
brindosch
90081b7f65 re add config
Former-commit-id: d004e7dd5331ce4740682cf33960a2e0b79686ae
2016-03-11 19:28:38 +01:00
brindosch
7508b9c9b0 Merge pull request #535 from redPanther/prio_cleanup
Prio cleanup

Former-commit-id: 9b801630fe3c32232666cc2c5f3f3cfd43da381b
2016-03-11 19:26:01 +01:00
brindosch
e813bf3278 fixconflict
Former-commit-id: 07882fe323b23178a04ce187eccddb0f71c357ff
2016-03-11 19:25:48 +01:00
brindosch
e82643ff50 Merge pull request #533 from markwal/rpi_ws281x
Add new WS281x driver

Former-commit-id: 1264edf7f5e0bc29f091e72989ab7116b78056bf
2016-03-11 19:10:13 +01:00
brindosch
9e3b98dfc3 Merge pull request #538 from ntim/support_for_philips_hue
Reads hue light ids in case the user did not supply any.

Former-commit-id: 7dc1e6a14c0bd2b08439d13e7e2acf9f539cf1c1
2016-03-11 19:08:11 +01:00
brindosch
385d5a896d Cleanup and bugfixes
Former-commit-id: 8622ff7fb963eb7c52e816f1c779e9e9869ece53
2016-03-11 19:06:36 +01:00
AEtHeLsYn
28fd10cdcd Update JsonClientConnection.cpp
Former-commit-id: 6216d16565b82427094b030cede48ee589f5c969
2016-03-11 12:46:09 +01:00
AEtHeLsYn
c937dfa674 Update JsonClientConnection.h
Former-commit-id: adc564d5259638c3e79ab5a12550a89c0d719186
2016-03-11 12:32:48 +01:00
AEtHeLsYn
a5e042225e Update JsonConnection.cpp
Former-commit-id: 7b748e605939b65f02cb768a924faa48787618c3
2016-03-11 12:30:32 +01:00
AEtHeLsYn
8fce604ccb Update JsonConnection.h
Former-commit-id: 5d44428cd95e2b81b867ace67eb1f77aceb47856
2016-03-11 12:29:07 +01:00
AEtHeLsYn
39b318e842 Update JsonConnection.h
Former-commit-id: 5191309bb65f446d8d60e21193ece00560d5e67b
2016-03-11 12:28:45 +01:00
AEtHeLsYn
8caf69e541 Update JsonConnection.h
Former-commit-id: fa07c01ab5bb34029d8b13ea93187a54686d784c
2016-03-11 12:21:04 +01:00
AEtHeLsYn
0baebe3873 Update hyperion-remote.cpp
Former-commit-id: bb2282e48bdd93d4dffcd763ff34e33d3f00670c
2016-03-11 12:20:59 +01:00
AEtHeLsYn
d7546dc042 Merge pull request #5 from tvdzwan/master
Update CompileHowto.txt

Former-commit-id: 22c733aa48d1f12dfc21c06d84276e59820f84c8
2016-03-11 11:42:31 +01:00
Serhan
d97d31fe3d Update CompileHowto.txt
Typos and OSX build updated

Former-commit-id: b8817888cf5b9867ca3514ffac760188693b610f
2016-03-10 22:25:04 +01:00
redPanther
9a175a007c Merge pull request #2 from tpmodding/patch-2
Update OsxWrapper.cpp

Former-commit-id: 8662343b88b668f8f50bee7ca8ae9bd1a8ee0f73
2016-03-10 22:18:01 +01:00
Serhan
a25d8328f4 Update OsxWrapper.cpp
typooooo :D

Former-commit-id: 61df249f76c500845a460888b5f64dd70c056d28
2016-03-10 21:34:02 +01:00
AEtHeLsYn
da7183d28b Update Hyperion.cpp
Former-commit-id: 5bad6209c49a8fd9eba5582119d9e130b9bea565
2016-03-10 18:13:46 +01:00
AEtHeLsYn
6e7157c571 Update Hyperion.h
Former-commit-id: c1bd4a7397e8ae2e72b9ef5dcc32ee3b866e2c36
2016-03-10 18:08:34 +01:00
AEtHeLsYn
b0d74b2dd8 Update ColorTransform.h
Former-commit-id: 4c944b94cf26720906efa63ea4266064dc092134
2016-03-10 17:57:52 +01:00
AEtHeLsYn
3370cc6271 Update MultiColorTransform.cpp
Former-commit-id: c743c2fec460d645b64c1172212469287af6a8db
2016-03-10 17:54:39 +01:00
AEtHeLsYn
b6c08ae34f Update CMakeLists.txt
Former-commit-id: 808a5c9a22a57f6d6ee77adb1c1f112b291b7188
2016-03-10 17:28:34 +01:00
AEtHeLsYn
9e13303a4a Added files via upload
Former-commit-id: 55b74524b06af6f5c443053a56216c0db465fb2f
2016-03-10 17:27:25 +01:00
ntim
7849e9f23e Reads hue light ids in case the user did not supply any.
Former-commit-id: 3323fe83e3bb5f42c4b6c98cbbb021fb929cf54d
2016-03-10 09:33:16 +01:00
AEtHeLsYn
9f273410a1 Update .gitignore
Former-commit-id: 416ddb32c74a723acc019283ab3330f88666a1e9
2016-03-10 07:58:30 +01:00
AEtHeLsYn
266f0e6694 Update .gitignore
Former-commit-id: b33283298729bdca7c78d855964c3126735fd57b
2016-03-10 07:57:47 +01:00
Mark Walker
7cb34733fd Actually, you can enable both flavors of PWM
If you do a build with both ENABLE_WS2812BPWM and ENABLE_WS281XPWM and
choose which LED driver using the device.type in the config.json


Former-commit-id: 35ae88ad8739cac406a9b8792e2223010bf5d144
2016-03-09 12:27:07 -08:00
AEtHeLsYn
8b26033915 Update Hyperion.h
Former-commit-id: 9e4ab548db0f2805386d90bfe9cde3aa9426aab5
2016-03-09 19:58:49 +01:00
AEtHeLsYn
90b9acf68e Update Hyperion.cpp
Former-commit-id: 4c3f0a561d7def20dd713add0d437bdf12431e0b
2016-03-09 19:57:03 +01:00
AEtHeLsYn
bcb0802542 Update Hyperion.h
Former-commit-id: 877c98ea4c6f5503fda14914e315c2b9eb301a44
2016-03-09 19:55:55 +01:00
AEtHeLsYn
63e3380ff7 Update Hyperion.cpp
Former-commit-id: 24638e6009da0dc3a2168caef53e09664c1db095
2016-03-09 19:45:00 +01:00
AEtHeLsYn
88e4737b8b Update CMakeLists.txt
Former-commit-id: 8afa5615ac8ff62ac6492083f2d2c487cf305dbc
2016-03-09 19:42:54 +01:00
AEtHeLsYn
1fa54a1cee Update CMakeLists.txt
Former-commit-id: 5182f0e28c8914a970db7c4c0d9fee68d7481e65
2016-03-09 19:42:18 +01:00
AEtHeLsYn
0dc51dbf76 Update Hyperion.h
Former-commit-id: 2497c6ea7d153e01e49ed0683e92837106628d44
2016-03-09 19:36:08 +01:00
AEtHeLsYn
9db45c0ffb Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
# Conflicts:
#	include/hyperion/Hyperion.h
#	libsrc/hyperion/CMakeLists.txt
#	libsrc/hyperion/Hyperion.cpp


Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e
2016-03-09 19:25:04 +01:00
penfold42
9d01c84494 Merge pull request #4 from tvdzwan/master
Updating

Former-commit-id: f2babbeab3f8dd80e92b37be5fd0c25c1b45a76b
2016-03-09 21:06:05 +11:00
redpanther
014a4288f9 implement osx grabber .... not tested! need testers!
tune usage hints in external grabbers


Former-commit-id: 816821dd773e90b8076e9b50ced9eb052f43c2f4
2016-03-09 11:03:20 +01:00
redpanther
b4e244008f merge upstream changes
Former-commit-id: 60c92921da4582ba65022c3fea84c3b24055b0f2
2016-03-09 07:27:06 +01:00
redpanther
eb64cc6601 Merge remote-tracking branch 'upstream/master/master' into prio_cleanup
Conflicts:
	config/hyperion.config.json

Former-commit-id: 7f6fd562b78a6c4b646d9f1587941265b2ca12e0
2016-03-09 07:09:20 +01:00
redpanther
e6170ed698 create external framebuffer grabber
cleanup some cmakelist files
fix qt5 build


Former-commit-id: 024b5b6dc5dc96fcb16f6e8958ad3684a6728504
2016-03-09 07:03:17 +01:00
Mark Walker
78e606a1c4 Add new WS281x driver
Add a new WS281x driver which is a wrapper around jgarff's ws281x library which
works on Pi B+, Pi 2, Pi Zero and probably Pi 3 as well.

jgarff's ws281x library is included as a submodule


Former-commit-id: e473dfd36d31b14598da5e56e4b8bf9f2aa7bb24
2016-03-08 20:41:13 -08:00
brindosch
14fc1d9bb6 Merge pull request #514 from penfold42/master
add configuratble latch time for ws2801

Former-commit-id: cd226d63ebf4d158ce72cb88d49887d8e19a185c
2016-03-08 22:53:29 +01:00
brindosch
02d055b75c Add the service files and new hyperion conf
Former-commit-id: 2083ce117791e6ad22037f91618af917fe99d40b
2016-03-08 18:20:09 +01:00
redpanther
0bc725054c make all prios settable and make prios more consistent
Former-commit-id: f1d1c35063e98389d627f3535d2a94da33a22da4
2016-03-08 17:31:56 +01:00
Serhan
7f4ea9ae7b Merge pull request #509 from tpmodding/patch-1
Update CMakeLists.txt for OpenElec -> Python 2.7

Former-commit-id: 7a088e38a0079bef4a083a3336da92036773ef45
2016-03-08 15:52:50 +01:00
brindosch
b41dfff0da Merge pull request #520 from redPanther/master
effects rework and new effects

Former-commit-id: f5bd9db54fd5adfe2e9a8c7b65e31ba14c529707
2016-03-08 15:49:50 +01:00
brindosch
d350ed6eef Merge pull request #518 from redPanther/proto_json_forwarder
multi device support via forwarding proto/json messages

Former-commit-id: bb5e8c110b8e34f062cbcc8c5b2985d20d09db56
2016-03-08 15:49:38 +01:00
Serhan
42e488c193 Removed debug-build option
Removed debug-build option

Former-commit-id: ce88ca30ecf296617d6fe2d2b0e9d7f050d7d68a
2016-03-07 12:10:30 +01:00
redpanther
b63cdc1bcf Revert "make it compile on raspi"
This reverts commit 11af47d799 [formerly 378b2ed1f605d060feb955819fb632424f21a218].


Former-commit-id: 5343c8139825860e74243ecbbb67d9aae6697d63
2016-02-29 04:29:55 +01:00
redpanther
102d56b8f9 Merge remote-tracking branch 'upstream/master/master'
Former-commit-id: 089220e45a3108c7d123e71eda2e227c8a813f0a
2016-02-29 04:25:19 +01:00