Commit Graph

300 Commits

Author SHA1 Message Date
T. van der Zwan
6bd7f5d951 Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
Former-commit-id: cdff98227a21a63cdd2d3cddb8002e34f564f272
2013-12-11 22:07:04 +01:00
T. van der Zwan
26fb5c534a Finished the effect argument table (with storage to HyperCon settings)
Former-commit-id: e0e397b9df8c8dc1eb30f0a0fb5d2df0f7187809
2013-12-11 22:05:38 +01: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
johan
f1acf5a9e4 Clear effects if a setColor comes from another source
Former-commit-id: 43084eeee26ee233ac1f0c71d6782b64b154f0da
2013-12-08 17:45:26 +01:00
johan
9872d8f02b Ensure types in effects to avoid integer calculations were floats were needed
Former-commit-id: 84d8b281a544478bf14e88284cb600fdbb11f65c
2013-12-08 16:23:01 +01:00
johan
000117e393 Some small optimizations in the effect engine
Former-commit-id: ed35fc4ff0dc3afa133f584b6625227eb7b615dc
2013-12-08 12:46:33 +01:00
johan
c47ae445dc Mood blobs effect added
Former-commit-id: 4bae584f7fa0c688573ad6051458f99954ded686
2013-12-08 12:46:14 +01:00
T. van der Zwan
3ebcc1f69a Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
Former-commit-id: b7d9accb5ef9449af7ebcb67a8423d8f58480e17
2013-12-06 23:21:50 +01:00
T. van der Zwan
75aff5ded6 Further update of effect configuration in HyperCon.
Former-commit-id: f85efbcafc0822fba3bb6d594182b4a11700360a
2013-12-06 23:20:57 +01:00
T. van der Zwan
950519625f Updated the test config file to contain more extensive settings
Former-commit-id: 3f110bfc1086fb58e094c2ef7184fddc0ca61a98
2013-12-05 21:37:28 +00:00
T. van der Zwan
df1eaaaecc Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
Conflicts:
	CMakeLists.txt
	config/hyperion.config.json
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 8661412367827b888827e762750ab0ed36c806ec
2013-12-05 22:12:56 +01:00
T. van der Zwan
cd02263e25 Merge branch 'master' into add_effect_engine
Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48
2013-12-05 22:11:38 +01:00
T. van der Zwan
3978638356 Merge branch 'multi_colortransform'
Conflicts:
	CMakeLists.txt
	config/hyperion.config.json

Former-commit-id: 99c5d885d2ee876b33143e945a9280a652a6a2ff
2013-12-05 22:09:58 +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
f4ef83b171 Continues work on HyperCon for effect engine
Former-commit-id: d8645606333a09d0c4a5f4aa7ee15cd04e0ee27d
2013-12-05 20:43:22 +01: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
T. van der Zwan
f1e28b3850 Fixed the grabber to produce a limited number of flag based png-files with unique names,
Former-commit-id: dd37349042efa4642761b63d9e57ae39986a8386
2013-12-05 12:57:32 +00:00
T. van der Zwan
c3fadd4ae5 Updated github reference in installation script
Former-commit-id: 5b6baec3702e649926c308076472fd2858b387a4
2013-12-05 06:18:26 +00:00
T. van der Zwan
22c2a823a5 Added new version of dispmanx2png
Former-commit-id: 7a09caaab1f8b187b2070cf0ce3dd2b3a5fd8aaa
2013-12-04 16:55:47 +00:00
T. van der Zwan
a3eef8a274 removed old grabber
Former-commit-id: 49c5ab91d6c33535532bdd199d9646aa8e8f114a
2013-12-04 16:55:15 +00:00
T. van der Zwan
369d5ee658 Added grab count and flags to filename
Former-commit-id: 7abd1934b380cafcb93f861d715bc3981c1132de
2013-12-04 16:48:02 +00:00
T. van der Zwan
787dd2152a Added dispmanx2png to deploy
Former-commit-id: f05d868d8ec12564cc374ff0547d7cf13f20a744
2013-12-04 14:58:00 +00:00
johan
ea1b8315c4 Added a notify that color transforms have changed
Former-commit-id: 28eb82f4e6f646ffcb6ed1b013a9ec60de53e657
2013-12-03 22:56:46 +01:00
T. van der Zwan
42ab46995c Merge remote-tracking branch 'remotes/origin/master'
Former-commit-id: b9f5ce66079c68a8c5d84d0387c194d0cc1f44bc
2013-12-03 21:31:19 +01:00
T. van der Zwan
9602017263 Fixed incorrect cast of update frequency
Former-commit-id: 0d426d020e8a911be3a54adde1a6e99cc074d8bb
2013-12-03 21:29:37 +01:00
T. van der Zwan
3531bab2a1 Started work on adding effect engine config to HyperCon
Former-commit-id: c899c72d15de8cbe0b83f5458a4484eb794a9071
2013-12-03 21:18:58 +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
9954cb3e0d Added parameter value checks to effects
Former-commit-id: daf5d46862d9deeb12df56d262c7a0026a191a25
2013-12-01 15:22:51 +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
ae148afba9 Knight rider effect added
Former-commit-id: a475270b89e3caf156e011ee1e49a745d03b2e3a
2013-11-30 20:30:39 +01:00
johan
1cf16210e3 code cleanup
Former-commit-id: 76226289a660d39fd4571e96f899e8fceebcd39b
2013-11-30 17:46:07 +01:00
johan
4784b4ec42 Rainbow effects added
Former-commit-id: deb3051bfb4209671680ccd1e5fb6fc07a69346c
2013-11-30 17:42:57 +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
poljvd
4afdfc3818 Switch of the preference for static libraries
Former-commit-id: 6b9cf3a9c437fef211a8d8772cf70a9f5788402b
2013-11-30 16:53:14 +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
T. van der Zwan
dc4a41c64a Added test dialog for dividing leds over transforms
Former-commit-id: 0d4549d32c40df3fcbd0c308b249566721445b13
2013-11-27 12:00:05 +01:00
johan
d24fddaf21 Python interpreter added to EffectEngine
Former-commit-id: f721f5952efe305d66347d9074ff760baabd2f18
2013-11-26 21:38:24 +01:00
T. van der Zwan
79f66f7db1 Added the multi color transform to the gui.
Former-commit-id: 96ff1aa60098871a8597f716c0788cc749e149ef
2013-11-26 12:24:48 +01:00