Commit Graph

844 Commits

Author SHA1 Message Date
wisc
773222192d fixed upd merge conflicts and fadecandy compiler warning
Former-commit-id: cb9506a68deff80a331f6455c3cb8fa783a2140e
2016-02-10 00:57:21 +01:00
wisc17
d6b5dc7ae6 Revert "Update LedDeviceAPA102.cpp by pcaffardi"
Former-commit-id: 493b32c03f922cc26d9fb4fce4778636f6a96e84
2016-02-09 20:21:49 +01:00
redpanther
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
redpanther
aaba90209f Merge remote-tracking branch 'upstream/master'
Former-commit-id: 9b4da8b8c5f61f9507b4775d0f28e187a0246605
2016-02-08 15:38:59 +01:00
tvdzwan
cf34f45daa Merge pull request #484 from wisc17/apa102
Update LedDeviceAPA102.cpp by pcaffardi

Former-commit-id: 0e586eda7636b4abb378fe8adf1b35145e63eb1f
2016-02-08 14:55:08 +01:00
tvdzwan
f3cd0451c9 Merge pull request #483 from wisc17/blackborder
Blackborder Improved + (bugfix and enhancement)

Former-commit-id: 2d82dca6fafbe6eb019027c37abf679fd7066980
2016-02-08 14:54:48 +01:00
tvdzwan
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
tvdzwan
3280f7198d Merge pull request #469 from redPanther/fadecandy
fadecandy fix

Former-commit-id: 4686a0ead7ba44c13dbc4ac1f0f876d9a4d165c3
2016-02-08 14:52:48 +01:00
tvdzwan
bdfe515451 Merge pull request #466 from frostworx/master
minor qt5 fix

Former-commit-id: e2f74448dccb2a4dc93db66ec41d9252d91878ef
2016-02-08 14:52:15 +01:00
wisc
79dda5e840 Update LedDeviceAPA102.cpp by pcaffardi
Former-commit-id: e7efe8917fc10ceb860e44bbb37442cffa3512db
2016-02-07 17:40:24 +01:00
wisc
543042b870 pcaffardi/patch-1
Former-commit-id: 4a6737d50727518ae44f494be46a7c9c2fb54513
2016-02-07 14:52:44 +01:00
wisc
2b703de669 bugfix, config enhancement and 3 detection modes
Former-commit-id: edfc3e7ccf7b7d727e73a8563acb521045026d5b
2016-02-07 13:26:40 +01:00
redpanther
e8a441ca98 add fadecandy/opc specs
Former-commit-id: 287fa1501e569df439eed8aac6dd44077ecb0994
2016-02-04 13:17:40 +01:00
redpanther
4decb05348 adds ability to set static color on boot.
Former-commit-id: 41ca5ba73fde698d73380fac3dcee5e33b310d76
2016-01-31 22:38:30 +01:00
redpanther
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
redpanther
e5b802c01d simplify effects
Former-commit-id: bbb8dc4c3852d0651eb2f4e9999e426db4a905d0
2016-01-28 06:12:28 +01:00
redpanther
8732ffacf4 simplify code of effect fade.py
Former-commit-id: 3c7c633e764d14c9e11c6e145289894954695c65
2016-01-28 05:50:32 +01:00
redpanther
b6060d392e make opc channel available in via config.
Former-commit-id: 6a065cd049e29d7184a3aa1454de0fe1855e9941
2016-01-27 10:44:51 +01:00
redpanther
a257f185c9 increase fadecandy maximum amount of leds
remove debug code


Former-commit-id: d74025128978e4e26d49fb57215f660bd824895b
2016-01-26 15:08:21 +01:00
redpanther
e7c7e05f88 add fading effect like in a cinema. sped start and end color are selectable in json file
rename loop effects to more meaningfull names


Former-commit-id: bed033e19d7cb38b0d5f11313a9f927ac8121194
2016-01-24 08:10:36 +01:00
redpanther
2555c50710 add shutdown effect:
system shutdown is disabled by default. enable it in json (set false to true)
the shutdown is abortable. simply select another effect before shutdown time reached
this effect is made for linux and did not workl on windows without modifications


Former-commit-id: 32f92246fbc87de576e4b1059dd319646917ec74
2016-01-23 13:09:23 +01:00
frostworx
bbfded147e minor qt5 fix
Former-commit-id: 65ab3bb14d6a7ab52e6ab1e8eaa85321dc5fa543
2016-01-22 17:17:45 +01:00
redpanther
3327251ba7 Merge remote-tracking branch 'tvdzwan/master'
Former-commit-id: c10089870868d7019404f566c0105b9d7a8f5b49
2016-01-21 23:30:10 +01:00
tvdzwan
6b052081f7 Merge pull request #460 from ntim/support_for_philips_hue
Transition to QNetworkAccessManager for compatibility to QT5

Former-commit-id: 07f30e86eaf0677a3199f75bf5f7c8f760822634
2016-01-21 20:49:02 +01:00
tvdzwan
4c74b509b6 Merge pull request #462 from wisc17/blackborder
Blackborder Improved +

Former-commit-id: ddae8aa6e2e3f27f960d39f0e8e2ae82e39c0436
2016-01-21 20:48:46 +01:00
tvdzwan
fc0a5e0ae2 Merge pull request #458 from Paulchen-Panther/master
Replace XGetImage with XShmGetImage

