Commit Graph

369 Commits

Author SHA1 Message Date
ntim aceb29c8c4 Merge remote-tracking branch 'upstream/master' into support_for_philips_hue
Former-commit-id: 86d827f2672adad200399baf4486f0d7ce3b7480
2015-03-02 12:48:18 +00:00
T. van der Zwan 9f5caacc75 Updated the way colororder is configured per led
Former-commit-id: 2a77b551c5b504f4ce9b0a179d4c20eaf6128f6b
2015-02-23 16:11:33 +01:00
tvdzwan e8ae9c36e6 Merge pull request #238 from sweetpi/master
Added rgbOrder config for each led

Former-commit-id: 91881cdbe14a9fc33e12e91ef15b52faa66a6047
2015-02-23 15:53:44 +01:00
T. van der Zwan 888239e910 Fixed minor issue and removed unsued includes
Former-commit-id: 87c86459a7a1be1705a837ee0f73e88c8de2ae53
2015-02-23 15:53:05 +01:00
tvdzwan 0823ba4513 Merge pull request #257 from pckhib/patch-1
Update LedDevicePiBlaster.cpp

Former-commit-id: 8ca0054753652bddd61dde03bfa3ce143ba4649a
2015-02-23 15:38:56 +01:00
tvdzwan b1f62cca40 Merge pull request #253 from aufano/master
Carsten Atmolight support

Former-commit-id: a1a3c245a037e3d9604cff6c5a228e9f2842a7fb
2015-02-23 15:38:02 +01:00
pckhib 2076675e8d Update LedDevicePiBlaster.cpp
updated for the new version of pi-blaster

Former-commit-id: 668084eefcb05f58e1f2e0ef6fc97ead2e540a65
2015-02-09 23:11:59 +01:00
ntim 4f7524d8de Small performance improvement if off on black is true.
Former-commit-id: dc69a21681432bef540c396847d64b07fa0bbb09
2015-02-05 09:50:05 +01:00
aufano be3f3a968c Carsten Atmolight support
http://ca.rstenpresser.de/index.php/atmo-main.html

Former-commit-id: cd543a063af50455e3e92fc9e89c2503bef95188
2015-02-04 21:49:33 +01:00
Tim Niggemann dfc2e6bfb5 Default setting of transition time to 100 ms.
Former-commit-id: c0981e09494c59456f45325cdcacf9bfa6e26c99
2015-02-01 15:56:51 +01:00
Tim Niggemann 9d506b888d Added config options for username and transitiontime
Former-commit-id: 2ae179c670fda838115d985f40d970e10ef002ef
2015-02-01 15:29:40 +01:00
Gamadril 3fd20ec5fa - refactored framebuffer grabber to use ImageResampler
- added OsxGrabber for OSX
- added binary for imx6 (cubox-i) and updated install script


