Commit Graph

448 Commits

Author SHA1 Message Date
johan f1acf5a9e4 Clear effects if a setColor comes from another source
Former-commit-id: 43084eeee26ee233ac1f0c71d6782b64b154f0da
2013-12-08 17:45:26 +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 ae1bd7d254 Effects added to configuration file
Former-commit-id: 2ff4700ee5d5bc3a7dd5a29ecd35c1c9dd189873
2013-11-30 12:42:08 +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 c18920b59e Led count info added to Effect script
Former-commit-id: 36e85b2a33a89f3d91605ff1c1466d52779c510c
2013-11-28 14:40:03 +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 983ce30331 Removed Lightpack based on hidapi from build (not working)
Former-commit-id: b3882807daf5993073a7af811db50fe3d0a45c28
2013-11-25 16:55:59 +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
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 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 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
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 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 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
johan 2471bd8753 added flag to have BGR output instead of RGB
Former-commit-id: dbd35d6dd4a84d95e0a034b99843be4949a6e169
2013-10-27 10:18:31 +01:00
johan a3e59f0243 Rewrite of black border detector to fix problems with overscan and xbmc video calibration settings
Former-commit-id: ed6dd4e6872ea69d682096a82e108a3f7e7ca4ae
2013-10-27 09:25:02 +01:00
johan 3939380b5e Fixed bug where the size of te image processor had not been set
Former-commit-id: 21b559899fad808a4878ebe7e0e108d8dc11bcae
2013-10-21 21:13:01 +02:00
johan 293a2e7c19 Added reading the enable flag for the border detector
Former-commit-id: d2cf4df9a7684107b30f9bc01d5aa90b321ce1b5
2013-10-20 22:27:05 +02:00
T. van der Zwan 6756db2417 Added default values for color transform configuration.
Former-commit-id: a0d7c9279d5789ea3d19c8bb3004e1f596c39623
2013-10-17 07:44:42 +00:00
johan 64b9316a04 Added some extra checks to be more tolerant for configration faults
Former-commit-id: 5061311d8116f848f36808f2c77dcff011ceb571
2013-10-16 23:19:40 +02:00
T. van der Zwan d50aec63f7 Fixed incorrect assignment of min and max Y-fractions
Former-commit-id: d02351a62e2ff24d39892536bb1e2da7297a9778
2013-10-16 20:53:45 +00:00
poljvd 62909c05ec Changed default settings of HyperCon;
Fixed configuration mismatch between Hyperion and HyperCon


Former-commit-id: 20ee2dd709e4a02934d5badee60da9d6a6f3c6d4
2013-10-16 17:04:38 +02:00
johan 6db1db3129 Added ProtoServer to the Hyperion server;
Updated the configuration file and schema to be more flexible;


Former-commit-id: 0f670ae6f9512abedf279fe0b014802e31f2f16f
2013-10-13 14:48:59 +02:00
T. van der Zwan 5817c753dc Added framegrabber and bootsequence to schema
Former-commit-id: 9d94f2ad96bb1405015cdaed937abb8ad48b42c0
2013-10-02 07:42:31 +00:00
johan 876100249e Added configuration to XBMC video checker
Former-commit-id: 82a73ca5a31c7152572f06bff50befd26053d8df
2013-09-24 21:45:27 +02:00
T. van der Zwan ecdd7775c5 Fixed doxygen warnings 2013-09-09 20:35:28 +00:00
T. van der Zwan db708da60a Changed the constructor of LedDeviceW2801 (only incl required parameters)
Changed the call sign of the write functions (included const declaration of color parameter)
2013-09-09 15:23:44 +00:00
T. van der Zwan 8441dd51cc Added/Updated/Fixed doxygen comments 2013-09-09 02:54:13 +00:00
T. van der Zwan d2d7265f02 Added doxygen comments 2013-09-06 19:26:58 +00:00
johan 213545afe7 Added config file settings for XBMCVideoChecker 2013-08-24 11:51:52 +02:00
T. van der Zwan 3d02fecc7a Added 'rainbow' boot sequence
Moved color transform to utils lib
2013-08-23 16:24:10 +00:00
T. van der Zwan 6ee94409dc Added blackborder detection and processing to the image processor 2013-08-23 05:09:09 +00:00
T. van der Zwan 046c68574e Added parameters to constructor of blackborder processor
Added blur line removal
Moved blackborder classes to hyperion namespace
2013-08-23 05:08:44 +00:00
T. van der Zwan e2eb5ecd7f Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git
Conflicts:
	libsrc/hyperion/Hyperion.cpp