Former-commit-id: a40813e1c19b09b2d8f1cd5f6837bf7b2651e7a8
2016-01-21 20:48:35 +01:00
wisc
8f0e1f1199 switch on consistent detection only and also check right side and bottom pixel
Former-commit-id: 4da53a39918a3676c707215daa66d8ae263ed92a
2016-01-21 20:25:08 +01:00
Paulchen-Panther
93f2b8b65f Update X11Grabber.cpp
Former-commit-id: ab34a0615e2233322bc2260f297130e30857ac24
2016-01-21 16:51:20 +01:00
Paulchen-Panther
bfa4185b9a Update hyperion-x11.cpp
Former-commit-id: 6fa337290c285d32a2fcc1b180c80d2849334bb8
2016-01-21 16:42:30 +01:00
Paulchen-Panther
3e078b2e15 Update X11Wrapper.h
Former-commit-id: 231123e1dee2dacf6d5225a3833f51544ca6f99c
2016-01-21 16:42:02 +01:00
Paulchen-Panther
66609a03a0 Update X11Wrapper.cpp
Former-commit-id: f644a24c77db18feb34526aa937f12700865f5be
2016-01-21 16:41:37 +01:00
Paulchen-Panther
a53f65f3a0 Update X11Grabber.cpp
Former-commit-id: 08b227fba33ca0f6974f10b085cf57c18e716428
2016-01-21 16:40:46 +01:00
Paulchen-Panther
b9a9c3126f Update X11Grabber.h
Former-commit-id: 895bc985c0e732ec5d8e064068cb6f3e0920d09a
2016-01-21 16:39:52 +01:00
redpanther
de5b284975 modify effects
- snake has a nice tail
- random is not so fast anymore
- merge sparks and sparks-color
- make more params available in json files


Former-commit-id: fc2a4f6f6ce2b44a35a75a9c0dbe36504b790be9
2016-01-20 22:36:21 +01:00
redpanther
7dfe8ae8cf all effects has same lineendings
Former-commit-id: c2586f57ce03c20a7a1083a5d62c8ddde7359b84
2016-01-20 14:45:17 +01:00
redpanther
645a376da6 Merge remote-tracking branch 'jm-github/master'
Former-commit-id: dc9401e9e6609887ef7f8059cddc81662a6ac5a4
2016-01-20 14:43:55 +01:00
wisc
391e2e552c release candidate
Former-commit-id: e81f58386ce64f836561faf30ef2c3fb154358b5
2016-01-19 23:43:00 +01:00
ntim
6b860a7e24 Removed all QT5 switches
Former-commit-id: 7a481a921d572e4c0eccebfb1ba3abbab61d25fc
2016-01-18 10:41:45 +01:00
ntim
83c92703eb Merge remote-tracking branch 'upstream/master' into support_for_philips_hue
Former-commit-id: 51089fb3522bf9c228d67f2c2f9a1a5b33e5d0a5
2016-01-18 10:36:20 +01:00
penfold42
5387759287 updated URLs in the installation script to reference current builds
Former-commit-id: 014c31531dbc5cce74870d8f3c112fcf10f9460d
2016-01-18 17:31:17 +11:00
Paulchen-Panther
7d9de67449 Create police.py
Former-commit-id: 97f31beef808c6b4950d598affc5259bbc8edee4
2016-01-17 18:19:33 +01:00
Paulchen-Panther
da914e0135 Create police-lights-solid.json
Former-commit-id: d3f433361bb305b3d367754fc4c4818092a6c74b
2016-01-17 18:18:49 +01:00
Paulchen-Panther
641e8ba6e0 Create police-lights-single.json
Former-commit-id: 1503be1ff3092af365cfb3479e2911e1c3b8dd97
2016-01-17 18:18:12 +01:00
Paulchen-Panther
2a1673d8c3 Update X11Grabber.cpp
Former-commit-id: 849f1a2b6217b76739f84f6c9fb5645cab584f98
2016-01-17 18:04:08 +01:00
Paulchen-Panther
9156742aaa Update X11Grabber.h
Former-commit-id: 7b3ba3f760ba4b403061642549164ef2e1768b32
2016-01-17 18:00:38 +01:00
T.van der Zwan
e0d04d606c Updated releases with latest pulls
Former-commit-id: 1734e9a6010789b31120f9630745b731da5109cd
2016-01-13 22:52:50 +01:00
tvdzwan
424c00e767 Merge pull request #448 from wisc17/blackborder_alternative
Blackborder Improved

Former-commit-id: 762bb519ebefd6755362178fdc5b9d5ed3508c3b
2016-01-13 22:43:30 +01:00
tvdzwan
491c7c4d87 Merge pull request #445 from frostworx/master
added optional QT5 support - LedDevicePhilipsHue needs proper fixes

Former-commit-id: a9b0dd2af92266ad137c4a3ac05dbeec6a6c102b
2016-01-13 22:43:15 +01:00
tvdzwan
1ca31085c7 Merge pull request #442 from redPanther/master
add FadeCandy/OPC device support

Former-commit-id: 6280f77551c607acb301328ce197ca357d0a8b11
2016-01-13 22:42:44 +01:00
tvdzwan
8775b3f273 Merge pull request #428 from guddimon-/master
make hyperion more robust

Former-commit-id: 3d00e9be63ccd7904362d6c60702d27c282047de
2016-01-13 22:42:31 +01:00