Commit Graph

474 Commits

Author SHA1 Message Date
ntim
f83802f2b1 Corrected type of json array value index
Former-commit-id: f766365fc3be4d1b62c36ce05e8a6d818f73dede
2015-03-07 09:58:48 +01:00
Tim Niggemann
7292922309 Improved color space checks by adding latest model ids.
Former-commit-id: db3b067eabeaf36a2a9ab329614892e79d5089c4
2015-03-03 15:54:50 +01:00
Tim Niggemann
b2b4e17bb8 Renamed lamp to light to match HUE api convention.
Former-commit-id: f9b37989291a32162a41a7549fe4b050b79daba2
2015-03-03 15:46:53 +01:00
Tim Niggemann
ecea6e55ea Added light ids to device config.
Former-commit-id: 601616b0d7509b0e8ebb5226f00af5028fa905b5
2015-03-03 15:45:09 +01:00
ntim
acc0f61e60 Reverted last commit due to new api version.
Former-commit-id: 1b6a204183d43865d42d4ee9f3ecf28408c86a9c
2015-03-02 12:51:50 +00:00
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
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
Johan
c82954d82a Added checking for timeout of effect
Former-commit-id: 7768368d1a386447714610c28c50e3658b6037c5
2013-11-28 14:29:31 +01:00
Johan
cec626f3ae Moved effect static wrapper methods into Effect class
Former-commit-id: bd0c51eb59d98b7ad41fd4e0a178f2d72374c519
2013-11-28 14:15:52 +01:00
Johan
6525e8b479 Added option to enable libudev in build (gives erros on RPi, but need on Ubuntu 13.10)
Former-commit-id: e3654fc4d9ff1e129c21247f1be21ad9599053fe
2013-11-28 11:06:49 +01:00
johan
80cdac2055 Effect pointer feedback added from Python
Former-commit-id: a1175d2d3b4eb0e368a2cbf6a9ac3a0a386ef5bb
2013-11-27 20:15:29 +01:00
johan
d24fddaf21 Python interpreter added to EffectEngine
Former-commit-id: f721f5952efe305d66347d9074ff760baabd2f18
2013-11-26 21:38:24 +01:00
Johan
983ce30331 Removed Lightpack based on hidapi from build (not working)
Former-commit-id: b3882807daf5993073a7af811db50fe3d0a45c28
2013-11-25 16:55:59 +01:00
johan
72acdd655d Python added to build of effect engine
Former-commit-id: 5e8e7e18630b51b4ec51d0f7efed7de2a88cccfa
2013-11-24 18:53:20 +01:00