Commit Graph

281 Commits

Author SHA1 Message Date
ntim
ebb22cdc87 Removed rate limiting from code. Setting framegrabbing frequency of 10 Hz / number of lights is sufficient.
Former-commit-id: 0686a8d18c780038eb017fdf26b5faf4b8053f3a
2014-04-27 18:42:26 +02:00
ntim
88c523518a Initial commit of support for the Philips Hue system.
Former-commit-id: 5b7d802c326151ee96a5b950badb01e94adfe7f3
2014-04-27 12:59:44 +02:00
bimsarck
b619fcda55 add 3D autodetection for xbmc with versions check
Former-commit-id: 6fd0195fdae82ebe5a26a6ce1138164e09e8b929
2014-04-26 00:58:47 +02:00
johan
d102ffd043 V4L2: Fix error with byte order of RGB32
Former-commit-id: ad354369b22d4e85b0b2fbf2d1c33611632d7014
2014-04-15 20:44:16 +02:00
johan
ef6aa76409 V4L2: Fix error with frame size of RGB32
Former-commit-id: ab98c7b87acb7654c40a715ed21c0857c11a30ff
2014-04-14 19:19:47 +02:00
poljvd
dd1adc4e90 Merge pull request #73 from lobocobra/patch-1
Fix error in start script


Former-commit-id: 6a02b865c86befa29e970a7465b256cde5335e95
2014-04-11 19:52:33 +02:00
poljvd
8eb43f0c90 Fix led mapping boundaries
Former-commit-id: 3f41d6b41ceff5c0b81c0041ea185233e37d363c
2014-03-26 16:26:11 +01:00
johan
40185e3c7c Only use center of V4L2 grabbed image to determine if there is a signal to allow some noise at the borders
Former-commit-id: f0c1920666297e06c9d29ef0128e0d3340851251
2014-03-22 16:19:38 +01:00
johan
6fafb23a3f Added functionality to disable the embedded v4l2 grabber when a higher priority source is active
Former-commit-id: 4c0403584093a1fac29d16b502773c3ed11a13a9
2014-03-22 15:35:25 +01:00
johan
c3ba03e0ee Fix v4l2 signal threshold comparison
Former-commit-id: 698a22af752fc42e778e97587938ed6542653bd9
2014-03-22 14:49:24 +01:00
johan
62291adb52 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: 4763dcd03897ee85df068d9f7dc4a5954cbb1a4f
2014-03-09 11:42:20 +01:00
johan
e22c720e68 Add hyperion-usbasp led devices
Remove all WS281x direct UART code (does not work reliable)


