Commit Graph

319 Commits

Author SHA1 Message Date
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
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
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
f4ef83b171 Continues work on HyperCon for effect engine
Former-commit-id: d8645606333a09d0c4a5f4aa7ee15cd04e0ee27d
2013-12-05 20:43:22 +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
515ae3e8c0 Added the possibility to set effect arguments over json
Former-commit-id: 4bc2920c04853e549c712ec70492371b14d20877
2013-12-01 14:09:01 +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
fafed8fb09 Merge branch 'master' into add_effect_engine
Conflicts:
	CrossCompileHowto.txt

Former-commit-id: 644f194464bfdcb8adbaced43ec5300f8ec6d62c
2013-11-29 17:39:15 +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
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
T. van der Zwan
602afa14f6 Fixed json generation of multi-colortransform
Former-commit-id: ecd587d1e623e34b8841d634b2217ef350e25210
2013-11-25 12:26:20 +01:00
T. van der Zwan
336647b95b Added multi-color specifications to the model of HyperCon (not GUI yet)
Former-commit-id: 3b3f38f1514bd2925e043333555461b3af1f7d88
2013-11-25 12:16:16 +01:00
johan
5454ddb375 Added skeleton for effect engine development
Former-commit-id: e1fb69fd4de4b8968075660e3ba7f7add021c152
2013-11-24 16:10:48 +01: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
poljvd
077f88a123 Fix typo in HyperCon knight rider
Former-commit-id: 43ce527d623d31c71f9b2edb9fc7aae6428fa841
2013-11-20 12:54:19 +01:00
poljvd
7e4466d2bf Fix type
Former-commit-id: 7b900bee8a5383e878cc41b6b3736607abd63d48
2013-11-20 12:48:34 +01:00
johan
d60cca9e20 Added flag to disable dispmanx from build
Former-commit-id: 6630f588a739a08601c0db79abd2cdf0b1c1839c
2013-11-19 23:02:41 +01:00
johan
adea0895c4 Fix type in generated comments
Former-commit-id: d7abb9ee11880d0aface26148b371ecd3364f491
2013-11-19 22:02:47 +01:00
johan
bfba00432f Fixed Typo in boot sequence type
Former-commit-id: 5bed36ed38f9dd1b3954dae665974e3833eab86d
2013-11-19 21:57:35 +01:00
poljvd
eb8903fb09 typo
Former-commit-id: ab0b015013dd3df59e1497923da673173b0485f8
2013-11-19 21:55:39 +01:00
T. van der Zwan
6136f9d1e9 (re)Added the total led count to the simulation image
Former-commit-id: b91b7063d70b33b543bfeaefd334253d9fed4688
2013-11-17 21:06:30 +01:00
T. van der Zwan
632275396b Add hiding of progressbar when finished creating image
Former-commit-id: b5732d9ac6fbcead8d4127e2b18c446fd7f0e0a6
2013-11-17 20:56:47 +01:00
T. van der Zwan
28f07ec739 Changed border simulation ratio to fill the border
Former-commit-id: 2d7cfee11127d09c1a71d84dab2d03f3cf003013
2013-11-16 20:53:47 +01:00
T. van der Zwan
2879f44f08 Updated led simulation (little bit faster and behind a worker to keep gui responsive)
Former-commit-id: 45d6a3d0243f5fb3a0bbcb03f2276e13b683c182
2013-11-15 22:26:31 +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
c327f78d30 new devices added to HyperCon
Former-commit-id: 51f564f6375d377144787675cfd33c511a363a80
2013-11-13 23:33:17 +01:00
johan
fe1dd23768 viewpng and writeconfig removed
Former-commit-id: ee46218e71df3090336754353566e7b659b3a801
2013-11-13 23:07:16 +01:00
johan
12c925d77f First Lighpack device version.
Former-commit-id: 2133e13ed421d363fa28d3f765607e455088618b
2013-11-13 20:15:53 +01: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
15ee87ad29 Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: 8bdad10e32693b63120e043eef851f266f196c65
2013-11-11 09:00:51 +00: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
0a6706e177 Fix bug in hyperion-remote: --value not working
Former-commit-id: 965abab92925062c048bba4c2c6efeedab1c1a92
2013-11-10 14:01:46 +01:00
johan
90f1f282e2 Fix generation of color smoothing parameters
Former-commit-id: 44b606e833451ee5795d92fd0bef3acb2dd8d47c
2013-11-09 11:36:08 +01:00
johan
b56a15b012 Fix config generati
Former-commit-id: b125333e82df891b516fbaf6c3e0f599a7699dd6
2013-11-09 11:19:26 +01:00
johan
0f8278cb79 Fix config generation
Former-commit-id: c908b74ba8bd8dfc3aa2a6f31d97bda28c343447
2013-11-09 11:17:23 +01:00
johan
67f85de8c9 Fixed some layouting issues; Fixed type in device type name
Former-commit-id: d9bcb90ac57feac2e540bb9315f295bc678a854a
2013-11-09 11:06:46 +01: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
39b7f1d52e Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: f87807d246e0c0fde14e2ef97fcec0144d022ca8
2013-11-08 22:18:25 +01:00
johan
7300413015 BoblightServer added
Former-commit-id: deb3479ee673d763ad2e5451fcd35a0febedb4f3
2013-11-08 22:18:10 +01:00
T. van der Zwan
6160be229d Added simple version information to JAR. Commited the new release of HyperCon.
Former-commit-id: 7b690b726926c4237bafde8c84ee9c73f95856c4
2013-11-08 20:20:12 +01:00
T. van der Zwan
85c8ba0100 Merge remote-tracking branch 'remotes/origin/master'
Conflicts:
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java

