f332473b77
Merge remote-tracking branch 'refs/remotes/origin/Beta'
...
Former-commit-id: 5bdbda1406bb0ddb99440502584604b85b0f3063
2016-03-23 17:53:32 +01:00
fe8a92b2eb
Typo
...
Former-commit-id: a6032547f54a181f4a48d41b9f8018ac84d42140
2016-03-23 17:44:29 +01:00
fa66c3b2b5
Rework log messages
...
Former-commit-id: eac93c0fd78fdf353e940d08df3cabf0b962a3e2
2016-03-23 17:40:45 +01:00
1b50fdd74e
Update hyperion-remote.cpp
...
Former-commit-id: dec50a509837d19120ed9699a2618b61d77ec00d
2016-03-23 13:35:38 +01:00
1f18073f00
Merge pull request #534 from AEtHeLsYn/master
...
Color correction
Former-commit-id: 7be726f1adb8698684a2b4726650082ed517901f
2016-03-22 00:56:41 +01:00
7da3e83597
Update JsonConnection.cpp
...
Former-commit-id: c701972ecddcd9655f0aa56b69301ad463f8dcb0
2016-03-21 17:39:02 +01:00
fa3b338894
Update hyperion-remote.cpp
...
Former-commit-id: 2ef2b5d21eda53e2286af8edf7200eb73f5ae3bf
2016-03-21 17:20:06 +01:00
9987590e5e
Update hyperion-remote.cpp
...
Former-commit-id: 652cde0ee1ef0fed1492c63bf78787467f9dd2b6
2016-03-21 17:19:06 +01:00
909112fbfb
Update JsonConnection.cpp
...
Former-commit-id: 712db0e3d8e525353d62bd7dfc6e2dd708b09b85
2016-03-21 17:13:46 +01:00
4836bfc863
Update JsonConnection.h
...
Former-commit-id: 4a0983b135f8386ee4e0db81c044dbaa87e05c03
2016-03-21 17:10:01 +01:00
a15a680dc3
Update CustomParameter.h
...
Former-commit-id: 99fa0c1a3d6321dc41f4fb1623aee5b364220a67
2016-03-21 17:09:10 +01:00
0bafc4a3cc
Create ColorCorrectionValues.h
...
Former-commit-id: d765e8c7562d6eac5e03e939bd88c858c50597bb
2016-03-21 17:08:10 +01:00
1f1aee0c37
Final fixex
...
Former-commit-id: 7b2e1a33ab7705dddadfa1ec99d3d7c379ab10dd
2016-03-13 21:14:22 +01:00
28f67871dc
More fixes
...
Former-commit-id: 331ba604dba8aa16f9cf42c5827c8542502be545
2016-03-13 13:05:47 +01:00
a5a17776d4
BugFix
...
Former-commit-id: 8887ee93d5bcaa7ee13f4f5afb601a65d59ee113
2016-03-13 12:10:54 +01:00
e4d77660a4
Bug fixes
...
Former-commit-id: a6783a75edb83988d1737df3d4a7a14c71ec4223
2016-03-13 11:59:36 +01:00
84c48b9a0a
Merge remote-tracking branch 'refs/remotes/tvdzwan/master' into test
...
Former-commit-id: 19831aa23078659d7f285b0e91bffff21a932283
2016-03-13 11:52:38 +01:00
fd2cb44b1c
merge upstream
...
Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47
2016-03-13 08:07:58 +01:00
c7df8c23c6
Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id
...
Conflicts:
src/hyperion-aml/CMakeLists.txt
src/hyperion-remote/CMakeLists.txt
src/hyperion-v4l2/CMakeLists.txt
Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb
2016-03-13 08:04:49 +01:00
3dae8d069c
fix bootsequence.
...
if boot duration not 0 then boot prio is set to 0 to avoid start of grabber overrules boot efx
cleanup bootseq code
Former-commit-id: 85c9f099bd9a2e8d695117a24164d8ce81ad2a36
2016-03-12 19:21:47 +01:00
a5e042225e
Update JsonConnection.cpp
...
Former-commit-id: 7b748e605939b65f02cb768a924faa48787618c3
2016-03-11 12:30:32 +01:00
8fce604ccb
Update JsonConnection.h
...
Former-commit-id: 5d44428cd95e2b81b867ace67eb1f77aceb47856
2016-03-11 12:29:07 +01:00
39b318e842
Update JsonConnection.h
...
Former-commit-id: 5191309bb65f446d8d60e21193ece00560d5e67b
2016-03-11 12:28:45 +01:00
8caf69e541
Update JsonConnection.h
...
Former-commit-id: fa07c01ab5bb34029d8b13ea93187a54686d784c
2016-03-11 12:21:04 +01:00
0baebe3873
Update hyperion-remote.cpp
...
Former-commit-id: bb2282e48bdd93d4dffcd763ff34e33d3f00670c
2016-03-11 12:20:59 +01:00
a25d8328f4
Update OsxWrapper.cpp
...
typooooo :D
Former-commit-id: 61df249f76c500845a460888b5f64dd70c056d28
2016-03-10 21:34:02 +01:00
e01bcd708d
add install commands
...
instead of "make" use "make install/strip" release compile
Former-commit-id: f4dd2d9e1a4d815b667665892a3bd9cec64218a3
2016-03-10 12:22:44 +01:00
153d1f0999
print version for every standalone grabber and hyperiond
...
Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
2016-03-10 12:01:10 +01:00
49e867f5fc
add an auto generated version id
...
Former-commit-id: df3ad6b08e24e73d957611e8be45e7e8cc717b8c
2016-03-10 06:53:21 +01:00
014a4288f9
implement osx grabber .... not tested! need testers!
...
tune usage hints in external grabbers
Former-commit-id: 816821dd773e90b8076e9b50ced9eb052f43c2f4
2016-03-09 11:03:20 +01:00
e6170ed698
create external framebuffer grabber
...
cleanup some cmakelist files
fix qt5 build
Former-commit-id: 024b5b6dc5dc96fcb16f6e8958ad3684a6728504
2016-03-09 07:03:17 +01:00
0bc725054c
make all prios settable and make prios more consistent
...
Former-commit-id: f1d1c35063e98389d627f3535d2a94da33a22da4
2016-03-08 17:31:56 +01:00
2c831c1110
add standalone amlogic grabber
...
fix standalone dispmanx grabber
Former-commit-id: 5ace9bc90a6fe76f5a51ecef95d6e7119d1102db
2016-02-24 16:03:21 +01:00
8fdf97e693
prepare standalone amlogic grabber
...
activate internal amlogic grabber forwarding
Former-commit-id: 21dabf759935836eef556baeb8a27e362e95ae96
2016-02-24 14:42:25 +01:00
6bef43887b
implement dispmanx forwarding a a separate dispmanx wrapper
...
implement forwarding for amlogic grabber
Former-commit-id: 8a793d24bd083f9eca07c34ec3b222f0e54b4426
2016-02-24 14:34:19 +01:00
a9e8f0264a
implement proto forwarding for osxgrabber and framebuffer. prepare forwarding in amlogic and dispmanx
...
Former-commit-id: d67fc2b7fe8877e6eadf31a8c76e4a68110c6680
2016-02-17 00:44:06 +01:00
629461b944
implement proto forwarding for hyperiond internal v4l2 grabber
...
cleanup
Former-commit-id: 669f139386633e3435cdc33639134819464afd4d
2016-02-16 15:41:40 +01:00
b01b5eb005
- prepare general way to send (proto) messages. currently only incomming protomessages are forwarded
...
- begin impl. of json server
Former-commit-id: 8f9237cd57ada1e84dc05e60b9ad723e47fd57b1
2016-02-15 18:25:18 +01:00
5dc59344c4
forward protobuf messages.
...
configure (send proto messages to two other hyperiond):
"protoServer" :
{
"port" : 19446,
"forward" : [ "192.168.0.10:19445", "192.168.0.11:19445" ]
},
Former-commit-id: 33af219cfce99609ca7245d662dc0f0561013bbd
2016-02-08 16:56:23 +01:00
870b74b011
Merge pull request #475 from redPanther/bootsequence
...
make priority of boot effect adjustable.
Former-commit-id: a722d2aaaa9248d85002137fc91016c8cc0a29bf
2016-02-08 14:53:30 +01:00
4decb05348
adds ability to set static color on boot.
...
Former-commit-id: 41ca5ba73fde698d73380fac3dcee5e33b310d76
2016-01-31 22:38:30 +01:00
8a906b9d01
make priority of boot effect adjustable. It is set to 0 to not alter to current behaciour.
...
A value of 900 could be more feasable, because boot effect with prio 0 isn't overwritable by other effects
Former-commit-id: 1852339e6ade62c86719cfbb47faa46eb8f8d4ed
2016-01-31 04:34:13 +01:00
bfa4185b9a
Update hyperion-x11.cpp
...
Former-commit-id: 6fa337290c285d32a2fcc1b180c80d2849334bb8
2016-01-21 16:42:30 +01:00
3e078b2e15
Update X11Wrapper.h
...
Former-commit-id: 231123e1dee2dacf6d5225a3833f51544ca6f99c
2016-01-21 16:42:02 +01:00
66609a03a0
Update X11Wrapper.cpp
...
Former-commit-id: f644a24c77db18feb34526aa937f12700865f5be
2016-01-21 16:41:37 +01:00
defe217c89
added optional QT5 support - LedDevicePhilipsHue needs proper fixes
...
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
2016-01-06 17:31:23 +01:00
ad876b0d8c
Fixed json value lookup
...
Only close the amlogic device every 20th succesfull reads.
Former-commit-id: 46c0cf1465b8c8b33d696bb2aeac5cabb1cb2819
2015-09-03 21:37:49 +02:00
a3db06e90e
Demangled config naming convention is framegrabber.
...
Former-commit-id: ccb9b98f3e42785620ade9970b33d94c77b93508
2015-08-20 10:14:19 +02:00
5497fbf577
Finished the amlogic grabber for the 'WeTek Play'
...
Former-commit-id: e459cdfe6273ad2bfee92d2d190801ebdc691a5c
2015-08-20 09:51:44 +02:00
1447209846
Added tool to create screenshot for amlogic grabber
...
Former-commit-id: d403deab3f931d01bec97b726d8e70b73d3a0012
2015-08-08 08:13:37 +02:00
3fd20ec5fa
- refactored framebuffer grabber to use ImageResampler
...
- added OsxGrabber for OSX
- added binary for imx6 (cubox-i) and updated install script
Former-commit-id: 2c55e292c842c67e54ce36bd91e4f6303b98687a
2015-01-24 23:42:22 +01:00
c89e1fcefa
Added frame buffer grabber support
...
Former-commit-id: a73767a1abb2cac977492bd8c6cc593fb21840e1
2015-01-18 00:04:45 +01:00
a041941e7a
Fix build with embedded protobuf library
...
Former-commit-id: 5c60566f2d4a9c65fc0fe677841a34d7ef73549a
2014-12-20 20:15:04 +01:00
12da40dc58
Fix typo
...
Former-commit-id: 134df5769b2bd608d08357c132d2a5cb1763dc4f
2014-12-17 16:18:23 +01:00
e608b11caa
Extract ImageResampler from X11Grabber
...
Former-commit-id: 63e95fa85fc0ef5a66f6eb8b396cf4b6370cf5dd
2014-12-14 14:26:59 +01:00
93de656985
fix slot name
...
Former-commit-id: fc2faf3b70be3b0a01cf3c72f7092c57e7c88783
2014-12-01 21:35:04 +01:00
0fd25285a6
add framerate parameter to X11 grabber application
...
Former-commit-id: b8f2bdb5c3e376a4505eec46204efe46dce1a6d9
2014-12-01 20:24:53 +01:00
d89f504d83
Refactor V4L2 and X11 grabbers to share more code
...
Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
2014-11-21 21:24:33 +01:00
01854a471e
Merge branch 'master' into add_x11
...
Former-commit-id: 08655bb606c5aae04fc0011a3ec1f0c16e59e7b7
2014-11-18 20:35:05 +01:00
a86e451db9
Added black color before boot-sequence, to make sure that the boot-sequence is the first thing to start
...
Former-commit-id: 575f1dfa4d2047c109d179c209c683c37028e721
2014-09-22 20:24:33 +02:00
b4d7410520
Started on adding a configurable delay in case leds are ahead of picture
...
Former-commit-id: 9eedf27c9cb51d05fca2ec2f0f9edae4726ac54d
2014-09-22 20:19:58 +02:00
3c65b82ac1
Allow disabling PROTOBUF support
...
One dependency less for users that only use DISPMANX grabbing
Former-commit-id: 24ea0480e3798bab692e75d82ddb9f5eccfa03c5
2014-09-08 16:16:02 +02:00
106257181b
Added ability to define effect arguments for the bootsequence
...
Former-commit-id: b9827bb7af6c2cfdd8b1b0388d16541612b360d4
2014-05-06 18:36:34 +02:00
b20f932ded
Merge branch 'master' into add_x11
...
Former-commit-id: 4ce19c22a28609978e1eb72375d3aa7bf63a91be
2014-04-30 22:34:36 +02:00
dd1adc4e90
Merge pull request #73 from lobocobra/patch-1
...
Fix error in start script
Former-commit-id: 6a02b865c86befa29e970a7465b256cde5335e95
2014-04-11 19:52:33 +02:00
dd0a18642b
Fix build
...
Former-commit-id: 1b98924c9d9292b6661a5c9e3e17b06813348b54
2014-03-04 23:22:46 +01:00
5e3cb497fa
Add support to set the threshold for each RGB channel separately
...
Former-commit-id: 5edb206bb2657e78f711f67625fd5f6164d8296c
2014-03-04 22:04:15 +01:00
e790cb87ca
Fix embedded V4L2 grabber
...
Former-commit-id: f9dc759a8fcac8ac95288b12a007e9c78aed82c3
2014-03-04 20:17:38 +01:00
69c64c379a
Merge branch 'master' into merge_v4l2
...
Former-commit-id: 015ff84842dc7a90ff603234ed2bb2a6afd27ab2
2014-03-01 19:47:24 +01:00
e0d405034f
Add support for Python 3
...
Former-commit-id: b6aec954ba0e79ba5697ea8cc305eb9f7d29f332
2014-02-26 18:10:17 +01:00
99fd50805c
Added image handler to v4l2 grabber to send colors to Hyperion
...
Former-commit-id: be6fb4dd8080b3325ba6161f48c093f8a145786d
2014-02-23 22:43:02 +01:00
e58f84d5c8
Merge branch 'master' into merge_v4l2
...
Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
2014-02-23 21:53:13 +01:00
22472d8f95
Added v4l2 to hyperiond (partial)
...
Former-commit-id: 06684261ec3ac7bb4e8ff0479e5b1472823648ae
2014-02-21 22:30:34 +01:00
69d6e47328
Create image callback using Qt signal
...
Former-commit-id: cf469ba01ffd26d286e6fb8d9f081cf126042e50
2014-02-19 21:52:37 +01:00
f0c35071da
Move V4L2 grabber code to separate library
...
Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc
2014-02-07 21:11:50 +01:00
fe6bfb0ad2
Missing include added
...
Former-commit-id: e8bde1967c71b2171de270b25d7474a1a528c56a
2014-02-07 15:28:14 +01:00
c5b18d5925
Removed use of qt4_use_modules from build files
...
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
2014-02-07 09:20:00 +01:00
62c1d36195
Switched added to hyperion-v4l2 to process the video stream as a 3D SBS or TAB
...
Former-commit-id: cdd121f172f4e42e301f63a3a2a51ec97ac97e3b
2014-02-04 21:53:36 +01:00
bad5b34796
Individual cropping values aded for all sides
...
Former-commit-id: 7e4013f745669bf38a9d2043731e0747d81241d5
2014-02-04 21:12:51 +01:00
2fa46fdd98
Fixed correct addres configuration
...
Former-commit-id: b001df5968f009cf9686a3741170790d82eaba1f
2014-02-02 16:58:46 +01:00
8e446bf883
Implemented the X11-grabber (based on v4l code).
...
Former-commit-id: 17ad66ff7e2a1e3fae2d853e5360f791934b6563
2014-01-30 12:35:29 +00:00
ba73fbd470
Set qt locale to 'C'
...
Former-commit-id: d2c0b2ea61c8444169a8d8635adf7af5d3b5c67b
2014-01-28 22:27:02 +01:00
6864ef6e43
Increased the timeout of grabbed images.
...
Former-commit-id: efc9d44a51ffd50e3233c6460a70335205b0c9f3
2014-01-28 08:55:54 +00:00
2d7d18b34d
Added coding framework for X11
...
Former-commit-id: 2915defe12e23d328716eade251849d40d098a8a
2014-01-28 08:47:16 +00:00
b846b0b15d
Set C locale at startup
...
Former-commit-id: 2f47a595266e5b865aa70a65bbc8d29c0c515eed
2014-01-28 00:39:04 +01:00
2085e3909f
Added creation of symbolic link /usr/bin/hyperion-v4l2 in install script
...
Former-commit-id: f45b8424968aa7ef5f0ca96cd716b6e3cf3b622a
2014-01-26 22:55:17 +01:00
ad8afb0f12
Added support for YUYV
...
Former-commit-id: 2e867b53b129af5c5f6d443a197721a3c8852a1b
2014-01-26 20:20:55 +01:00
beddd7ccc4
Changed default video standard
...
Former-commit-id: fb1452ee49b188082bdbd01c8241d451f6edc704
2014-01-26 18:02:33 +01:00
6b609fe9d7
Update program description
...
Former-commit-id: 6c6e7972e25c7eb7b3e575273cbeb91f27578f79
2014-01-26 16:34:13 +01:00
305a2e856a
Added signal detection option
...
Former-commit-id: 1bd70d02814d6238c488db765d9d25af655c1872
2014-01-26 16:00:33 +01:00
8cf39a9f6f
Added logic to reconnect after connection failure;
...
Implemented option to stop receiving the proto replies;
Former-commit-id: d8dfc3f36e81d727c4b7d449888f781b7b57c99e
2014-01-26 13:33:19 +01:00
c96be1cf38
Added option to stop receiving the proto replies
...
Former-commit-id: b15c31b8aa500b8d7253d0c2b2368eab6a11ed50
2014-01-26 13:00:23 +01:00
df9b33f560
Replaced exit statements for exceptions
...
Former-commit-id: 1eb180620fb59613eaa02da84026ffdcb28803a4
2014-01-26 12:35:31 +01:00
4f7997bbfe
Switched json to proto
...
Former-commit-id: 1a1c70b93c9b4efe17f1c1d2da246c949affa1f0
2014-01-25 21:00:48 +01:00
6723c7bf2b
Moved test/v4l2_to_png to src/hyperion-v4l2; Added json backend temporarily
...
Former-commit-id: 8c4e0ef7add8016c522d0b4c6f4df8886b905e36
2014-01-25 17:35:06 +01:00
78af2d62c2
Moved HyperCon to seperate repository
...
Former-commit-id: 89991359edc8346928cdac3c4955c25a922598ee
2014-01-10 21:04:49 +01:00
1e2d7188b1
Deleted obsolete (out-commented) code
...
Former-commit-id: a37da8b0cb38a988b467bd63b671e6b098136f72
2014-01-09 11:07:32 +00:00
efcb8ec179
Added fields to HyperCon for the 3D and screensaver check
...
Former-commit-id: a84a516c9fce8a56381fcf31852573d041699c4e
2013-12-21 15:06:01 +01:00
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
4fb3c5091d
Removed annoying signed unsigned warning from 'CustomParameter'
...
Former-commit-id: a02d9676953f7896972e720ed38576c9de7d86d9
2013-12-15 20:15:34 +00:00
f2253f185f
Fixed empty transform vector if failed to load settings
...
Former-commit-id: 52079c03c3c4e87160ea4e077edbadc9900e6e20
2013-12-14 21:17:32 +01:00
0cac2ce916
Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
...
Former-commit-id: 0b4fd4f95d601683433ae948f159347c34366eb4
2013-12-13 22:55:32 +01:00
20d4f00a4b
Set default indices for transform to '*'
...
Former-commit-id: 7a6e5ef61a2a54cf9ba52ba5777394c5ae5dfadd
2013-12-13 22:54:28 +01:00
89252d45d0
Added log statement for failure to start boot sequence.
...
Corrected name in default configuration file of bootsequence.
Former-commit-id: 7a303ca080f11e2bb5d72da039b9b1c1b44ddcdb
2013-12-13 18:59:01 +00:00
734759ffb3
Fixed bootsequence name (changed capital 'B' to 'b')
...
Former-commit-id: 9aaebb520371591c20cd178b843ace75f7c7e1f8
2013-12-13 19:57:25 +01:00
b124ba25d8
Removed empty argument constructor from setEffect call for bootsequence
...
Former-commit-id: cc46278cb2b9db725ae367f49464d361ce06e670
2013-12-13 15:00:56 +00:00
2efd751c76
Removed bootsequence library
...
Former-commit-id: 5f3f927236a26ae00299a8e7a914e98ace3b328a
2013-12-13 14:55:34 +00:00
a20dcbfe8c
Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
...
Former-commit-id: c7f7fe4307f7dfaddaef23b71c6ead3491d0e669
2013-12-13 09:06:19 +01:00
2eaae36858
Added maximum duration to boot sequence config
...
Former-commit-id: b390e9431365ffd710e0c4f72143cc65caf55530
2013-12-13 09:05:25 +01:00
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
c11808878f
Hyperion-remote changed to support multiple colors in the setColor command
...
Former-commit-id: f0acda054056d6fa937e9cbd2b22686979911bc9
2013-12-13 00:01:48 +01:00
91f09eceb0
Updated the device selection with specific sub panels per device type.
...
Former-commit-id: 312ffdb3213c4e3698477f117adb739cbcc6a941
2013-12-12 22:54:14 +01:00
b7e91b7013
Updated HyperCon with effect configuration removed.
...
Former-commit-id: 721510af90c601954390b881f957224725a7fed9
2013-12-12 22:39:56 +01:00
b50b854b88
Implemented argument configuration for effect engine
...
Former-commit-id: fa5b2e12a856234efca77577782f890681cdf2f5
2013-12-12 16:52:30 +01:00
26fb5c534a
Finished the effect argument table (with storage to HyperCon settings)
...
Former-commit-id: e0e397b9df8c8dc1eb30f0a0fb5d2df0f7187809
2013-12-11 22:05:38 +01:00
75aff5ded6
Further update of effect configuration in HyperCon.
...
Former-commit-id: f85efbcafc0822fba3bb6d594182b4a11700360a
2013-12-06 23:20:57 +01:00
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
3978638356
Merge branch 'multi_colortransform'
...
Conflicts:
CMakeLists.txt
config/hyperion.config.json
Former-commit-id: 99c5d885d2ee876b33143e945a9280a652a6a2ff
2013-12-05 22:09:58 +01:00
f4ef83b171
Continues work on HyperCon for effect engine
...
Former-commit-id: d8645606333a09d0c4a5f4aa7ee15cd04e0ee27d
2013-12-05 20:43:22 +01:00
9602017263
Fixed incorrect cast of update frequency
...
Former-commit-id: 0d426d020e8a911be3a54adde1a6e99cc074d8bb
2013-12-03 21:29:37 +01:00
3531bab2a1
Started work on adding effect engine config to HyperCon
...
Former-commit-id: c899c72d15de8cbe0b83f5458a4484eb794a9071
2013-12-03 21:18:58 +01:00
515ae3e8c0
Added the possibility to set effect arguments over json
...
Former-commit-id: 4bc2920c04853e549c712ec70492371b14d20877
2013-12-01 14:09:01 +01:00
3bd1789c42
Fix bug: Only 1 EffectEngine allowed; SetColors implemented for EffectEngine
...
Former-commit-id: ae8141ebd530b7735ffa7818dc3c690913769070
2013-11-29 23:22:49 +01:00
fafed8fb09
Merge branch 'master' into add_effect_engine
...
Conflicts:
CrossCompileHowto.txt
Former-commit-id: 644f194464bfdcb8adbaced43ec5300f8ec6d62c
2013-11-29 17:39:15 +01:00
dc4a41c64a
Added test dialog for dividing leds over transforms
...
Former-commit-id: 0d4549d32c40df3fcbd0c308b249566721445b13
2013-11-27 12:00:05 +01:00
79f66f7db1
Added the multi color transform to the gui.
...
Former-commit-id: 96ff1aa60098871a8597f716c0788cc749e149ef
2013-11-26 12:24:48 +01:00
602afa14f6
Fixed json generation of multi-colortransform
...
Former-commit-id: ecd587d1e623e34b8841d634b2217ef350e25210
2013-11-25 12:26:20 +01:00
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
5454ddb375
Added skeleton for effect engine development
...
Former-commit-id: e1fb69fd4de4b8968075660e3ba7f7add021c152
2013-11-24 16:10:48 +01:00
d1c1e56bd1
hidapi added as dependency library
...
Former-commit-id: 067d8ed87d0e416fb8518e05344597a00fc263c2
2013-11-22 14:42:02 +01:00
826b964bf6
Implemented the multi-color transform including in hyperion-remote
...
Former-commit-id: ebdb0688b47d51bd6dccf6dafd580d3ce9ed80a7
2013-11-22 10:48:10 +00:00
077f88a123
Fix typo in HyperCon knight rider
...
Former-commit-id: 43ce527d623d31c71f9b2edb9fc7aae6428fa841
2013-11-20 12:54:19 +01:00
7e4466d2bf
Fix type
...
Former-commit-id: 7b900bee8a5383e878cc41b6b3736607abd63d48
2013-11-20 12:48:34 +01:00
d60cca9e20
Added flag to disable dispmanx from build
...
Former-commit-id: 6630f588a739a08601c0db79abd2cdf0b1c1839c
2013-11-19 23:02:41 +01:00
adea0895c4
Fix type in generated comments
...
Former-commit-id: d7abb9ee11880d0aface26148b371ecd3364f491
2013-11-19 22:02:47 +01:00
bfba00432f
Fixed Typo in boot sequence type
...
Former-commit-id: 5bed36ed38f9dd1b3954dae665974e3833eab86d
2013-11-19 21:57:35 +01:00
eb8903fb09
typo
...
Former-commit-id: ab0b015013dd3df59e1497923da673173b0485f8
2013-11-19 21:55:39 +01:00
6136f9d1e9
(re)Added the total led count to the simulation image
...
Former-commit-id: b91b7063d70b33b543bfeaefd334253d9fed4688
2013-11-17 21:06:30 +01:00
632275396b
Add hiding of progressbar when finished creating image
...
Former-commit-id: b5732d9ac6fbcead8d4127e2b18c446fd7f0e0a6
2013-11-17 20:56:47 +01:00
28f07ec739
Changed border simulation ratio to fill the border
...
Former-commit-id: 2d7cfee11127d09c1a71d84dab2d03f3cf003013
2013-11-16 20:53:47 +01:00
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
153e75555d
Changed default grabbing flags when no xbmc checker is present
...
Former-commit-id: 9fabc0e570d44b301646c93b355042e1747a9183
2013-11-14 19:51:10 +01:00
c327f78d30
new devices added to HyperCon
...
Former-commit-id: 51f564f6375d377144787675cfd33c511a363a80
2013-11-13 23:33:17 +01:00
fe1dd23768
viewpng and writeconfig removed
...
Former-commit-id: ee46218e71df3090336754353566e7b659b3a801
2013-11-13 23:07:16 +01:00
12c925d77f
First Lighpack device version.
...
Former-commit-id: 2133e13ed421d363fa28d3f765607e455088618b
2013-11-13 20:15:53 +01:00
5225f1149a
Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git
...
Former-commit-id: a5e2aa216f14a7916ce4c36fa958baf3d80608a2
2013-11-12 06:34:00 +00:00
5c71e626c7
Adalight device added
...
Former-commit-id: d9b9a146b39ba83fada52de2b6076dde7e44b151
2013-11-11 21:07:24 +01:00
15ee87ad29
Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git
...
Former-commit-id: 8bdad10e32693b63120e043eef851f266f196c65
2013-11-11 09:00:51 +00:00
dd16af0df5
Changed RgbImage to template based Image (with template for pixel type)
...
Former-commit-id: ef02f164eaf3c2f9dd552c1c17b525cf6eed499c
2013-11-11 09:00:37 +00:00
0a6706e177
Fix bug in hyperion-remote: --value not working
...
Former-commit-id: 965abab92925062c048bba4c2c6efeedab1c1a92
2013-11-10 14:01:46 +01:00
90f1f282e2
Fix generation of color smoothing parameters
...
Former-commit-id: 44b606e833451ee5795d92fd0bef3acb2dd8d47c
2013-11-09 11:36:08 +01:00
b56a15b012
Fix config generati
...
Former-commit-id: b125333e82df891b516fbaf6c3e0f599a7699dd6
2013-11-09 11:19:26 +01:00
0f8278cb79
Fix config generation
...
Former-commit-id: c908b74ba8bd8dfc3aa2a6f31d97bda28c343447
2013-11-09 11:17:23 +01:00
67f85de8c9
Fixed some layouting issues; Fixed type in device type name
...
Former-commit-id: d9bcb90ac57feac2e540bb9315f295bc678a854a
2013-11-09 11:06:46 +01:00
c77f45f221
Protect Boblight server against clients sending too much data
...
Former-commit-id: f3a575f71425da25fbaad68c48dcec746a50def2
2013-11-09 10:33:16 +01:00
39b7f1d52e
Merge branch 'master' of https://github.com/tvdzwan/hyperion
...
Former-commit-id: f87807d246e0c0fde14e2ef97fcec0144d022ca8
2013-11-08 22:18:25 +01:00
7300413015
BoblightServer added
...
Former-commit-id: deb3479ee673d763ad2e5451fcd35a0febedb4f3
2013-11-08 22:18:10 +01:00
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
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
caa249c54e
Updated the configuration to include all available Hyperion options.
...
Former-commit-id: 12765ea4e1d90b4c1f791424921fd0b921e5c2ec
2013-11-08 15:04:56 +01:00
58b8bbe8cc
rename of lpd6803 device to fix typo
...
Former-commit-id: 4c2b92f51d1903122211e3e91ce876697ea57526
2013-11-05 21:11:31 +01:00
f434b398c3
Changed settings file to binary format (io ascii)
...
Former-commit-id: a4e31b7661299470ea136f8cccd9552c38d6b6f4
2013-11-05 09:23:00 +01:00
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
daeec4077f
Added persistent file for configured settings.
...
Former-commit-id: dd14b9975c09ad50781eb947483069b65e1a5c35
2013-11-04 23:24:10 +01:00
c79bbd5f14
Added parenteses around config value
...
Former-commit-id: f1f3682cdbd3880f28ca0bada18a0f2b751320fb
2013-11-04 21:13:39 +01:00
fc1e4bc6c8
Added the option to specify the color byte order
...
Former-commit-id: f911d0f26c25345bbe5e9014fbc31568b7386f08
2013-11-04 20:52:57 +01:00
8d8c4bdfad
Fixed listening for device setup changes
...
Former-commit-id: c1580486bb123fe6c457610225ca46f3063b94c4
2013-11-02 20:06:47 +01:00
fb23befdee
Added the ldp6803 led device to HyperCon
...
Former-commit-id: 899bc2f50974ed22948a515f2839a6c14570d74d
2013-11-02 16:06:54 +01:00
3e4c38b57a
Added smoothing to the Hyperion configuration
...
Former-commit-id: 85e27d54841de5030199dd7f70bb0f29250abb6a
2013-10-27 21:06:35 +01:00
0b08341ef1
Initial commit including a linear color smoother
...
Former-commit-id: ffc00087996324f989e56dc5c95ab734c7c86dfa
2013-10-27 18:04:37 +01:00
73243eb593
Fixed generation of device config type string
...
Former-commit-id: ec245b9fae3f2bae690e985657807389770539d9
2013-10-27 13:15:48 +01:00
2471bd8753
added flag to have BGR output instead of RGB
...
Former-commit-id: dbd35d6dd4a84d95e0a034b99843be4949a6e169
2013-10-27 10:18:31 +01:00
8a9c052e8d
Fixed Layout issues where components were only partly visible
...
Former-commit-id: 518b72093d38a7692c7c7707f5fe9f663477ec9d
2013-10-21 21:45:02 +02:00
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
0e8997f554
Added writing the blackborder detector flag to the settings file
...
Former-commit-id: da17feaa221d481f93e505d32473269a080d55ed
2013-10-20 22:08:39 +02:00
5c12a3c716
Added the option to specify a gap from the border
...
Former-commit-id: 52280948a231cc89065daed7cc620262680ea512
2013-10-18 12:36:30 +02:00
038b350672
Merge branch 'master' of https://github.com/tvdzwan/hyperion
...
Former-commit-id: 3d78776087fc12679cccd6deae9686511fadf3fb
2013-10-16 23:24:17 +02:00
7fedacafb3
Fixed incorrect key in json-config generation
...
Former-commit-id: 106473ec0b87c710b941e4541a24fe2dd7451c2a
2013-10-16 23:23:35 +02:00
64b9316a04
Added some extra checks to be more tolerant for configration faults
...
Former-commit-id: 5061311d8116f848f36808f2c77dcff011ceb571
2013-10-16 23:19:40 +02:00
d2738ef5f6
Update hyperiond.cpp
...
Former-commit-id: e7fe63bd3fed3c0132d07f6835f94988754e9a91
2013-10-16 18:04:43 +02:00
6097a9987d
Fix bug in config generation (missing quotes)
...
Former-commit-id: 75371b32e4335022a7add5c890aca6eecd292606
2013-10-16 17:53:41 +02:00
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
464f5b518f
Updated config file generation for changed configuration file
...
Former-commit-id: 19e2e0554dcf9eba0d4c90d394ccbc4cc6b2c2a2
2013-10-15 16:23:51 +02:00
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
0963092b50
Change return value when no config file present
...
Former-commit-id: b560663960303b01466fb36f2e442926aa3b63b4
2013-10-10 09:51:18 +02:00
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
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
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
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
6792321192
Merge remote-tracking branch 'remotes/origin/master'
...
Former-commit-id: 0f424826def93b35209c055244003dc21d07e9b7
2013-09-25 09:25:14 +02:00
7c15c97904
Updated configuration and led-display
...
Former-commit-id: a768b70fa40c1b78da9e7b7c6380734211b28bf5
2013-09-25 09:24:00 +02:00
876100249e
Added configuration to XBMC video checker
...
Former-commit-id: 82a73ca5a31c7152572f06bff50befd26053d8df
2013-09-24 21:45:27 +02:00
b1b6de7ce6
Merge remote-tracking branch 'remotes/origin/master'
...
Former-commit-id: e159c4757880a0f77f59c6b23775856e4fd4b8fe
2013-09-24 11:28:33 +02:00
42a17a485f
Created the config tool for defining hyperion json file
...
Former-commit-id: 0eac20fbc633111250911ba422e6edac0ef906e1
2013-09-24 11:25:51 +02:00
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
ecdd7775c5
Fixed doxygen warnings
2013-09-09 20:35:28 +00:00
8441dd51cc
Added/Updated/Fixed doxygen comments
2013-09-09 02:54:13 +00:00
3187fc84a6
Doxygen comments added
2013-08-31 14:36:54 +02:00
4a19095234
Added factory to boot-sequence
...
Added json-config for boot-sequence.
2013-08-25 16:20:19 +00:00
213545afe7
Added config file settings for XBMCVideoChecker
2013-08-24 11:51:52 +02:00
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
c4eb715592
XBMC video checker added
2013-08-23 20:44:53 +02:00
3d02fecc7a
Added 'rainbow' boot sequence
...
Moved color transform to utils lib
2013-08-23 16:24:10 +00:00
9033927685
Added signal handler to properly exit application and switch off the leds.
2013-08-22 20:06:13 +00:00
51506cdeb9
Fixed incorrect index on commandline argument.
2013-08-22 05:57:46 +00:00
decc41965d
Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git
2013-08-21 20:46:43 +00:00
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
271917bac7
Fix segfault when setting a color transformation
2013-08-21 18:09:50 +02:00
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
1766212b70
clear and clear all implemented
2013-08-18 13:33:56 +02:00
46076998a0
Schema checking for all commands added
2013-08-18 12:02:17 +02:00
b66c397a46
json schema added for checking incoming messages
2013-08-17 19:20:19 +02:00
59e13a2b5f
restructured project structure: move projects into sub-folders, split dispmanx-grabber from hyperion
2013-08-17 16:12:42 +02:00
16c260b3dc
added skeleton for the json connection server
2013-08-17 15:39:29 +02:00
2c97353a11
implemented some more commands
2013-08-17 11:54:16 +02:00
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
e8b97dcb01
Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
2013-08-14 08:55:17 +00:00
7bdd10859e
Created first draft of 'hyperion-d'.
2013-08-14 08:54:49 +00:00
baba35c998
Added sending the image command
2013-08-13 22:35:50 +02:00
a04af1242c
Clean up code
...
Use tabs for indenting to make someone happy...
2013-08-13 20:10:19 +02:00
463e7626b9
renamed files to be conform with the rest of the project
2013-08-13 19:45:17 +02:00
3f4f1eff74
QSocket connection added to hyperion-remote
2013-08-13 19:31:56 +02:00
2ec9f9202e
Deleted all files referencing/using boblight
2013-08-13 10:03:00 +00:00
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
cc3baec022
Special command line option classes added
2013-08-11 21:49:11 +02:00
29f6e41923
Added the option to leave out the short parameter option
2013-08-11 13:13:19 +02:00
daabeaa03b
project hyperion-remote created;
...
getoptPlusPlus dependency added;
small changes to getOptPlusPlus;
2013-08-11 11:54:16 +02:00
cbbb1d740b
Fixed memory overwrite bug. This fixes the png writer and led control.
2013-08-03 23:24:22 +02:00
240218a6bd
Added HyperionPng with similar interface as Hyperion to test frame-capture and handling.
2013-08-02 11:54:09 +02:00
f6672499f5
Added first quick and dirty implementation of own server (HyperionDispmanX.cpp).
2013-08-01 17:08:58 +02:00
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
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
10b5b80675
First working version with some test executables
2013-07-26 20:38:34 +00:00
brindosch
AEtHeLsYn
redpanther
Serhan
tvdzwan
Paulchen-Panther
frostworx
Gamadril
poljvd
Floris Bos
Marc Dahlem
Johan
johan