Commit Graph

326 Commits

Author SHA1 Message Date
tvdzwan f33fcfffc0 Merge pull request #165 from kammerjaeger/master
Support for WS281b

Former-commit-id: 2f51f5fe6ac27a99896d15e7dabb9efc92916204
2014-09-19 16:14:46 +02:00
David Brodski f41a0fc977 removed benchmark
Former-commit-id: e716fa337c4995a258c34200e14fd56ee8dae05c
2014-09-19 03:18:26 +02:00
David Brodski 0e55169f42 fixed strange bug with last led and pwm needs one more int
Former-commit-id: c5e20fed3d84c19032afb64e66a5934fc3db701c
2014-09-19 03:16:15 +02:00
David Brodski 961bef22f5 Assembler version 1: use roll and bit clear instructions
Former-commit-id: 4f27d34dd63c635a65ee33f2c368978d5b162974
2014-09-19 02:00:32 +02:00
David Brodski d41857e626 Pre initialized bit pattern to speed things up
Former-commit-id: 08dc5ee53854997060af0257b5cff324d29f87b5
2014-09-18 23:41:46 +02:00
David Brodski 5ff05d58fd fixed potential buffer overflow
Former-commit-id: 2c9ea902fd563b909e6d0457c4957f80be86f93f
2014-09-18 20:56:32 +02:00
David Brodski a92967fa7c Added benchmark define
some code cleanup and speedups


Former-commit-id: 8254c34e1d10c598e127f46635ae6bafcb97087a
2014-09-18 10:28:23 +02:00
David Brodski 39ddfca5c0 Rename WS2812s to WS2812b (spelling error)
Former-commit-id: 83c92c9ef99d45b8683860f199a14952c05d0f5d
2014-09-17 21:20:36 +02:00
David Brodski 61da05e108 Moved defines into cpp file make include of h file smaller
removed not needed includes
fixed warnings (removed some ascii art for that)


Former-commit-id: 71b16cf7e73a9463462820238d12069e4d1e6d6e
2014-09-17 21:12:46 +02:00
David Brodski 042d4b6e91 Added LedDevice for "ws2812s" leds
To activate: use led device "ws2812s" in the hyperion configuration


Former-commit-id: 0b5ee38679fe353f43bb4a347882d056ca237128
2014-09-16 00:17:23 +02:00
Floris Bos 3c65b82ac1 Allow disabling PROTOBUF support
One dependency less for users that only use DISPMANX grabbing


Former-commit-id: 24ea0480e3798bab692e75d82ddb9f5eccfa03c5
2014-09-08 16:16:02 +02:00
T. van der Zwan f12bffb44f Merge remote-tracking branch 'origin/master'
Former-commit-id: b4eb2e7a1c78d107cb7bc69a04b1cff694f6e308
2014-08-19 10:54:39 +02:00
T. van der Zwan 089120fe9d Fixed error message for setImage
Former-commit-id: db0c38d865463048c6bb039c173e02ea685ae36e
2014-08-19 10:54:15 +02:00
ntim 507a237f47 Merge branch 'master' into support_for_philips_hue
Conflicts:
	libsrc/leddevice/LedDevicePhilipsHue.cpp
	libsrc/leddevice/LedDevicePhilipsHue.h

Former-commit-id: 5f0b05cce12ca5c42ac2cdd94b9418d6eaef0f57
2014-08-18 17:08:21 +02:00
Johan b6fa306df7 Fix schema requirement for json transforms (use numbers instead of doubles to allow integer values for zero and one)
Former-commit-id: f65ea81c217bbf621184152fd913d58247d9b4db
2014-08-01 10:13:40 +02:00
ntim dc2e173f04 Remove couts.
Former-commit-id: fdc93ea33644313277bd4b01c14e4a63396c077f
2014-07-16 20:46:59 +02:00
Tim Niggemann dbd7a86665 Moved color logic to lamp class.
Former-commit-id: f450eebc8c9d0f29dc053f2115dac6576a5fa591
2014-07-16 20:22:37 +02:00
Tim Niggemann f0d2c15aeb Fixed QString string formatting, added safety check in case the connection to the bridge might be lost.
Former-commit-id: fb1f5fd21cd3873fc1b92d763c682e75f345ab42
2014-07-16 16:45:45 +02:00
Tim Niggemann f76b5ffbd8 Added author tag, added missing return statement.
Former-commit-id: 4d0a29a8ba3d33de6f86b90a4eaf2f0de12ea59a
2014-07-16 16:21:11 +02:00
Tim Niggemann b055578759 Added config switch for turing off the lamps if the color black is written.
Former-commit-id: bb4f4bc74c035c10a8dc678a11052ea276ea0149
2014-07-16 11:49:34 +02:00
Tim Niggemann fcb2ff6667 Renamed method parameters.
Former-commit-id: e10705dd6d93f5c1398a213583bbe349833d2648
2014-07-15 12:08:27 +02:00
Tim Niggemann 7e049273a8 Comments.
Former-commit-id: bb4573afa8072bf03a3ae7c1b8ece721c7ea91ff
2014-07-15 12:06:26 +02:00
Tim Niggemann d2542142be Get the light id from the lamp object.
Former-commit-id: 7120af8551c185979c94b2a186f09c883784a882
2014-07-15 09:59:01 +02:00
Tim Niggemann 4af2b11d8f Get the light id from the lamp object.
Former-commit-id: dc7aa992386c2511261614a2a8fe3ccf15d9a591
2014-07-15 09:58:29 +02:00
Tim Niggemann 67970fce08 Created HueLamp class holding the color space as well as the original state and current color.
Former-commit-id: 129c34f6008a68bca6cafb63eb0c0ad6a37f5179
2014-07-15 09:55:58 +02:00
Tim Niggemann 9269b0a1e3 Removed saving of model ids. Save the corresponding color triangles instead for speedup.
Former-commit-id: 72e6031234e12a488a5425e80e73dc8b03ec364f
2014-07-15 08:54:40 +02:00
Tim Niggemann f5a8174783 Implemented color triangle calculations.
Former-commit-id: dbde6635077a82ace5f4ed1fdf89458a28e7bf05
2014-07-15 08:51:07 +02:00
bimsarck c1998da2ec Fixes saveState feature
Former-commit-id: 8158c77521727bf74875a5998c803212aece0645
2014-07-13 13:48:49 +02:00
bimsarck e6d39b047c Remove unnecessary code
- reenable timer