Former-commit-id: 27aea22da889530529b5dc24f38441950594a7e5
2013-11-08 15:06:19 +01:00
T. van der Zwan
caa249c54e Updated the configuration to include all available Hyperion options.
Former-commit-id: 12765ea4e1d90b4c1f791424921fd0b921e5c2ec
2013-11-08 15:04:56 +01:00
johan
58b8bbe8cc rename of lpd6803 device to fix typo
Former-commit-id: 4c2b92f51d1903122211e3e91ce876697ea57526
2013-11-05 21:11:31 +01:00
poljvd
f434b398c3 Changed settings file to binary format (io ascii)
Former-commit-id: a4e31b7661299470ea136f8cccd9552c38d6b6f4
2013-11-05 09:23:00 +01:00
T. van der Zwan
8e978047a1 Merge remote-tracking branch 'remotes/origin/master'
Conflicts:
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/ConfigPanel.java
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/LedFramePanel.java
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java

Former-commit-id: 18ef539aef815aaf80e0954b27647d29acb0be6c
2013-11-04 23:31:58 +01:00
T. van der Zwan
daeec4077f Added persistent file for configured settings.
Former-commit-id: dd14b9975c09ad50781eb947483069b65e1a5c35
2013-11-04 23:24:10 +01:00
johan
c79bbd5f14 Added parenteses around config value
Former-commit-id: f1f3682cdbd3880f28ca0bada18a0f2b751320fb
2013-11-04 21:13:39 +01: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
8d8c4bdfad Fixed listening for device setup changes
Former-commit-id: c1580486bb123fe6c457610225ca46f3063b94c4
2013-11-02 20:06:47 +01:00
T. van der Zwan
fb23befdee Added the ldp6803 led device to HyperCon
Former-commit-id: 899bc2f50974ed22948a515f2839a6c14570d74d
2013-11-02 16:06:54 +01: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
73243eb593 Fixed generation of device config type string
Former-commit-id: ec245b9fae3f2bae690e985657807389770539d9
2013-10-27 13:15:48 +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
8a9c052e8d Fixed Layout issues where components were only partly visible
Former-commit-id: 518b72093d38a7692c7c7707f5fe9f663477ec9d
2013-10-21 21:45:02 +02:00
johan
756e9a28c0 Application build time added to application to write to stdout at startup
Former-commit-id: 4fca64a4b7ae6f0d74495173df26538cebae95f3
2013-10-21 20:29:30 +02:00
johan
0e8997f554 Added writing the blackborder detector flag to the settings file
Former-commit-id: da17feaa221d481f93e505d32473269a080d55ed
2013-10-20 22:08:39 +02:00
poljvd
5c12a3c716 Added the option to specify a gap from the border
Former-commit-id: 52280948a231cc89065daed7cc620262680ea512
2013-10-18 12:36:30 +02:00
T. van der Zwan
038b350672 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: 3d78776087fc12679cccd6deae9686511fadf3fb
2013-10-16 23:24:17 +02:00
T. van der Zwan
7fedacafb3 Fixed incorrect key in json-config generation
Former-commit-id: 106473ec0b87c710b941e4541a24fe2dd7451c2a
2013-10-16 23:23:35 +02: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
poljvd
d2738ef5f6 Update hyperiond.cpp
Former-commit-id: e7fe63bd3fed3c0132d07f6835f94988754e9a91
2013-10-16 18:04:43 +02:00
poljvd
6097a9987d Fix bug in config generation (missing quotes)
Former-commit-id: 75371b32e4335022a7add5c890aca6eecd292606
2013-10-16 17:53:41 +02: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
poljvd
464f5b518f Updated config file generation for changed configuration file
Former-commit-id: 19e2e0554dcf9eba0d4c90d394ccbc4cc6b2c2a2
2013-10-15 16:23:51 +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
poljvd
0963092b50 Change return value when no config file present
Former-commit-id: b560663960303b01466fb36f2e442926aa3b63b4
2013-10-10 09:51:18 +02:00
T. van der Zwan
4634bc34ff Downscaled all images of HyperCon of 1280x720 (reduce jar to under 10MB)
Former-commit-id: e326fadbca9d37f7ef265f8384158660938e0b5b
2013-10-05 18:45:46 +02:00
T. van der Zwan
352d9f5652 Added comment generation to configuration file writer. Added icon to main-frame. Update of jar.
Former-commit-id: f620c0cae0f7bd26fa1ef3c5b10cb26d2975b2eb
2013-10-01 15:42:49 +02:00
T. van der Zwan
ed4596f3aa Added HyperCon to deploy directory. Sorted leds to start at led-nr zero. Changed default integration depth of horizontal leds.
Former-commit-id: 67b38ceea032de0105daadd4bcda99cd458fb15f
2013-09-30 17:00:09 +02:00
T. van der Zwan
3b232ad4f5 Renamed packaging to HyperCon. Added javadoc comments. Added build script for auto jar-build.
Former-commit-id: d54f184b3b9fad359c5469361d6f93a8b884a00b
2013-09-30 15:40:51 +02:00
T. van der Zwan
6792321192 Merge remote-tracking branch 'remotes/origin/master'
Former-commit-id: 0f424826def93b35209c055244003dc21d07e9b7
2013-09-25 09:25:14 +02:00
T. van der Zwan
7c15c97904 Updated configuration and led-display
Former-commit-id: a768b70fa40c1b78da9e7b7c6380734211b28bf5
2013-09-25 09:24:00 +02: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
b1b6de7ce6 Merge remote-tracking branch 'remotes/origin/master'
Former-commit-id: e159c4757880a0f77f59c6b23775856e4fd4b8fe
2013-09-24 11:28:33 +02:00
T. van der Zwan
42a17a485f Created the config tool for defining hyperion json file
Former-commit-id: 0eac20fbc633111250911ba422e6edac0ef906e1
2013-09-24 11:25:51 +02:00
johan
cf0f94224f Changed XBMC Video checker from emitting all black on a lower channel than the grabber to commanding the grabber 2013-09-23 22:33:38 +02:00
T. van der Zwan
ecdd7775c5 Fixed doxygen warnings 2013-09-09 20:35:28 +00:00
T. van der Zwan
8441dd51cc Added/Updated/Fixed doxygen comments 2013-09-09 02:54:13 +00:00
johan
3187fc84a6 Doxygen comments added 2013-08-31 14:36:54 +02:00
T. van der Zwan
4a19095234 Added factory to boot-sequence
Added json-config for boot-sequence.
2013-08-25 16:20:19 +00:00
johan
213545afe7 Added config file settings for XBMCVideoChecker 2013-08-24 11:51:52 +02:00
johan
026937d5e1 Changed XBMC video checker from HTPP (using QNetworkAccessManager) to a plain TCP socket because of thre required CPU 2013-08-23 21:40:42 +02:00
johan
c4eb715592 XBMC video checker added 2013-08-23 20:44:53 +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
9033927685 Added signal handler to properly exit application and switch off the leds. 2013-08-22 20:06:13 +00:00
T. van der Zwan
51506cdeb9 Fixed incorrect index on commandline argument. 2013-08-22 05:57:46 +00:00
T. van der Zwan
decc41965d Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git 2013-08-21 20:46:43 +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
johan
271917bac7 Fix segfault when setting a color transformation 2013-08-21 18:09:50 +02: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
1766212b70 clear and clear all implemented 2013-08-18 13:33:56 +02:00
johan
46076998a0 Schema checking for all commands added 2013-08-18 12:02:17 +02:00
johan
b66c397a46 json schema added for checking incoming messages 2013-08-17 19:20:19 +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
johan
16c260b3dc added skeleton for the json connection server 2013-08-17 15:39:29 +02:00
johan
2c97353a11 implemented some more commands 2013-08-17 11:54:16 +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
e8b97dcb01 Merge branch 'master' of https://github.com/tvdzwan/hyperion.git 2013-08-14 08:55:17 +00:00
T. van der Zwan
7bdd10859e Created first draft of 'hyperion-d'. 2013-08-14 08:54:49 +00:00
johan
baba35c998 Added sending the image command 2013-08-13 22:35:50 +02:00
johan
a04af1242c Clean up code
Use tabs for indenting to make someone happy...
2013-08-13 20:10:19 +02:00
johan
463e7626b9 renamed files to be conform with the rest of the project 2013-08-13 19:45:17 +02:00
johan
3f4f1eff74 QSocket connection added to hyperion-remote 2013-08-13 19:31:56 +02: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
cc3baec022 Special command line option classes added 2013-08-11 21:49:11 +02:00
johan
29f6e41923 Added the option to leave out the short parameter option 2013-08-11 13:13:19 +02:00
johan
daabeaa03b project hyperion-remote created;
getoptPlusPlus dependency added;
small changes to getOptPlusPlus;
2013-08-11 11:54:16 +02:00
T. van der Zwan
cbbb1d740b Fixed memory overwrite bug. This fixes the png writer and led control. 2013-08-03 23:24:22 +02:00
T. van der Zwan
240218a6bd Added HyperionPng with similar interface as Hyperion to test frame-capture and handling. 2013-08-02 11:54:09 +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
a65305dbdb Added txt-document with first draft of cross-compile info.
Added cmake temp stuff to ignore.
2013-08-01 07:39:23 +00: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