Commit Graph

874 Commits

Author SHA1 Message Date
redpanther
c7df8c23c6 Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id
Conflicts:
	src/hyperion-aml/CMakeLists.txt
	src/hyperion-remote/CMakeLists.txt
	src/hyperion-v4l2/CMakeLists.txt

Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb
2016-03-13 08:04:49 +01:00
tpmodding
66cb9c3714 Merge pull request #542 from redPanther/bootsequence
fix bootsequence

Former-commit-id: a02ab756a8da1de8f863d5b723eed96e46d7777b
2016-03-13 03:04:57 +01:00
tpmodding
30e4ba47d9 Update create_all_release.sh
Added "-DCMAKE_BUILD_TYPE=Release -Wno-dev" to make everything ready for release!

Former-commit-id: 1c4f6e4b829afbe782dff63c7d16ece8562146fa
2016-03-13 02:35:17 +01:00
tpmodding
2dae58f070 Update CrossCompileHowTo.txt
Updated instructions and build script, save as .sh and run it!

Fixed typos also!

Former-commit-id: 53b6f896de2e28d8fe7d6d37abe296272c71032e
2016-03-13 02:27:12 +01:00
redpanther
3dae8d069c fix bootsequence.
if boot duration not 0 then boot prio is set to 0 to avoid start of grabber overrules boot efx
cleanup bootseq code


Former-commit-id: 85c9f099bd9a2e8d695117a24164d8ce81ad2a36
2016-03-12 19:21:47 +01:00
brindosch
e9e43e2ba0 compatiblitiy with ne script
Former-commit-id: cf390012c6973d6223c8f60b9679b6d782a1fbde
2016-03-12 12:04:54 +01:00
brindosch
97ba9560e8 Update images and introduce new install script, cleanup
Former-commit-id: 4f38353c420f5b82de509c36d4444bc8d32566e3
2016-03-12 03:49:19 +01:00
brindosch
deb010cc22 fix leddevicephue
Former-commit-id: eb4f93bf7a59d496f83d8db534f99cf589c46bc9
2016-03-12 00:55:28 +01:00
brindosch
93e33c16a0 Merge remote-tracking branch 'origin/master'
Former-commit-id: 8b2c8b1c284cfdf6ab29c209c454452bff37c4ec
2016-03-11 22:16:08 +01:00
brindosch
fd69788352 Revert "re add config"
This reverts commit 90081b7f65 [formerly d004e7dd5331ce4740682cf33960a2e0b79686ae].


Former-commit-id: df749dd75cd06a3091ed5480063948013485fe4f
2016-03-11 22:16:01 +01:00
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
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
redpanther
e848411785 install proto to binary dir
Former-commit-id: aaac3a7094442b0bfc51a572fcfa6f7cc59b81a2
2016-03-10 17:11:02 +01:00
redpanther
e01bcd708d add install commands
instead of "make" use "make install/strip" release compile


Former-commit-id: f4dd2d9e1a4d815b667665892a3bd9cec64218a3
2016-03-10 12:22:44 +01:00
redpanther
12b406dd4b make compile of tests optional and disabled by default
Former-commit-id: dc05b637391ec5b7e79d66d94724828e8dbd2653
2016-03-10 12:06:03 +01:00
redpanther
153d1f0999 print version for every standalone grabber and hyperiond
Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
2016-03-10 12:01:10 +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
redpanther
49e867f5fc add an auto generated version id
Former-commit-id: df3ad6b08e24e73d957611e8be45e7e8cc717b8c
2016-03-10 06:53:21 +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
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
redpanther
f0c1e63fba update compile howto for making release binaries
Former-commit-id: 5105b3f374221e573290c98990c55f0bd67ba849
2016-02-27 18:06:04 +01:00
redpanther
ea89a85ddb make protoconnection to invalid host less blocking
Former-commit-id: e7a89c87b15fbe9809ec63468b59ecc55c6d3e72
2016-02-25 15:21:25 +01:00
penfold42
3be4ebe6dc clean up formatting
Former-commit-id: dc3a3c7597af42b8fb37f09011d52ebacffd8959
2016-02-25 22:33:13 +11:00
penfold42
c30879017c Merge branch 'master' of https://github.com/penfold42/hyperion
Former-commit-id: eb4dcbd95b97c70fd54a204a1028636237ddda0c
2016-02-25 22:25:19 +11:00
penfold42
eb9db5b358 Merge pull request #3 from tvdzwan/master
updating my fork again

Former-commit-id: 57be49fe965abb5e8f9d1c7ae688b66dd8ae3d3b
2016-02-25 17:48:54 +11:00
redpanther
878538eb50 fix compile on raspi
Former-commit-id: f526a9facebe8027f6bf50b1e54ab21bc1534faa
2016-02-24 23:34:47 +01:00
redpanther
11af47d799 make it compile on raspi
Former-commit-id: 378b2ed1f605d060feb955819fb632424f21a218
2016-02-24 23:30:50 +01:00
redpanther
2c831c1110 add standalone amlogic grabber
fix standalone dispmanx grabber


Former-commit-id: 5ace9bc90a6fe76f5a51ecef95d6e7119d1102db
2016-02-24 16:03:21 +01:00
redpanther
1b6b90df51 bring back hyperion.tar.gz
Former-commit-id: 2e507be1aca9e58076cafc38ca10e09a65cd3998
2016-02-24 15:09:07 +01:00
redpanther
e667be5e0b Merge remote-tracking branch 'upstream/master' into proto_json_forwarder
Former-commit-id: 6eb800d3ed5badd831bd79fc8cfb66115df8ec28
2016-02-24 15:07:30 +01:00