Former-commit-id: cd8103058d4ce0cd3280c7a2c5370397a14acf5c
2014-03-09 11:36:46 +01:00
T. van der Zwan
e549e15c3f Fixed call to thinkerforge library
Former-commit-id: e2764d3ecbf7d462ad5d967572b3ea37548fec73
2014-03-08 19:55:23 +01:00
T. van der Zwan
cbd354c18f Merge branch 'bbilger-master'
Former-commit-id: 4d5a4f9f2e867ab10ed0c483ecc3fd72c9be3a8c
2014-03-06 21:56:31 +01:00
T. van der Zwan
fdaa5c0068 Added tinkerforge as local dependency
Former-commit-id: b739eba0676d9c105416d9040ffbe78b2dc4bfbd
2014-03-06 21:48:11 +01:00
johan
5e3cb497fa Add support to set the threshold for each RGB channel separately
Former-commit-id: 5edb206bb2657e78f711f67625fd5f6164d8296c
2014-03-04 22:04:15 +01:00
Bjoern Bilger
2b683fdfaa add support for tinkerforge
Former-commit-id: 8dbd3d915f70ace8d1b27602f0d76a2a546ac043
2014-03-04 20:38:54 +01:00
johan
4888294e03 Reduce copying of data
Former-commit-id: 858ca2331d68458acf87359df87cb25fd051fa30
2014-03-04 20:32:54 +01:00
johan
e790cb87ca Fix embedded V4L2 grabber
Former-commit-id: f9dc759a8fcac8ac95288b12a007e9c78aed82c3
2014-03-04 20:17:38 +01:00
johan
69c64c379a Merge branch 'master' into merge_v4l2
Former-commit-id: 015ff84842dc7a90ff603234ed2bb2a6afd27ab2
2014-03-01 19:47:24 +01:00
johan
2a083f0293 Merge branch 'python3_support'
Former-commit-id: 919c67759aeaf05d181d3a79c9ce180023604a26
2014-03-01 19:32:57 +01:00
johan
e761a30b58 Support for Python3 tested
Former-commit-id: 987571bec31e72c4c5dad9b4ceebbca62de6c794
2014-03-01 19:28:57 +01:00
Johan
e0d405034f Add support for Python 3
Former-commit-id: b6aec954ba0e79ba5697ea8cc305eb9f7d29f332
2014-02-26 18:10:17 +01:00
T. van der Zwan
4b9dfe3e03 Added missing include
Former-commit-id: b35b00821740d48ba073344ac734a5a24c23637e
2014-02-25 20:49:43 +01:00
johan
99fd50805c Added image handler to v4l2 grabber to send colors to Hyperion
Former-commit-id: be6fb4dd8080b3325ba6161f48c093f8a145786d
2014-02-23 22:43:02 +01:00
johan
e58f84d5c8 Merge branch 'master' into merge_v4l2
Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
2014-02-23 21:53:13 +01:00
johan
1a92e6ccd2 Added additional zeroes after LPD6803 device message
Former-commit-id: ba15d222339736e5281e667270ddb37b50d1319f
2014-02-21 22:35:13 +01:00
johan
22472d8f95 Added v4l2 to hyperiond (partial)
Former-commit-id: 06684261ec3ac7bb4e8ff0479e5b1472823648ae
2014-02-21 22:30:34 +01:00
johan
69d6e47328 Create image callback using Qt signal
Former-commit-id: cf469ba01ffd26d286e6fb8d9f081cf126042e50
2014-02-19 21:52:37 +01:00
johan
f0c35071da Move V4L2 grabber code to separate library
Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc
2014-02-07 21:11:50 +01:00
Johan
99b3719cee STL include added
Former-commit-id: b99ccce4ac849914e0528ddf6255d52ba47b09c7
2014-02-07 14:55:54 +01:00
Johan
c5b18d5925 Removed use of qt4_use_modules from build files
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
2014-02-07 09:20:00 +01:00
johan
9dca67c3a3 Removed option from Sedu device as it is reported not to work
Former-commit-id: e3f5ad7be486dba9c7ecd15381a7216ba886054b
2014-02-04 20:47:02 +01:00
T. van der Zwan
b4c49c9ec4 Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: e21a530324abb6af92f4b34abdfbf23313775f4a
2014-01-27 19:16:45 +00:00
T. van der Zwan
0047b0de56 Numerous mods for ws2812b to no avail.
Former-commit-id: 1fda06d3df5e5394ff23277e1361ab1dc35c3205
2014-01-27 19:15:04 +00:00
johan
f5317bc2d9 Moved black border detection code to seperate library
Former-commit-id: 590029949b79689ea05409149677e51b748cb64f
2014-01-26 14:23:08 +01:00
johan
6723c7bf2b Moved test/v4l2_to_png to src/hyperion-v4l2; Added json backend temporarily
Former-commit-id: 8c4e0ef7add8016c522d0b4c6f4df8886b905e36
2014-01-25 17:35:06 +01:00
johan
a7110ec64c Configurable blackborder threshold added
Former-commit-id: 95b77dee2869b41bf556e0e374bea3c5e4534e61
2014-01-20 20:46:38 +01:00
T. van der Zwan
af08b9b5d0 Fixed bug in x86 compile
Former-commit-id: 022ed458e14a9692387ce382dbafb4cec4002c8e
2014-01-18 22:57:47 +00:00
T. van der Zwan
fd6d247506 Slight style changes to the pull of the P9813 device
Former-commit-id: 77892a5cfbcc4793061d518a761931be26ef842b
2014-01-18 22:49:32 +00:00
tostadora
d38ca7de68 add the new driver to the build factory and Cmake
Former-commit-id: 4d52569525137e3aa029ffa271fea076155c5a66
2014-01-18 13:43:39 +01:00
tostadora
fd0a69fb77 untested support for the P9813 chip
Former-commit-id: df7341af27503fffd5be9b0afd9525e52dccbebb
2014-01-16 20:34:56 +01:00
luisc
b31ad73beb add files for P9813 support
Former-commit-id: 66a4d02bf0e2c7f85d2713a906461df11931cfff
2014-01-15 17:54:10 +01:00
T. van der Zwan
890bb426f4 Added doxygen comment
Former-commit-id: d7b41ef9690130c98a6aca901af239d0f1be9e63
2014-01-07 13:24:56 +00:00
T. van der Zwan
7be5684831 Reduced default baudrate for the ws2812b to 2MHz
Former-commit-id: a2b38c6ff7a66da9d252a1801e86b4843bd6b65f
2014-01-07 13:21:19 +00:00
T. van der Zwan
ab0ea90b55 Fixed the open of device until device is available
Former-commit-id: b8700368fadb53784c5838ab046431a7f58f108c
2014-01-07 13:20:53 +00:00
T. van der Zwan
9396583551 Added PiBlaster device
Former-commit-id: d8559d17a5c1496aa5274da2b56a3e7b45a6d1f9
2014-01-04 10:35:11 +00:00
T. van der Zwan
4fe1a8de85 Fixed bug in leddevice factory
Former-commit-id: 260bcab6a2d7c521987667e263dbeae2997ebd1e
2013-12-29 19:43:01 +00:00
T. van der Zwan
9be0aa9715 Modified the ws2812b to use a 3bit encoding speed which allows operation of the uart at slower speed.
Former-commit-id: fb89050546f85f82fb1fcc4cc2d24f95d8f78de5
2013-12-29 19:22:55 +00:00
T. van der Zwan
fd835b5bfb Merge branch 'master' into macos_compile
Conflicts:
	libsrc/leddevice/CMakeLists.txt
	libsrc/leddevice/LedDeviceFactory.cpp
	test/TestRs232HighSpeed.cpp

