redpanther
|
fd2cb44b1c
|
merge upstream
Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47
|
2016-03-13 08:07:58 +01:00 |
|
redpanther
|
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 |
|
AEtHeLsYn
|
a5e042225e
|
Update JsonConnection.cpp
Former-commit-id: 7b748e605939b65f02cb768a924faa48787618c3
|
2016-03-11 12:30:32 +01:00 |
|
AEtHeLsYn
|
8fce604ccb
|
Update JsonConnection.h
Former-commit-id: 5d44428cd95e2b81b867ace67eb1f77aceb47856
|
2016-03-11 12:29:07 +01:00 |
|
AEtHeLsYn
|
39b318e842
|
Update JsonConnection.h
Former-commit-id: 5191309bb65f446d8d60e21193ece00560d5e67b
|
2016-03-11 12:28:45 +01:00 |
|
AEtHeLsYn
|
8caf69e541
|
Update JsonConnection.h
Former-commit-id: fa07c01ab5bb34029d8b13ea93187a54686d784c
|
2016-03-11 12:21:04 +01:00 |
|
AEtHeLsYn
|
0baebe3873
|
Update hyperion-remote.cpp
Former-commit-id: bb2282e48bdd93d4dffcd763ff34e33d3f00670c
|
2016-03-11 12:20:59 +01:00 |
|
redpanther
|
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 |
|
redpanther
|
153d1f0999
|
print version for every standalone grabber and hyperiond
Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
|
2016-03-10 12:01:10 +01:00 |
|
redpanther
|
e6170ed698
|
create external framebuffer grabber
cleanup some cmakelist files
fix qt5 build
Former-commit-id: 024b5b6dc5dc96fcb16f6e8958ad3684a6728504
|
2016-03-09 07:03:17 +01:00 |
|
frostworx
|
defe217c89
|
added optional QT5 support - LedDevicePhilipsHue needs proper fixes
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
|
2016-01-06 17:31:23 +01:00 |
|
Floris Bos
|
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 |
|
Johan
|
e0d405034f
|
Add support for Python 3
Former-commit-id: b6aec954ba0e79ba5697ea8cc305eb9f7d29f332
|
2014-02-26 18:10:17 +01:00 |
|
johan
|
fe6bfb0ad2
|
Missing include added
Former-commit-id: e8bde1967c71b2171de270b25d7474a1a528c56a
|
2014-02-07 15:28:14 +01:00 |
|
Johan
|
c5b18d5925
|
Removed use of qt4_use_modules from build files
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
|
2014-02-07 09:20:00 +01:00 |
|
johan
|
ba73fbd470
|
Set qt locale to 'C'
Former-commit-id: d2c0b2ea61c8444169a8d8635adf7af5d3b5c67b
|
2014-01-28 22:27:02 +01:00 |
|
johan
|
b846b0b15d
|
Set C locale at startup
Former-commit-id: 2f47a595266e5b865aa70a65bbc8d29c0c515eed
|
2014-01-28 00:39:04 +01:00 |
|
T. van der Zwan
|
4fb3c5091d
|
Removed annoying signed unsigned warning from 'CustomParameter'
Former-commit-id: a02d9676953f7896972e720ed38576c9de7d86d9
|
2013-12-15 20:15:34 +00:00 |
|
johan
|
c11808878f
|
Hyperion-remote changed to support multiple colors in the setColor command
Former-commit-id: f0acda054056d6fa937e9cbd2b22686979911bc9
|
2013-12-13 00:01:48 +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 |
|
johan
|
515ae3e8c0
|
Added the possibility to set effect arguments over json
Former-commit-id: 4bc2920c04853e549c712ec70492371b14d20877
|
2013-12-01 14:09:01 +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
|
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 |
|
johan
|
0a6706e177
|
Fix bug in hyperion-remote: --value not working
Former-commit-id: 965abab92925062c048bba4c2c6efeedab1c1a92
|
2013-11-10 14:01:46 +01: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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|