Former-commit-id: 2c55e292c842c67e54ce36bd91e4f6303b98687a
2015-01-24 23:42:22 +01:00
poljvd 3488f23603 Update cross compile info
Former-commit-id: c604de9bc9e0dddc48abddccb93118b6568b6a85
2015-01-21 12:57:28 +01:00
Oliver Schneider b86e08cf0a Added rgbOrder config for each led
Former-commit-id: 9c9f49d61b24267fe9ebe566600cdc42c78c1ab6
2015-01-20 21:16:55 +01:00
Gamadril c4337ca2b3 fixed build dependency
Former-commit-id: 34682c499f8b7f951c28f647f482ad800ee69ae8
2015-01-18 00:58:23 +01:00
Gamadril c89e1fcefa Added frame buffer grabber support
Former-commit-id: a73767a1abb2cac977492bd8c6cc593fb21840e1
2015-01-18 00:04:45 +01:00
T. van der Zwan b1c1645790 Fixed missing build of AmbiLed source
Former-commit-id: bd6ad9ef5cd3df051f73f5650531c88af1d5b57e
2015-01-05 15:12:47 +01:00
T. van der Zwan 1bb93da59b Added support for AmbiLED-HD device (http://www.ambiledhd.com)
Former-commit-id: 60ec75898a04b5ca993242d0aef6edc01997fe82
2015-01-05 14:28:21 +01:00
poljvd a041941e7a Fix build with embedded protobuf library
Former-commit-id: 5c60566f2d4a9c65fc0fe677841a34d7ef73549a
2014-12-20 20:15:04 +01:00
poljvd f6ce35813a Merge branch 'add_x11'
Former-commit-id: d80efce3aa0413e4f63e9171dab438d03db9021c
2014-12-17 19:09:19 +01:00
poljvd 2b6d485ea7 Use ImageResampler in V4L2 grabber
Former-commit-id: c6ec92c17b07444a49a303cdced6f59347f98f76
2014-12-16 21:30:08 +01:00
poljvd 62b14c5077 Merge pull request #209 from thigg/master
fixed assembler instructions to work without optimization

Former-commit-id: 8bbb604daaffc4efa7f21cb2dd9487f25fa85bca
2014-12-15 19:47:32 +01:00
poljvd e608b11caa Extract ImageResampler from X11Grabber
Former-commit-id: 63e95fa85fc0ef5a66f6eb8b396cf4b6370cf5dd
2014-12-14 14:26:59 +01:00
wayland 63d0f6652e Rewrote the class to make it work with apa102 led strips
Former-commit-id: 9f63b95fb635b15e550d9368c7c8dbc632572bc5
2014-12-11 13:48:14 +01:00
thigg ac42b72253 fixed assembler instructions to work without optimization
Former-commit-id: 788583de5e7614a5450a533702e75baa5bf2f034
2014-12-11 14:30:36 +02:00
wayland a4bcdcc10a Added APA102 device to factory
Former-commit-id: 4d7c8889aee2ca7b75c0e0ec90e9b5833257324d
2014-12-03 18:41:44 +01:00
wayland bdbe6a8c85 Added APA102 to cmakelist
Former-commit-id: d495d538a46dc19e535a3ae0e2c1069954fdf963
2014-12-03 18:36:18 +01:00
wayland 4b716a9e2f Added the apa102 engine class
Former-commit-id: 03e11a19aed2ae782c5d134e1f4fcf9faea1969e
2014-12-03 09:35:10 +01:00
wayland 205fe8ab66 Added APA102 device to factory
Former-commit-id: ecea592ddf97bdcc2c54d12af194c15d6c09966a
2014-12-03 09:34:48 +01:00
poljvd bf7ddf5991 Fix output size of X11 image after deciamtion
Former-commit-id: c6120c7c4116f855405f65c21b0c0f5e1e443b6b
2014-12-01 21:27:33 +01:00
wayland 6859841c3f Added APA102 Led Device headers
Former-commit-id: bd9a5d1216d37275bcb807e19d043e1ea1e3ead6
2014-12-01 10:04:27 +01:00
poljvd d89f504d83 Refactor V4L2 and X11 grabbers to share more code
Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
2014-11-21 21:24:33 +01:00
Gamadril 9168ee5098 code refactoring
Former-commit-id: 157f424e83c58fca4ed1e3283899cbbdfadcffe1
2014-11-08 21:01:46 +01:00
Gamadril 6a9e75243d Update JsonClientConnection.cpp
small code cleanup

Former-commit-id: 82029cd23f77b393b2e6688ed6e65424cb676452
2014-10-26 10:55:40 +01:00
Gamadril bbc6fe389d Added very basic WebSocket support to json server
Former-commit-id: 5d62331eecdbd10287ba0520bbb06814bca0bca7
2014-10-25 22:35:53 +02:00
T. van der Zwan d1f043f233 Fixed switch-off on shutdown
Former-commit-id: 25438c11a3fdb14c89f946d02893a257aada67ea
2014-09-30 21:00:42 +02:00
T.van der Zwan 654f6416ea Updated proto-definition due to changes in newest protobuf library
Former-commit-id: 2e5a2de1a05bdd5c5ccc8668d6a6d050b5fbb1de
2014-09-26 18:27:30 +00:00
T. van der Zwan 11d29d02c5 Added debug statement to standard out
Former-commit-id: daaeb2a07931942bbeaf272775da81902169ad04
2014-09-25 22:31:20 +02:00
T. van der Zwan fbe8e0ad4e Added some code comments
Former-commit-id: 58c1ec1fd2dcc210b6d162d1e8b6c40a502f30fa
2014-09-25 22:05:01 +02:00
T. van der Zwan 30cc14d9e8 Added delay to smoothing and changed the switch off to continue sending black
Former-commit-id: fa5a7f14b0fdf3a0a74169cfefbf5b625330b753
2014-09-22 21:28:38 +02:00
T. van der Zwan b4d7410520 Started on adding a configurable delay in case leds are ahead of picture
Former-commit-id: 9eedf27c9cb51d05fca2ec2f0f9edae4726ac54d
2014-09-22 20:19:58 +02:00
T. van der Zwan 8ad0e88e2f Minor reformat of code to match hyperion-style. Added ws2812b as option to disable for devices without dma-pwm
Former-commit-id: 579f4426285fb537706a22af446f5280748f2ab7
2014-09-19 16:37:58 +02:00
T. van der Zwan c0f0837b92 Added missing include
Former-commit-id: 1cf2f19a0a7e3fc9bef55979ce7e3221f3e66fec
2014-09-19 16:20:01 +02:00
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