Former-commit-id: 5583f2f881afd1a9b0c8ec3a52d7d3b54fe1dff7
2013-12-28 08:55:06 +01:00
T. van der Zwan
e84f9eb147 merge remote-tracking branch 'origin/macos_compile' into macos_compile
Former-commit-id: 9e76cece0e44a7b8112b6053ae5da44059bde61f
2013-12-28 08:41:42 +01:00
T. van der Zwan
47d3f475ed Removed bug in Hyperion.cpp and warning in TestRs232HighSpeed.cpp
Former-commit-id: 63e992a3590db5a4e2c8d121b08291588f347ac7
2013-12-28 08:41:23 +01:00
T. van der Zwan
71b8fd4879 Modification and additions to test working of ws2812b
Former-commit-id: 2a7eb3cb67c85a4a4042bd0f1a6ea4d58792b1c2
2013-12-28 07:34:49 +00:00
T. van der Zwan
eaa4b0bae5 Added comments to the LedDeviceWs2812b
Former-commit-id: 4314edf59a776f2424d0066c14ba41c7b3162842
2013-12-25 15:37:59 +00:00
T. van der Zwan
01b5dcdd5c Added Ws2812b specific device
Former-commit-id: 675c8f578de42d12e25162065c0d0381ad0e08f6
2013-12-23 21:58:54 +00:00
johan
3d3c8c93b8 fixed some XBMC checker reconnection
Former-commit-id: ec9c327965597b4b552d939cfb664ca95e2f1786
2013-12-21 17:20:51 +01:00
johan
f598f6e417 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: cd8dcbef62cb2280d5abd9bbe6624bfb2479a61d
2013-12-21 14:36:05 +01:00
johan
78795b9fa8 New XBMC checker functionality: 3D video detection (filename based) and screensaver detection
Former-commit-id: ea95e4ecde3ab9378bdf9c4c60950713947bd0ac
2013-12-21 14:32:30 +01:00
T. van der Zwan
8033615119 Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: dccdee578b5df43c4a8123349397be4a1b54f4c6
2013-12-20 21:02:36 +00:00
T. van der Zwan
b63fdb0333 Merge remote-tracking branch 'origin' into macos_compile
Conflicts:
	test/CMakeLists.txt

