Commit Graph

224 Commits

Author SHA1 Message Date
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
johan
5454ddb375 Added skeleton for effect engine development
Former-commit-id: e1fb69fd4de4b8968075660e3ba7f7add021c152
2013-11-24 16:10:48 +01:00
johan
b2f52aad89 Lightpack device added based on hidapi
Former-commit-id: 4d3d9c01b169991757587a67479094186d52e6e8
2013-11-23 11:14:27 +01:00
T. van der Zwan
ba54f3d8ce Removed unused lines
Former-commit-id: 8e4a62de33bd0622614884c771d8e74177016121
2013-11-22 13:51:54 +00:00
Johan
d1c1e56bd1 hidapi added as dependency library
Former-commit-id: 067d8ed87d0e416fb8518e05344597a00fc263c2
2013-11-22 14:42:02 +01:00
T. van der Zwan
826b964bf6 Implemented the multi-color transform including in hyperion-remote
Former-commit-id: ebdb0688b47d51bd6dccf6dafd580d3ce9ed80a7
2013-11-22 10:48:10 +00:00
T. van der Zwan
958feabf5b Added double as possible type
Former-commit-id: 0caa8d0cb81db4d6592db296cb1f775e91efce50
2013-11-22 10:47:05 +00:00
johan
409b800a8e Restructured Lightpack device (fix bug concerning the lifecycle of the libusb context)
Former-commit-id: ef7187e9117d75208e4d79b9f64839f88044a3c2
2013-11-20 20:54:04 +01:00
T. van der Zwan
ddc7bdd331 Fixed use of 'enum' as type is schema
Former-commit-id: 017cfe70198b37a05b9a852b30d783e239bf604b
2013-11-20 09:07:01 +00:00
T. van der Zwan
eaec09f029 Fixed MultiColorTransform creation for 'hsv'
Former-commit-id: 6963e2d022c38f31fcb5371ac5bd9057c4eaf088
2013-11-20 09:06:41 +00:00
T. van der Zwan
b967f51f38 Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git into multi_colortransform
Former-commit-id: fb4ab6331b5428bd34f5cc7ac7eba3fade5ef7dc
2013-11-20 08:26:09 +00:00
T. van der Zwan
ba2939f9ec Added multi colortransform (not working yet)
Former-commit-id: 691a0a9d83e57e00d305cf18718cab05156c2dce
2013-11-20 08:25:49 +00:00
johan
d60cca9e20 Added flag to disable dispmanx from build
Former-commit-id: 6630f588a739a08601c0db79abd2cdf0b1c1839c
2013-11-19 23:02:41 +01:00
T. van der Zwan
c8ce23e652 Renamed ColorTransform to RgbChannelTransform
Former-commit-id: 390b832ba2d463710d4a063692f00b83a8c6c8ad
2013-11-19 20:17:59 +00:00
johan
f5f1019f72 Added check to only detach kernel driver in LighpackDevice when it is active in the first place
Former-commit-id: 99e68e88571510bfb07a82942ee3f975f3f86a7f
2013-11-18 21:13:32 +01:00
johan
631b90486f Multi lightpacks device added
Former-commit-id: bd78457104c2b5b219b5a7718cc79777db9234e8
2013-11-17 15:52:11 +01:00
johan
936ff85729 Added more debugging to Lightpack device
Former-commit-id: b1451c4ca1c6a085abc582d40919d8bd27614456
2013-11-17 10:28:59 +01:00
johan
8b127674dd Lightpack code changes
Former-commit-id: cfc9fb0bf0cb81bd2ce2c6af1c8f2be64b2e14a8
2013-11-16 10:38:03 +01:00
johan
e1e88ba2cf Close Lightpack device handle after error; Changed retrieve Lightpack firmware version call
Former-commit-id: 7aa38d40e9918894e602519366ac1b28d3d533a2
2013-11-15 18:16:00 +01:00
johan
153e75555d Changed default grabbing flags when no xbmc checker is present
Former-commit-id: 9fabc0e570d44b301646c93b355042e1747a9183
2013-11-14 19:51:10 +01:00
johan
6d47b4c66b added timer to LedDeviceAdalight to send color data at least every 5 seconds
Former-commit-id: 6b77588d3ce83ab32ab3c62e7345c7aa11f9c344
2013-11-14 19:04:17 +01:00
T. van der Zwan
4ea48e2ed3 Changed grab flags for picture and audio
Former-commit-id: ca933aa5b8cb2bb2ed85b0c0005f1e266368e89e
2013-11-14 09:05:57 +00:00
johan
9ff76ad97e More specific error message added
Former-commit-id: a754822d72a7a7fbf68b923423cc9beb5eb74194
2013-11-13 23:48:00 +01:00
johan
6f44dc8f84 Added more print statements
Former-commit-id: 6c3a6662097bfe25b11bcf3c057cb267569f01ca
2013-11-13 23:29:19 +01:00
johan
4b98dd6e72 Code formatting and comments
Former-commit-id: 80b42aa9905d560aff1c1052e3bcd26eddb0821b
2013-11-13 23:17:49 +01:00
johan
979d6e79ad Code formatting and comments
Former-commit-id: 4900d45cead5de8a407fd1bf2962bd7efd273dac
2013-11-13 23:16:09 +01:00
johan
fa1157c3ee Offset 1 instead of zero to accomodate for the command byte
Former-commit-id: 1387556d239554f935708f48e7cd2a476ed9b6f5
2013-11-13 23:12:30 +01:00
johan
d9a66b3e6d Added serial number parameter to lightpack
Former-commit-id: 38e7b0b32119c6b2d62d5f07d48156cbd8052306
2013-11-13 23:10:11 +01:00
johan
6c33d55468 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: 9d968e9388591f446e548c14ec5fcf58d1aba01b
2013-11-13 23:04:07 +01:00
T. van der Zwan
ef6ac97f84 Renamed ldp6803 to lpd6803
Added Lpd8806 device