Former-commit-id: b1a175a1f1e5c3a7da753240030815252b1b22bb
2014-07-12 14:56:39 +02:00
bimsarck c4c7ed0331 Improved philip hue device:
add lamp types autodetection
add full xy-Colorspace implementations
reduce http requests to the hue bridge. This prevents DDOS -> 503
add color black -> lamps off
save state is temporary disabled


Former-commit-id: 5a0328fe80a06a9f670c5190190e239857cbd15c
2014-07-04 12:11:37 +02:00
Gamadril 3135b89255 Update LedDeviceTpm2.cpp
Former-commit-id: 8d51eb00044460002e29687468786e3056afd0bb
2014-06-18 13:49:27 +02:00
Gamadril 1d046ab35a Added support for tpm2 protocol. One frame used for all LEDs
Former-commit-id: 5b2ed33a50d90999c6f9508ba3782ad73838fb56
2014-06-15 02:19:09 +02:00
ntim 853d002894 Timer to restore light state properly implemented. Lights are not switched on after state has been saved.
Former-commit-id: 04959ea3731eb7de9f59b80a789f03cfeb2d4ba3
2014-05-07 15:22:13 +02:00
ntim 32f09dcc24 Merge branch 'master' into support_for_philips_hue
Former-commit-id: ee3816fde708fa2f9f9e6ad50ec1e6d2ff552b23
2014-05-07 07:44:11 +02:00
johan d50b46bda2 Fix integration area = 0 for a led
Former-commit-id: b365c4c9605a84ea6b7f88043f6f9c70b7122931
2014-05-06 22:02:40 +02:00
johan 1e21602798 Changed connection delay to something non-blocking
Former-commit-id: b313005a29cb42eb6839060bc4c48e4cbd927d3b
2014-05-04 11:52:25 +02:00
johan 3eb29146dd Added a possible delay after connecting an Adalight device
Former-commit-id: 756fae2ebc57455bf6360dc96bf2ae5469460172
2014-05-04 11:31:13 +02:00
ntim 8cca280fdc Implemented timeout for restoring original state.
Former-commit-id: 925b063aba1a859b592ead9b75ce67d90fb81e28
2014-05-03 10:12:41 +02:00
ntim 9220c346bb Blocking PUT requests. Only save the brightness and [x,y] state of the lights.
Former-commit-id: 5887fdf1b350172dcdd52c46bd8da74dab521444
2014-05-01 00:02:10 +02:00
johan d5597d55a7 Disable the blackborder detector for effects
Former-commit-id: 2d4660f48c17977aabff52b7cbbc8d832b216f00
2014-04-30 22:53:05 +02:00
johan 8d75a57f18 Cleanup of XBMC 3D checker code
Former-commit-id: 26acf7dceb3e26a2e59af82736dec9fdf09c26d5
2014-04-30 22:46:26 +02:00
johan 9da97c0698 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: b83c6850f6086f2d3e88bc94116f1b4f8ef61d0c
2014-04-30 22:39:51 +02:00
poljvd 019374f57d Merge pull request #94 from bimsarck/master
add 3D autodetection for xbmc with versions check

Former-commit-id: 683e152b5d419442a094cb2eee51b341e08b8f2d
2014-04-30 22:39:40 +02:00
johan 1e66045d3e Added author tag for Philps Hue device
Former-commit-id: 6fc5dc0ac7177ddd23e601c8ca1f65981ff0e778
2014-04-30 22:38:59 +02:00
Tim Niggemann ab5e17e105 State of all lights is saved and restored on switchOff().
Former-commit-id: 1ee26e8c01d90456424c1b5ea3f113dfd0ff6525
2014-04-28 14:32:37 +02:00
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