2013-08-22 19:34:39 +00:00
T. van der Zwan 1e6c361dab Fixed schema from resource in static lib 2013-08-22 19:32:40 +00:00
johan 9fe2fcfdd0 Changed hue in HsvTransform from uint_8 to uint16_t 2013-08-22 20:31:57 +02:00
T. van der Zwan decc41965d Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git 2013-08-21 20:46:43 +00:00
T. van der Zwan 0ff4058ba4 Added wrapper for the blackborder detector to maintain state about detected borders.
Added simple unit test for blackborder processor.
2013-08-21 20:44:17 +00:00
johan ee7a596d53 - HSV transform added
- Moved transform of led values to before the device write so transform changes are taken into account
2013-08-21 21:50:17 +02:00
T. van der Zwan 7c9ac7d151 Added border-ignore to the image-to-leds mapping.
Added doxygen comments.
2013-08-21 15:24:42 +00:00
T. van der Zwan f262a9eb11 Updated the scan-algorithm to only use half of each border.
Added doxygen comments to the header file.
2013-08-21 14:52:03 +00:00
T. van der Zwan 240b118ce9 Added config-schema of Hyperion as resource.
Added constructor to Hyperion using filename.
Added config-filename as commandline parameter for hyperiond.
Added implementation of blackborder detector.
Added test for blackborder detector.
2013-08-21 14:25:27 +00:00
johan 10a566e2ca Get server info implemented for jsonserver 2013-08-19 20:33:36 +02:00
johan cb38baa985 Implemented set transform for the json server 2013-08-19 19:57:35 +02:00
johan 1766212b70 clear and clear all implemented 2013-08-18 13:33:56 +02:00
johan 59e13a2b5f restructured project structure: move projects into sub-folders, split dispmanx-grabber from hyperion 2013-08-17 16:12:42 +02:00
T. van der Zwan 4031a33f04 Added simple test for image2led map.
Added test executable for creating png from frame grabber.
Added test-device for exporting color values of leds to text file.
Updated configuration to match new color transform.
Finished first version of the Hyperion structure (IT WORKS [1% CPU]!)
2013-08-15 19:11:02 +00:00
T. van der Zwan b457c444f6 Changed the image-to-leds map by using offset-pointing.
Moved the image-buffer from processor to dispmanx-wrapper.
Added timeout handling to Hyperion.
2013-08-14 15:02:09 +00:00
T. van der Zwan 7bdd10859e Created first draft of 'hyperion-d'. 2013-08-14 08:54:49 +00:00
T. van der Zwan 2ec9f9202e Deleted all files referencing/using boblight 2013-08-13 10:03:00 +00:00
T. van der Zwan 39b98386dd Added simple QT-based grabber.
Moved ImageToLedsMap from include to libsrc.
Moved instantiation of objects to Hyperion (no JSON required outside this class).
2013-08-13 11:10:45 +02:00
johan 491d6ff608 ColorTransform functions added to repo 2013-08-05 23:49:17 +02:00
T. van der Zwan f6672499f5 Added first quick and dirty implementation of own server (HyperionDispmanX.cpp). 2013-08-01 17:08:58 +02:00
T. van der Zwan a695ab91bb Added simple direct implementation of the frame-grabber using dispmanx (copied from https://github.com/brooc/boblight-rpi/tree/master/src/clients/boblight-dispmanx) 2013-07-31 17:28:01 +02:00
T. van der Zwan 10b5b80675 First working version with some test executables 2013-07-26 20:38:34 +00:00