Former-commit-id: 716cd60d1ac750fc2feca6f3621b20196b52a84e
2013-11-13 20:42:18 +00:00
johan
12c925d77f First Lighpack device version.
Former-commit-id: 2133e13ed421d363fa28d3f765607e455088618b
2013-11-13 20:15:53 +01:00
T. van der Zwan
ddd2e26475 Chnaged dispmanx flags for grabs during audio of photo
Former-commit-id: e9aad49b433c39daac9f8c75b28ba544d7ab40e9
2013-11-12 13:45:42 +00:00
T. van der Zwan
eab2389da3 merged adadevice with new color structures
Former-commit-id: 6cda6814a6e0edc3ef2692caa8370b496c6aaaac
2013-11-12 06:52:00 +00:00
T. van der Zwan
5225f1149a Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: a5e2aa216f14a7916ce4c36fa958baf3d80608a2
2013-11-12 06:34:00 +00:00
johan
5c71e626c7 Adalight device added
Former-commit-id: d9b9a146b39ba83fada52de2b6076dde7e44b151
2013-11-11 21:07:24 +01:00
T. van der Zwan
dd16af0df5 Changed RgbImage to template based Image (with template for pixel type)
Former-commit-id: ef02f164eaf3c2f9dd552c1c17b525cf6eed499c
2013-11-11 09:00:37 +00:00
johan
c77f45f221 Protect Boblight server against clients sending too much data
Former-commit-id: f3a575f71425da25fbaad68c48dcec746a50def2
2013-11-09 10:33:16 +01:00
johan
7300413015 BoblightServer added
Former-commit-id: deb3479ee673d763ad2e5451fcd35a0febedb4f3
2013-11-08 22:18:10 +01:00
johan
212ce35861 Created release with sedu device
Former-commit-id: c541a2d8f04572c7cf493a112ebb283e561afd99
2013-11-05 21:32:21 +01:00
johan
58b8bbe8cc rename of lpd6803 device to fix typo
Former-commit-id: 4c2b92f51d1903122211e3e91ce876697ea57526
2013-11-05 21:11:31 +01:00
T. van der Zwan
ecaf665d85 Added SEDU device to option for led-devices
Former-commit-id: b14c47c34f7dfc99cd81b1d15fcc3610d2058c13
2013-11-05 16:21:20 +00:00
T. van der Zwan
c787241747 Moved all device to seperate directory
Added 'sedu' device based on RS232 device


Former-commit-id: 918cbde65a4a14f532c2e08e104745715c3fdd37
2013-11-05 16:18:04 +00:00
T. van der Zwan
cb2cc5c259 Removed incorrect file-headers
Added rs232 library
Added abstract Rs232 device


Former-commit-id: 9a2830f71376f0716edea594afc526018a530fa3
2013-11-05 15:46:17 +00:00
T. van der Zwan
263bf93e0f Fixed led-ordering based on their indices
Former-commit-id: 835a9cede81fb717bf4862e318b673e9ebfb7cb5
2013-11-05 15:05:00 +00:00
johan
fc1e4bc6c8 Added the option to specify the color byte order
Former-commit-id: f911d0f26c25345bbe5e9014fbc31568b7386f08
2013-11-04 20:52:57 +01:00
johan
e5395951a5 Fixed endianness issue in LDP6803 device
Former-commit-id: 6762890065d791f3ad5f24526f2f735822b451e1
2013-11-02 19:30:19 +01:00
T. van der Zwan
491dcc706b Finshed the Ldp6803 implementation (I think)
Former-commit-id: 856d9575923134ded63cded746cb4125b78e0623
2013-11-02 05:56:14 +00:00
T. van der Zwan
518ca910b7 Implemented the Ldp6803 device.
Former-commit-id: e38f7d697fbf137d89bfefb1503848a771f51dad
2013-11-02 05:51:41 +00:00
T. van der Zwan
f158236910 Created first implementation of SPI-dev abstraction and added Ldp6803 as derived led device.
Former-commit-id: 4701ed1ffe72accf3be818c73b95fb025c72149e
2013-11-01 22:48:39 +00:00
johan
3e4c38b57a Added smoothing to the Hyperion configuration
Former-commit-id: 85e27d54841de5030199dd7f70bb0f29250abb6a
2013-10-27 21:06:35 +01:00
johan
0b08341ef1 Initial commit including a linear color smoother
Former-commit-id: ffc00087996324f989e56dc5c95ab734c7c86dfa
2013-10-27 18:04:37 +01:00