Commit Graph

146 Commits

Author SHA1 Message Date
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