Former-commit-id: b91fa41ebbd5ec96f6a98dddc49f86b4b8af15d8
2013-12-20 20:02:02 +01:00
T. van der Zwan
e6fb2ad53c Fixed minor bug (found by clang :-) ) with incorrect ; after if statemtn
Former-commit-id: 12353a7b0cc67e0496c7f28baf063eddfcc973a9
2013-12-20 20:55:23 +00:00
Johan
4f3db5e1c0 Re-included adalight in no-spidev build
Former-commit-id: 0e0d6504b0fe77def6f917ab6cda16a42e3b9bff
2013-12-19 09:29:26 +01:00
johan
7b401f26fb Fix bug in Boblight server (no green and blue values)
Former-commit-id: fa5349a4945025151d81109f22c20c631eb87aee
2013-12-18 21:02:17 +01:00
Timo van der Zwan
6f15e89d29 Implemented compile capability for MacOS.
Former-commit-id: 86e560e0d4f03251ee08a648ffa6fd9a0e01ae78
2013-12-17 22:53:16 +01:00
T. van der Zwan
6cb0fdf072 Added some try-catch to handle device reset
Former-commit-id: 98caccf476fbd703adea1f2c5a19dabb6626e50f
2013-12-17 19:28:57 +00:00
T. van der Zwan
c3bd109a99 Disabled the ws2811 (for now)
Former-commit-id: db2028ab7e588dd88ea5966b15b4f5e2657e79e9
2013-12-17 19:07:57 +00:00
T. van der Zwan
b63753f5dc Moved all devices to separate library and added 'Factory' for device creation.
Former-commit-id: 26cab1b85b00406240689ad9c1018f0307028fe4
2013-12-17 18:50:15 +00:00
T. van der Zwan
9bfaffe93b Merge branch 'ws2811' into device_factory
Former-commit-id: 54b5d4a0b1d19aa5ee31a9f43c20af762f9bdb18
2013-12-17 16:04:10 +00:00
T. van der Zwan
90150b06dc Updated constructor of ws2811 to contain chip configuration
Former-commit-id: 330056ce83edb3e7fa4d36961a52f8d413e289bb
2013-12-17 15:59:25 +00:00
T. van der Zwan
bd6e0f0d2a Added comments, renamed ws2811 options, moved implementation to cpp-file.
Former-commit-id: 102e394d445abed39444dd5f9519ff8bda50d7e9
2013-12-17 09:03:34 +00:00
T. van der Zwan
5377c5adca Updated the ws2811 to allow for different timing schemes
Former-commit-id: b58a9766da9e4f6b2f64683574cddb964aaf3b04
2013-12-16 20:36:54 +00:00
T. van der Zwan
f8fdcb0c10 Merge branch 'add_effect_engine' of https://github.com/tvdzwan/hyperion.git into add_effect_engine
Former-commit-id: 34587c803308d43d2fabf3eed5e19727acf18901
2013-12-13 21:58:17 +00:00
T. van der Zwan
b38a98c3ad Added '*' option to led indices of transform
Former-commit-id: 2a6af2ad4ba9e4577b466ac7401528a6df84ef0b
2013-12-13 21:58:09 +00:00
johan
c751561f2f Removed runEffectScript from Hyperion class
Former-commit-id: 459b9178cc138d54a238ae7c72bb2a52d4bfcc3f
2013-12-13 22:41:24 +01:00
T. van der Zwan
2efd751c76 Removed bootsequence library
Former-commit-id: 5f3f927236a26ae00299a8e7a914e98ace3b328a
2013-12-13 14:55:34 +00:00
johan
de7f340123 Merge branch 'add_effect_engine' of https://github.com/tvdzwan/hyperion into add_effect_engine
Former-commit-id: 505461722259be6884e475a9a0783ba95280b8a6
2013-12-13 00:01:59 +01:00
johan
cf7f66bc40 Make the Json server more flexible for set color commands. Commands can now contain multiple colors which are repeated over the entire string
Former-commit-id: e763f574a8d481a2d21e764d9b9ef2bfd6f1723a
2013-12-12 23:39:17 +01:00
johan
83051543d2 Boblight server: Added a sync after writing led N-1. Added clipping to a parsed RGB value instead of the modulo
Former-commit-id: 9080c04a0f09f536587867912231b29565a31b5d
2013-12-12 23:12:39 +01:00
T. van der Zwan
a74801a113 Merge branch 'paintpack' into add_effect_engine
Conflicts:
	libsrc/hyperion/CMakeLists.txt

Former-commit-id: c8264fed9cdf560da1621700e105b24977c58b7b
2013-12-12 22:06:18 +00:00
T. van der Zwan
155c2a0ae9 Added 'lightberry' device
Former-commit-id: 9ada3a0bb32e694b6e2f4da265421147559a117b
2013-12-12 22:04:41 +00:00
johan
0537fdc741 Moved effect configurations from the config file to effect directory
Former-commit-id: b8db13f25b93a0007adf613f0310a1cfbb6b8224
2013-12-11 21:58:59 +01:00
T. van der Zwan
599afe675f Added first implementation of Paintpack device
Former-commit-id: 0ef7025a3ad67aebb0268e888b26b1d5095e27d8
2013-12-10 19:28:27 +00:00
T. van der Zwan
2b4adce2d4 Added first implementation of WS2811
Former-commit-id: e4fbe7a7f33c28e1f430b5159e6a5cf8c4fc4f9a
2013-12-10 18:59:49 +00:00
johan
f1acf5a9e4 Clear effects if a setColor comes from another source
Former-commit-id: 43084eeee26ee233ac1f0c71d6782b64b154f0da
2013-12-08 17:45:26 +01:00
johan
000117e393 Some small optimizations in the effect engine
Former-commit-id: ed35fc4ff0dc3afa133f584b6625227eb7b615dc
2013-12-08 12:46:33 +01:00
T. van der Zwan
59eb7f788e Merge branch 'master' into add_effect_engine
Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 53467c63b97c7dc370f04357588f7cf1ad0e3ada
2013-12-05 21:01:52 +00:00
T. van der Zwan
f65f546c61 Merge branch 'multi_colortransform'
Conflicts:
	CMakeLists.txt
	config/hyperion.config.json

Former-commit-id: 43d42e4fed479f60333b35bc092f9a55cd2ad8e8
2013-12-05 15:58:53 +00:00
johan
ea1b8315c4 Added a notify that color transforms have changed
Former-commit-id: 28eb82f4e6f646ffcb6ed1b013a9ec60de53e657
2013-12-03 22:56:46 +01:00
johan
068a98b84f Changed bootsequence to use the effect engine exclusively
Former-commit-id: 8953ef5fb4a0dfd12a4d94f69af6dbdd40aa20f7
2013-12-01 16:35:45 +01:00
johan
515ae3e8c0 Added the possibility to set effect arguments over json
Former-commit-id: 4bc2920c04853e549c712ec70492371b14d20877
2013-12-01 14:09:01 +01:00
johan
1ec84005c0 Changed hyperion args variable in module from string to dict
Former-commit-id: ae94dca70590e3ed15e991172b7458cf4298e655
2013-11-30 17:41:38 +01:00
johan
47eaf25904 Clear channel after a effect stopped by itself
Former-commit-id: 98be2adfb9a6b2029fc2fe4dad4999b7c44a0aad
2013-11-30 15:54:47 +01:00
johan
ae1bd7d254 Effects added to configuration file
Former-commit-id: 2ff4700ee5d5bc3a7dd5a29ecd35c1c9dd189873
2013-11-30 12:42:08 +01:00
johan
554bc30c35 Added the possibility for scripts to have an argument string
Former-commit-id: 7c5cec34be56d926edda1c9955dc57de838622f9
2013-11-30 00:28:04 +01:00
johan
121f56ca32 setImage implemented for the EffectEngine
Former-commit-id: 81889cd77125979a06732a8e98e8b398891ec385
2013-11-29 23:53:58 +01:00
johan
3bd1789c42 Fix bug: Only 1 EffectEngine allowed; SetColors implemented for EffectEngine
Former-commit-id: ae8141ebd530b7735ffa7818dc3c690913769070
2013-11-29 23:22:49 +01:00
johan
1b18c7151f Remove LibUDev from build (not needed after switch to shared libs)
Former-commit-id: 6b2045e4831e17c624383e19fbeec44846f3e8a2
2013-11-29 17:45:28 +01:00
johan
fafed8fb09 Merge branch 'master' into add_effect_engine
Conflicts:
	CrossCompileHowto.txt

Former-commit-id: 644f194464bfdcb8adbaced43ec5300f8ec6d62c
2013-11-29 17:39:15 +01:00
Johan
45e4aff5f1 Hmmm something is wrong here with the Python interpreter
Former-commit-id: bfa87ac83ae1518348e5fe1ed77f20475134e1b0
2013-11-28 16:26:32 +01:00
Johan
c18920b59e Led count info added to Effect script
Former-commit-id: 36e85b2a33a89f3d91605ff1c1466d52779c510c
2013-11-28 14:40:03 +01:00