Commit Graph

903 Commits

Author SHA1 Message Date
redPanther
36b4d072c5 common ledbuffer for color transform (#77)
* common ledbuffer for color transform

hyperion class uses a common buffer for all operations on ledColors got from muxer
all color transforms uses new ledBuffer instead of making copies of ledbuffer

other fixes:
fix compile bug in profiler
update doxygen config

* migrate logging for color transform classes

* prepare new logger in hyperion class

* implement hwledcount

* Update Hyperion.cpp

Fix off color

* remove ledscount equivalent from apa102
migrate logging in hyperion.cpp
remove unused and duuplicate colorcorrection - but same is available through tempertature

* remove colorcorrection completly
fix compile

* set colororder back to static

* in remote: using correction is the same as using temperature - correction is obsolete, command not delete atm for compat reasons
2016-07-01 23:20:41 +02:00
penfold42
faf5110558 More logging migration. (#74)
Cleaned up old commented out printf statements.

The piblaster stuff probably needs to be moved out of the devicefactory but Ill have to do that later
2016-06-29 16:49:05 +02:00
XfableX
6327a38582 Added logging to X11Grabber (#71)
* Added logging to X11Grabber

* Added logging to Amlogic grabber.

* Fixed mistake in amlogicgrabber.h

* fixed compile issue

* Trigger

* cleaned up log messages
2016-06-29 16:48:53 +02:00
XfableX
1faead11c5 added logging for files that were lacking it. (#66) 2016-06-28 21:53:34 +02:00
redPanther
03ac5689cf make log level settings avail in config file (#63) 2016-06-27 23:56:21 +02:00
redPanther
809ab82524 migrate boblight to new logger and make it start/stoppable during runtime (#62) 2016-06-27 22:43:43 +02:00
penfold42
96037da1cf Added support for sk6812RGBW leds (ab)using the SPI interface. (#61)
right now it only uses RGB - white is set to zero
2016-06-27 22:43:35 +02:00
penfold42
2fff9ae4fc Remove unused constructors (#60) 2016-06-27 22:43:28 +02:00
redPanther
b9634e57d6 Udplistener start/stop during runtime (#56)
* start implementening runtime start/stop for udplistener

* add signal slots for start/stop/statusChanged for better connectivity with other qt stuff

* fix typo
2016-06-27 09:27:11 +02:00
penfold42
de39ff8997 UDPListener improvements: (#53)
- if you listen to a multicast address, it now also listens to all ipv4 addresses
- shared udp sockets - multiple hyperiond instance can optionally share the same udp packets
2016-06-26 20:08:03 +02:00
redPanther
e486b10aa6 Logging leds (#52)
* switch to new logger for folowing led devices:
LedDeviceAtmo
LedDeviceFactory
LedDeviceFadeCandy
LedDeviceHyperionUsbasp
LedDeviceLightpack-hidapi
LedDevicePiBlaster
LedDeviceWS281x
LedRs232Device

leddevice base class defines logger already as protected member _log

* migrate to new logger for led devices.
still todo:
LedDeviceWS2812b
LedDeviceWs2812SPI
LedDeviceTinkerforge
LedDeviceLightpack
LedDeviceMultiLightpack

* migrate leddevice tinkerforge to new logger

* migrate Lightpack and MultiLightpack to new logger
2016-06-26 11:53:16 +02:00
redPanther
4033de85ec Logging leds (#50)
* switch to new logger for folowing led devices:
LedDeviceAtmo
LedDeviceFactory
LedDeviceFadeCandy
LedDeviceHyperionUsbasp
LedDeviceLightpack-hidapi
LedDevicePiBlaster
LedDeviceWS281x
LedRs232Device

leddevice base class defines logger already as protected member _log

* migrate to new logger for led devices.
still todo:
LedDeviceWS2812b
LedDeviceWs2812SPI
LedDeviceTinkerforge
LedDeviceLightpack
LedDeviceMultiLightpack
2016-06-25 22:08:17 +02:00
penfold42
0b59614ab3 native UDP listener enhancements (#48)
- uses new logger
- can specifiy which ip address to listen on
- if its a multicast address, multicast is enabled
2016-06-25 15:15:23 +02:00
penfold42
33f1ef457b More logging cleanup on led devices (#47) 2016-06-25 14:44:52 +02:00
redPanther
56ae551cbd extend hyperion version number (#46)
* add version number for hyperion and json level

* add new jsonrpc_version in HyperionConfig.h.in
add new hard coded version number for hyperion
2016-06-24 23:22:31 +02:00
penfold42
a6e1b89724 cleanup for compiler warning "Note: No relevant classes found. No output generated." (#42)
* Fixed compile error when no grabbers are defined

* Remove stupid avahi warning...

* Started on the new integrated UDP listener to replace the python effect.

Cloned boblight server and rename it to be UDP listener
It compiles!, It starts! it seems to work as a second boblight protocol server...

* moving from the exsting TCP to UDP.
i can catch packets now.. need to consider ditching the connection handling

* It kinda works right now.
UDP packets are received, led data is sent and hyperion displays them.
.... for a moment before going back to what it was doing

* It works!

looks like the default priority of 900 was fighting with something else that was also 900

commented out some udp packet debugging

* oops, forgot to add the changes the the previous commit

* resolving merge conflicts

* Fixed random http port due to uninitialized _port

* cleaning up compiler warning

* cleaned up CMakeLists to remove warning:
Note: No relevant classes found. No output generated.
2016-06-24 17:46:30 +02:00
penfold42
b6a0b7261d logging migration for ws281x and LedUdpDevice (#45) 2016-06-24 17:46:23 +02:00
redPanther
33ebdcaffc - add cmake qt check, minimum 5.2 (#40)
- on x86 use dynamic avahi libs
- fix compile error
2016-06-23 19:56:50 +02:00
redPanther
d4142b4eb4 migrate logging for effects and verbose options (#38)
* start step by step  migration to new logger

* fix linking for serialport

* migrate effectengine to new logger

* tune log messages

* add commandline options for hyperiond to control verbosity
--silent
--verbose
--debug
2016-06-23 13:48:49 +02:00
redPanther
34252b434d fix linking for serialport (#37) 2016-06-23 09:39:56 +02:00
redPanther
93e3981df1 Serialport (#36)
* migrate serialport to qt5 serialport

* remove old serialport
add logging to serialport

* remove try catch - qt serialport uses plain return values

* tiny fix, but not working atm

* make it work, tested with adalight
2016-06-23 00:11:09 +02:00
penfold42
48134d0aef Remove widgets (#35)
* Trying to remove dependency on Widget
removed unused bonjour example source

* forgot the modified files
2016-06-21 23:34:57 +02:00
redPanther
f48af9daff extend logger (#34) 2016-06-21 21:41:26 +02:00
redPanther
eccd4e6637 rework bootsequence (#30)
* udplistener/boblight: use hyperion::getInstance
hyperiond: fix dispmanx is started twice
hyperiond: rework bootsequence - now named as InitalEffect

* pull out webconfig from hyperiondaemon to functional when daemon crashes
initialEffect: forbid foreground effect duration infinitiy
2016-06-20 23:41:07 +02:00
penfold42
1cb6ee0a43 Fixed random http port due to uninitialized _port (#29) 2016-06-20 15:51:34 +02:00
penfold42
a23735d1ef New builtin udp listener (#18)
* Fixed compile error when no grabbers are defined

* Remove stupid avahi warning...

* Started on the new integrated UDP listener to replace the python effect.

Cloned boblight server and rename it to be UDP listener
It compiles!, It starts! it seems to work as a second boblight protocol server...

* moving from the exsting TCP to UDP.
i can catch packets now.. need to consider ditching the connection handling

* It kinda works right now.
UDP packets are received, led data is sent and hyperion displays them.
.... for a moment before going back to what it was doing

* It works!

looks like the default priority of 900 was fighting with something else that was also 900

commented out some udp packet debugging

* oops, forgot to add the changes the the previous commit

* resolving merge conflicts
2016-06-20 08:38:12 +02:00
brindosch
065e65b8e0 cleanup: remove ambiled and fix typo (#13)
* cleanup: remove ambiled device

as written at the forum this is no longer supported. All people should move to adalight. They just need to flash a new sketch.

* fix typo
2016-06-19 17:18:11 +02:00
redPanther
4533b34606 Hyperiond refactoring + preparation for ip restriction settings (#12)
* make hyperion to singelton.
remove arguments for config and hyperion - both are gettable via Hyperion::getInstance

* refactor hyperiond

* remove qt4 comapt
make zeroconf mandatory
refactor hyperiond

* xbmcchecker is now a singleton

* cleanup in hyperiond
zeroconf switchable between static and shared linking

* fix xbmcchecker

* extensive refactoring of hyperiond
webserver: make client ip information availabel in request object - preparation for ip filters
proto/json server, use hyperion::getInstance instead of hyperion argument

* move creation of hyperion core into hyperionDeamon class
cleanup
2016-06-19 00:56:47 +02:00
penfold42
0e5607db65 Fixed compile error when no grabbers are defined + remove avahi warning (#11)
* Fixed compile error when no grabbers are defined

* Remove stupid avahi warning...
2016-06-18 16:33:25 +02:00
redPanther
88fbc4dfde refactoring and cleanup (#2)
* make hyperion to singelton.
remove arguments for config and hyperion - both are gettable via Hyperion::getInstance

* refactor hyperiond

* remove qt4 comapt
make zeroconf mandatory
refactor hyperiond

* xbmcchecker is now a singleton

* cleanup in hyperiond
zeroconf switchable between static and shared linking

* fix xbmcchecker
2016-06-17 01:25:40 +02:00
redPanther
4a841710dd webui - "cgi" handler and multiple fixes (#700)
* initial commit of webconfig

* update example config with webconfig and fix format of file
update debian postinst script for install example config

* fix compiling
add new web server command "serverinfo" to use in webapp to retrieve json port

* change web default port to 8099

* add cgi engine to webserver

* fix include
2016-06-14 20:14:06 +02:00
redPanther
eb64e7e528 webui fix and serverinfo (#699)
* initial commit of webconfig

* update example config with webconfig and fix format of file
update debian postinst script for install example config

* fix compiling
add new web server command "serverinfo" to use in webapp to retrieve json port

* change web default port to 8099
2016-06-13 22:54:08 +02:00
redPanther
9f564f8d89 fix build on osx (#695) 2016-06-12 22:27:34 +02:00
redPanther
7dfb9f1967 integrated webserver ... (#697)
* initial commit of webconfig

* update example config with webconfig and fix format of file
update debian postinst script for install example config
2016-06-12 22:27:24 +02:00
brindosch
8746e0795c -
Former-commit-id: 7aa71ba95e2bb9d76daf612a79fc3f1dd745cf0e
2016-06-10 23:54:53 +02:00
brindosch
4743208eff silent kodi check
Former-commit-id: 45199d123fcf49194aeaaf2df0789dc7ea4df449
2016-06-10 19:52:03 +02:00
brindosch
b3fa72adba fix
Former-commit-id: 2019d94e3bb06e23890759aecfd646facbcc0f37
2016-06-10 18:55:42 +02:00
brindosch
ae40edc578 Add version string to json output (#690)
* hyperionversionid

* typo

* -


Former-commit-id: ec5777ccb32fc343ef2f478a7c779a901c8aa489
2016-06-10 18:32:50 +02:00
Paulchen-Panther
f0dec4cf73 Hyperion X11 KodiCheck (#685)
* Update X11Grabber.h

* Update ProtoConnection.h

* Update ProtoConnectionWrapper.h

* Update ProtoServer.h

* Update X11Grabber.cpp

* Update message.proto

* Update ProtoClientConnection.cpp

* Update ProtoClientConnection.h

* Update ProtoConnection.cpp

* Update ProtoConnectionWrapper.cpp

* Update ProtoServer.cpp

* Update hyperion-x11.cpp

* Update X11Wrapper.cpp

* Update X11Wrapper.h

* Update hyperiond.cpp

* Update ProtoClientConnection.cpp

* Update X11Wrapper.cpp

* Update hyperiond.cpp


Former-commit-id: a572f275b270217cd8ce8cdd91b3eca3037d6472
2016-06-07 23:12:18 +02:00
redPanther
614131ebe6 compile fix, cleanup (#684)
* implement make install
set CMAKE_INSTALL_PREFIX e.g. to /opt to install to /opt/hyperion
set ENABLE_SYSTEM_INSTALL to ON to activate installation
after compiling use
make install
or
make install/strip
(for performance/size optimized binaries - compile in Release to get best performance)

* cleanup cmake files
use
cmake -DINSTALL_PREFIX=/opt/hyperion ..
to install all files to hyperion or
cmake -DINSTALL_PREFIX=/usr/
to install to usr. install folders are linux standard. bin go to bin folder and additionals (effects) go to share/hyperion

* add uninstall target - be patient with that, this will remove files from your system
install service files to share/hyperion - if you want to use them you have to make a symlink to your location of service files

* optimize build release script
install service files into hyperion share folder (services not activated, this must be done by distribution package script)
initial support of cmake option -DPLATFORM= option. This selects platform specific cmake flags. no need for -DENABLE_... options (unless you want some special things)
automatic detect for apple build

* update submodule

* fix cmake error when no platform is given

* initial support for deb,rpm and tgz packages - no usefull content atm!

* make packeages contain usefull stuff

* add license
make packes more functional. package specific install missing yet

* implement debian postinstall

* disable rpm generation until it has a working state

* add hypercon compat

* add posibility for multiple config files. first one found is taken

* remove hyperion comaptlayer
services is not started automaticly

* rework debian postinstall:
- remove /opt compatibility complety. This makes more trouble as it is usefull
- when hyperiond already started, restart it
- cleanup

* add deb package dependencies

* wipe out last support for /opt installation

* change default effect path in config to /usr

* revert service files and config files

* remove last occurences of ENABLE_PROTOBUF
fix cmake warnings and make it ready for cmake 3
fix refactoring of hyperiond.cpp creates no objects for network services

* all arguments via reference ...

* fix xbmcchecker not working

* add logger class

* - profiler must be activated with ENABLE_PROFILER, otherwise an error will raise
-> this should prevent profiler gets into release code

* fix profiler

* make logger compat with older/partial c++11 versions (r.g. debian wheezy)
fix description of optionparser
fix atmoorb not compile for qt4. now it should compile for qt5 and 4

* make logger compiles with qt5 too
fix compiler warnings

* remove debug code


Former-commit-id: 6aa41351667caed712b1f28010dbedfca8a6a5a0
2016-06-07 22:24:29 +02:00
brindosch
ad65ca2983 atmoorb qt5 fix (#683)
Former-commit-id: 64ce9cd676059d5225493a97c89b83f589f68417
2016-06-07 13:17:40 +02:00
brindosch
9578a3e386 Kodicheck: Add option for pause modus (#681)
* introduce pause mode

* fix it fe...

* fix

* fix compile warning

* change solution

* fix order

* fix

* last update

* -


Former-commit-id: b35c4d672aed5be7a6a694b3c861c6cf287d89df
2016-06-07 12:34:50 +02:00
redPanther
f39f074dcf add logger/compiler class (#680)
* implement make install
set CMAKE_INSTALL_PREFIX e.g. to /opt to install to /opt/hyperion
set ENABLE_SYSTEM_INSTALL to ON to activate installation
after compiling use
make install
or
make install/strip
(for performance/size optimized binaries - compile in Release to get best performance)

* cleanup cmake files
use
cmake -DINSTALL_PREFIX=/opt/hyperion ..
to install all files to hyperion or
cmake -DINSTALL_PREFIX=/usr/
to install to usr. install folders are linux standard. bin go to bin folder and additionals (effects) go to share/hyperion

* add uninstall target - be patient with that, this will remove files from your system
install service files to share/hyperion - if you want to use them you have to make a symlink to your location of service files

* optimize build release script
install service files into hyperion share folder (services not activated, this must be done by distribution package script)
initial support of cmake option -DPLATFORM= option. This selects platform specific cmake flags. no need for -DENABLE_... options (unless you want some special things)
automatic detect for apple build

* update submodule

* fix cmake error when no platform is given

* initial support for deb,rpm and tgz packages - no usefull content atm!

* make packeages contain usefull stuff

* add license
make packes more functional. package specific install missing yet

* implement debian postinstall

* disable rpm generation until it has a working state

* add hypercon compat

* add posibility for multiple config files. first one found is taken

* remove hyperion comaptlayer
services is not started automaticly

* rework debian postinstall:
- remove /opt compatibility complety. This makes more trouble as it is usefull
- when hyperiond already started, restart it
- cleanup

* add deb package dependencies

* wipe out last support for /opt installation

* change default effect path in config to /usr

* revert service files and config files

* remove last occurences of ENABLE_PROTOBUF
fix cmake warnings and make it ready for cmake 3
fix refactoring of hyperiond.cpp creates no objects for network services

* all arguments via reference ...

* fix xbmcchecker not working

* add logger class

* - profiler must be activated with ENABLE_PROFILER, otherwise an error will raise
-> this should prevent profiler gets into release code

* fix profiler


Former-commit-id: b716dd40dbf5b837356eec876d85ec71c86d5c6c
2016-06-05 16:08:55 +02:00
redPanther
f2e9193987 fix #674 (#676)
* implement make install
set CMAKE_INSTALL_PREFIX e.g. to /opt to install to /opt/hyperion
set ENABLE_SYSTEM_INSTALL to ON to activate installation
after compiling use
make install
or
make install/strip
(for performance/size optimized binaries - compile in Release to get best performance)

* cleanup cmake files
use
cmake -DINSTALL_PREFIX=/opt/hyperion ..
to install all files to hyperion or
cmake -DINSTALL_PREFIX=/usr/
to install to usr. install folders are linux standard. bin go to bin folder and additionals (effects) go to share/hyperion

* add uninstall target - be patient with that, this will remove files from your system
install service files to share/hyperion - if you want to use them you have to make a symlink to your location of service files

* optimize build release script
install service files into hyperion share folder (services not activated, this must be done by distribution package script)
initial support of cmake option -DPLATFORM= option. This selects platform specific cmake flags. no need for -DENABLE_... options (unless you want some special things)
automatic detect for apple build

* update submodule

* fix cmake error when no platform is given

* initial support for deb,rpm and tgz packages - no usefull content atm!

* make packeages contain usefull stuff

* add license
make packes more functional. package specific install missing yet

* implement debian postinstall

* disable rpm generation until it has a working state

* add hypercon compat

* add posibility for multiple config files. first one found is taken

* remove hyperion comaptlayer
services is not started automaticly

* rework debian postinstall:
- remove /opt compatibility complety. This makes more trouble as it is usefull
- when hyperiond already started, restart it
- cleanup

* add deb package dependencies

* wipe out last support for /opt installation

* change default effect path in config to /usr

* revert service files and config files

* remove last occurences of ENABLE_PROTOBUF
fix cmake warnings and make it ready for cmake 3
fix refactoring of hyperiond.cpp creates no objects for network services


Former-commit-id: 56e3e0d1014999b2555418c7b5a2898ac29fb5f1
2016-06-04 19:26:34 +02:00
penfold42
e8207cfe31 fix more "dos" line endings (#673)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* cleaned up a couple of compiler warnings

* moved bitpair_to_byte initialiser to (hopefully) work with older GCC

* compiler warning in udp driver
removed some tabs in ws2812b.cpp

* formatting - spaces to tabs

* moved rpi_281x to tag sk6812-v1.0

* moving to my fork of rpi_281x

* removed dos line endings

* Found some more "dos" line ending files


Former-commit-id: c756e3ccc153fd36e23a26eff37a1230bdd4b9b4
2016-06-03 16:46:45 +02:00
penfold42
d5ce395e8e Add sk6812rgbw support (#666)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* adding support for SK6812 - not working yet

* Changed rpi_ws281x submodule to be penfold42's fork

* Set White to zero for now

* starting on the code to make the White led do stuff

* Added some basic whie led calculation
white = min(r,g,b)
r-=w, g-=w, b-=w

* cleaned up a couple of compiler warnings

* updated strip type to use corrected RGBW strip type
(the SK6812RGBW datasheet is wrong)

* moved bitpair_to_byte initialiser to (hopefully) work with older GCC

* compiler warning in udp driver
removed some tabs in ws2812b.cpp

* formatting - spaces to tabs

* moved rpi_281x to tag sk6812-v1.0

* attempt #3 at migrating the rpi_281x submodule to my fork/branch

* moving to my fork of rpi_281x

* Started implementing multiple RGB to RGBW conversion options

a quick hack has been implemented inside WS281x.cpp but ive started
moving this to RgbToRgbw.cpp for reuse by other led device types

* migrated RGB to RGBW conversion to RgbToRgbw.cpp


Former-commit-id: ff8e9038c4bb8203b71b42d12bf23be4abcc0b3b
2016-05-31 22:55:56 +02:00
penfold42
6fbfda03fa add zeroconf support based on qt4 libraries (#667)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* added bonjour/zeroconf service discovery to the json interface.

When clients are also modified, they can
- find hyperiond on the network much more quickly than ping/portscan;
- find multiple instances running on different ports instead of assuming 19444

* Moved zeroconf calls to hyperiond.cpp

* Added mDNS/zerconf/bonjour registration for proto server

Added config options.
        "jsonServer" :
        {
                "port" : 49444,
//              "mDNSDescr" : "hyperiond jsonServer blah de blah",
                "mDNSService" : "_hyperiond_json._tcp"
        },

* cleaned up a couple of compiler warnings

* moved bitpair_to_byte initialiser to (hopefully) work with older GCC

* compiler warning in udp driver
removed some tabs in ws2812b.cpp

* formatting - spaces to tabs

* moved rpi_281x to tag sk6812-v1.0

* moving to my fork of rpi_281x

* Now uses the led device name and hostname to create the annouce name


Former-commit-id: abfa51bcf359cafa63338181c1b83ecfd231bc87
2016-05-31 22:55:11 +02:00
ntim
03cee33784 Fix for Philips Hue flickering when switchOffOnBlack is set true (#668)
* Improved switch off on black feature.

* Changed "isnan" to "std::isnan"


Former-commit-id: 5db2b97674661e4e19f796a91dd443a501268e27
2016-05-31 22:54:47 +02:00
penfold42
6f43fe1196 New QT based udp driver (#662)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* cleaned up a couple of compiler warnings

* moved bitpair_to_byte initialiser to (hopefully) work with older GCC

* compiler warning in udp driver
removed some tabs in ws2812b.cpp

* formatting - spaces to tabs

* moved rpi_281x to tag sk6812-v1.0

* moving to my fork of rpi_281x

* half way thru re merging the newudp support

* Whoops.... dont know how it compiled before..

* Removed debugging that was commented out


Former-commit-id: ac4330422f93f3d594dfcba5593759288298d25e
2016-05-30 23:58:31 +02:00
Paulchen-Panther
23042ba07c Update Json Interface (Active LED Color) (#664)
* add getCurrentPriority

* add getCurrentPriority

* Update active led color


Former-commit-id: 0e6b828991fdf51d2ec859d3836ce4f976dfd88c
2016-05-30 22:39:12 +02:00
tpmodding
019d4ba6d8 Update LedDevicePhilipsHue.cpp
Changed "isnan" to "std::isnan"

Former-commit-id: 528f02452762fade16b84d17dc7692de9129559c
2016-05-27 11:16:42 +02:00
redPanther
945f3d1c5b big code cleanup. mostly line endings and indentions (#659)
No functional changes - except protobuffer is mandatory and not optional now.

Former-commit-id: 1e6347e708707cc388cdedb8d0352a9f017030b8
2016-05-26 23:44:27 +02:00
brindosch
13b08d5df1 Merge branch 'Beta' of https://github.com/hyperion-project/hyperion into Beta
Former-commit-id: 7e6f328f5cd1912374fb25a5676e07b9e44630be
2016-05-26 07:46:01 +02:00
brindosch
716935dfff xbmc checker fix (3)
Former-commit-id: c8b406033d333177dd2470522b2d8526a9c02d07
2016-05-26 07:45:54 +02:00
redPanther
a41051cc84 prevent colorsmoothing from flooding led device with data when no new input data is available (#654)
resolve compiler warnings

Former-commit-id: c7fbdce5dc7fde8b8e188320408dc547b9ad5e51
2016-05-26 07:01:10 +02:00
brindosch
84d9f4ef80 xbmc checker fix (2)
Former-commit-id: 735f8e3e356b0fca0562185f30532860c7879ee3
2016-05-25 21:15:49 +02:00
brindosch
1e319be54a hotfix x11grabber
Former-commit-id: 7068bad863cf229e01382f859ff06a51dad82d17
2016-05-25 18:53:09 +02:00
Funatiq
45dff6d1d3 Reduce saturation in backlight (#651)
Former-commit-id: c2c4fd6f957c3623e03c37393cf3c03a7a27dc1e
2016-05-24 22:15:39 +02:00
redPanther
06afe06774 better output for effect path loading (#652)
* better output for effect path loading

* effectengine: error when no efx available


Former-commit-id: 7724e56850ef9f9a703fb41e82baf88e5534f492
2016-05-24 22:14:45 +02:00
Paulchen-Panther
409ef383f3 XRender support for X11 Grabber (#649)
* Update X11Grabber.h

* Update X11Grabber.cpp

* Update CMakeLists.txt

* Update hyperion-x11.cpp

* Update X11Wrapper.cpp

* Update X11Wrapper.h


Former-commit-id: d2f7cb0e22248a0c2963bf53728f2e0d7bb9dee1
2016-05-24 19:55:50 +02:00
Funatiq
f8b724f9f9 Minimum luminance for backlight in dark scenes (#646)
* Include miminum luminance

* Add luminance minimum

* Add luminance minimum

* fixed missing ;

* Add luminance minimum

* Add luminance minimum check

Check if luminance mimimum is other than default

* Add luminance minimum

* Add luminance minimum

* Add luminance minimum

* Add luminance minimum

* Add luminance minimum

* Safe luminance calculation


Former-commit-id: 35a762b18b473a333155acba7a00894204400076
2016-05-23 00:00:48 +02:00
penfold42
c179b86b8d fix LedDeviceWs2812SPI to compile on gcc 4.6 (#643)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* cleaned up a couple of compiler warnings

* moved bitpair_to_byte initialiser to (hopefully) work with older GCC

* compiler warning in udp driver
removed some tabs in ws2812b.cpp

* formatting - spaces to tabs


Former-commit-id: 42cc7325177c9fcc3d1bd29cbfe72f02118d3233
2016-05-22 12:56:44 +02:00
Funatiq
82f3fbdb20 Reorder Transform and Adjustment (#636)
Change order from "Adjustment -> Transform" to "Transform -> Adjustment"

Former-commit-id: 5b63d0bce98a80b5a2604e43772574ec6bbfd2a5
2016-05-22 00:30:53 +02:00
Funatiq
4afd730954 Better color adjustment (#637)
Only apply color channel if color is dominant. Grey color independent from color channels. Linear increase of color channel from grey to maximum.

Former-commit-id: cda9fca0084174877c45a7e9a867e6209ffe9e44
2016-05-22 00:30:28 +02:00
Matthias Reichl
f584b05de5 dispmanx: fix grabber issues with certain widths and support cropping (#634)
* dispmanx: fix grabber issues with certain widths and support cropping

The dispmanx grabber will produce garbage output if the destination
pitch is not set to a multiple of 64 bytes (16 RGBA pixels).

It can also fail when retrieving only a part of the image
(eg in 3DSBS or TAB mode).

Handle these cases by capturing the full image into a separate
buffer with the pitch set to an appropriate value and manually
handle 3D SBS/TAB left/top half copying.

At this point supporting cropping like in the V4L2 grabber is
rather easy and added as well. This'll help handling overscan
setups (old TVs) and removing (possibly asymmetric) overscan
borders.

Cropping is disabled in video capture mode (when the
DISPMANX_SNAPSHOT_FILL flag is set).

Signed-off-by: Matthias Reichl <hias@horus.com>

* hyperion-dispmanx: add optional crop values and 3D mode options

Signed-off-by: Matthias Reichl <hias@horus.com>

* hyperiond: support cropping on the dispmanx grabber

Honor cropLeft, cropRight, cropTop and cropBottom settings in
the framegrabber section of the conf file to control cropping.

Signed-off-by: Matthias Reichl <hias@horus.com>

Former-commit-id: bbb55f6621b90384e417f37da4f2543d112ef57a
2016-05-18 11:26:25 +02:00
Rick164
4ccda40250 Kodi video checker bugifx (#633)
* Kodi video checker patch to make it compliant with recent JSON RPC API specs.

* Updated inline documentation for Kodi video checker.


Former-commit-id: e0760f55e1ddd61f10ae457c485aa01ae4507260
2016-05-17 02:54:10 +02:00
recliq
8310a6d9d0 added simple TPM2.net support to UDP output (#627)
Former-commit-id: 59356ae53c90e178a4bc198c6babc5832bb15d12
2016-05-15 18:39:26 +02:00
penfold42
a960894d14 Another option for Ws2812 - direct spi from the pi with 1 wire (#631)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* This add a new device type - ws2812spi.

I've (ab)used the SPI interface to send the correct timing pulses to keep the ws2812 happy.
THE RATE IS IMPORTANT!
A FIXED CORE_CLK IS IMPORTANT!

Attach the SPI MOSI pin on the Pi to the DIN pin on your ws2812

        "device" :
        {
                "name"       : "MyPi",
                "type"       : "ws2812spi",
                "colorOrder" : "grb",
                "output"     : "/dev/spidev0.0",
                "rate"       : 3800000
        },

* updated hyperiond.test-binary

* Updated default SPI speed to the "correct" value.
My Pi was undervolted so was dropping the core clock confusing everything

* Code cleanups
explicitly set the final 3 bytes to 0

* Removed latchtime option - not applicable

* updated test binary


Former-commit-id: d3c19c8374999f7a554bb25ca181a8a483f86289
2016-05-15 18:39:17 +02:00
penfold42
c17e4894d9 Apa102 fix if the led strip has more physical LEDs than you want to configure with hyperion (#626)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* started bug fixes for APA strips with more physical leds than configured

* 1st cut of changes to APA102.

now looks at config for "leds" which is the # of hardware leds in the strip.
This enables us to write the correct trailer length in the packet.

Also fixed a bug where switchoff was writing the wrong # of leds

* removed commented out old code

removed debug printf

* included prebuild test binary for Pi2

* Second attempt at the fix.
BEFORE:
If you have more physcial LEDs than defined in the "leds" "index" section of the config there is random junk added to the end of the strip.

WITH THIS FIX:
In the "device" section specify the number of physical leds with:
 "leds" : 212,
If this is greater than the number of led indexes, additional LEDs are set to black
If this is smaller than the number of led indexes, it is ignored

* included test binary

* Clean exit if the device config is missing or a non-supported device type is specified

Former-commit-id: 8ae96188fa74d91b13a921e7d5faf6d6ac1c42ee
2016-05-10 12:16:19 +02:00
Paulchen-Panther
536b51dba1 Update JsonClientConnection.cpp
JSON API: Get current LED color

Former-commit-id: 0b40c1eb1627afd8077bdf690109609fd531c2fb
2016-05-06 15:05:28 +02:00
RickDB
3227a3125b AtmoOrb - removed skip same color change.
Former-commit-id: 399ad830d9ecad8bf8d1e62241744f15631f0515
2016-05-05 14:48:33 +02:00
penfold42
deed8066b0 Piblaster fix (#614)
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config

Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process

* reversing errant change to hyperion.systemd.sh

* Experimental changes to piblaster code to work how i think it should

It is now assumed that the PWM pins in groups of 3 correspond to RGB channels of the led.
                "assignment"       : "rgbrgbrgb",
Would result in:
//Channel number    GPIO number   Led channel
//      0               4             0 red
//      1              17             0 green
//      2              18             0 blue
//      4              27             1 red
//      5              21             1 green
//      6              22             1 blue
//      7              23             2 red
//      8              24             2 green
//      9              25             2 blue

* Ammend pwm channel mapping comments to match the code

* 1st cut of the new more flexible piblaster pin mapping support

it works but is still rough

* removed old "assignment" handling
- prints an error messaage if found and terminates

fixed the switchoff method

* removing iPins hard coded list of valid GPIO pins

* removed iPins array for switchOff function

* code cleanups

input validation

* Handle catching (and ignoring) SIGPIPE.
You can now kill and restart pi-blaster daemon and hyperiond will gracefully recover

* added a binary for testing

* Added sample config and my modified pi-blaster version to support more GPIOs

* moved hyperiond

* removed testing binaries

move sample configuration to the configs directory

* re enabled device config display

* removed sample configuration


Former-commit-id: 95e4d4ea2fb7cb5439e8cd597883a638da61a574
2016-04-29 16:00:33 +02:00
Paulchen-Panther
bb9b02cf05 get current state (active Effects) over JSON Interface (#608)
* Create ActiveEffectDefinition.h

* Update EffectEngine.h

* Update Hyperion.h

* Update Effect.h

* Update EffectEngine.cpp

* Update Hyperion.cpp

* Update JsonClientConnection.cpp


Former-commit-id: 5664b69da6893dd0d0de0e7c74c01cdcafd57310
2016-04-24 17:07:31 +02:00
Rick164
d4dda2dcc4 AtmoOrb LedDevice now only processes new color commands and skips identical, saves last send color per light id separately in Qmap. (#602)
Former-commit-id: 38873e5b718c73d95111abcb10cf148f6a6ab18b
2016-04-21 14:51:43 +02:00
Rick164
02fef83bb8 AtmoOrb smoothing additions
* Updated smoothing options for AtmoOrb, can now choose between Orb external or Hyperion's internal smoothing.
With skipSmoothingDif you can set the maximum allowed color difference before overriding / clearing Orb smoothing during faster color change like for instance color <-> black.

* Updated inline documentation.

* Fixed command type typo in AtmoOrb device.

* Corrected variable spelling in AtmoOrb device.

* Make smoothing also match equal values for AtmoOrb smoothing differential


Former-commit-id: 3eede43c2f76fa324f0144aeac0526b8125ad149
2016-04-02 00:07:28 +02:00
AEtHeLsYn
b37cbd26d5 Add color adjustment to all RBG channels
* Channel adjustment config

* Create RgbChannelAdjustment.h

* Delete RgbChannelAdjustment.h

* Create RgbChannelAdjustment.cpp

* Create RgbChannelAdjustment.h

* Delete RgbChannelAdjustment.cpp

* Create ColorAdjustment.cpp

* Delete RgbChannelAdjustment.h

* Create ColorAdjustment.h

* Update ColorAdjustment.h

* Update ColorAdjustment.h

* Update ColorAdjustment.h

* Update ColorAdjustment.cpp

* Update Hyperion.cpp

* Update Hyperion.cpp

* Update Hyperion.cpp

* Update Hyperion.h

* Create RgbChannelAdjustment.cpp

* Create RgbChannelAdjustment.h

* Create ColorAdjustment.h

* Create MultiColorAdjustment.h

* Update MultiColorAdjustment.h

* Create MultiColorAdjustment.cpp

* Delete ColorAdjustment.cpp

* Delete ColorAdjustment.h

* Update RgbChannelAdjustment.cpp

* Update Hyperion.cpp

* Update Hyperion.h

* Update Hyperion.cpp

* Bug fixes

* Update hyperion.config.json

* Add color adjustment to json server and client and adapt hyperion-remote

* Change the color modification order

* Minor bug fix

* Create calibration Images folder

* Create calibration Gamma folder

* Create calibration RGB folder

* Added files via upload

* Delete .gitkeep

* Delete .gitkeep

* Added files via upload

* Delete .gitkeep

* Update color effect order and don't correct twice

* Uploaded gradient images


Former-commit-id: 8ab465e59834f12a21709a6f4546bd6808a2a495
2016-04-02 00:04:11 +02:00
brindosch
ad584aa548 Typos
Former-commit-id: fc7bc3c0e4bddcb5a6b778c2afabc3940a08782c
2016-03-23 18:54:49 +01:00
brindosch
f332473b77 Merge remote-tracking branch 'refs/remotes/origin/Beta'
Former-commit-id: 5bdbda1406bb0ddb99440502584604b85b0f3063
2016-03-23 17:53:32 +01:00
brindosch
fa66c3b2b5 Rework log messages
Former-commit-id: eac93c0fd78fdf353e940d08df3cabf0b962a3e2
2016-03-23 17:40:45 +01:00
penfold42
a3204ae6be LedDeviceFile now defaults to /dev/null if the output is omitted.
Former-commit-id: eff12ec16d08ffa00287ed68238ab6b397f1c53d
2016-03-23 21:28:31 +11:00
penfold42
7dce3ab798 renamed the "Test" device to be "File"
No functional changes, but
- files have been renamed
- the device name is now "file" not "test"


Former-commit-id: 3fbc03c3fe1d764654c1d28ebb80562ce6276ab1
2016-03-23 21:12:34 +11:00
penfold42
6143075365 1. changed default number of pwm LEDs to 256
2. Adds support for level shifters that invert the data
Config option - "invert" (integer)
if omitted, do not invert
if == 0, do not invert
if !=0, invert


Former-commit-id: fd5b2863a85b11ac3a8444d1e02822f852feb556
2016-03-22 23:50:14 +11:00
brindosch
fb7445b545 Update
Former-commit-id: 3c6ac5d2f618cd7499c16bca950ff3d41f855318
2016-03-22 01:01:54 +01:00
brindosch
1f18073f00 Merge pull request #534 from AEtHeLsYn/master
Color correction

Former-commit-id: 7be726f1adb8698684a2b4726650082ed517901f
2016-03-22 00:56:41 +01:00
brindosch
2677304ec4 Merge pull request #553 from ntim/support_for_philips_hue
Improved validity checks and memory footprint for Philips Hue

Former-commit-id: 65b450ae730fd5e06006a8fe6ab3e3b6ce260c43
2016-03-22 00:56:27 +01:00
AEtHeLsYn
3c2682b626 Update JsonClientConnection.cpp
Former-commit-id: 5014c392b3c7629b6f02ead321621f7edc560680
2016-03-21 17:42:13 +01:00
AEtHeLsYn
b46d231f75 Update JsonClientConnection.cpp
Former-commit-id: fef896ef86f04901cf2227a0897dd9ea999325b7
2016-03-21 17:07:02 +01:00
AEtHeLsYn
642de44c7c Update JsonClientConnection.cpp
Former-commit-id: 53b8cf73df6f3cec49886169b870e5490828716b
2016-03-21 17:04:02 +01:00
AEtHeLsYn
ef1f269c51 Update schema-correction.json
Former-commit-id: 223e5d183fd2ec83f61421aaa142bc86958fff6a
2016-03-21 17:00:01 +01:00
AEtHeLsYn
35b7707b3f Update schema-temperature.json
Former-commit-id: 3f5a96e0275e239ba0361905282b59a9bd4412d0
2016-03-21 16:59:46 +01:00
Mark Walker
d2973ff20b Add ws281x driver parameter for PWM channel
The RPi 2 and 3 have two PWM channels and 3 PWM pins available to the
gpio header.  BCM18 and BCM12 run on PWM channel 0.  BCM13 runs on PWM
channel 1.  This change allows BCM13 to be used by allowing the PWM
channel to be specified.


Former-commit-id: 3693ab438c2b369e6307c262d32bba509409e5b9
2016-03-20 22:05:24 -07:00
ntim
e0c3ece80d Deletion of qt network reply objects.
Former-commit-id: 258badb680014a187d76d9183080ea3de6895692
2016-03-20 13:33:41 +01:00
ntim
926f47fc1a Added more precise outputs on failures as well as some additional checks.
Former-commit-id: a0def586410d90abda002504d9c2ae88abc43088
2016-03-19 12:36:55 +01:00
ntim
d75a88eb9f Retreived one light more than necessary.
Former-commit-id: 6ee5b0f4a86210fcf4bf3ee96b369aff20c25720
2016-03-17 09:06:28 +01:00
AEtHeLsYn
75991c16e1 Merge pull request #7 from tvdzwan/master
Up-to-date

Former-commit-id: ca05f264b29838c2444f2687ff1bf510bbf9d9af
2016-03-16 10:40:38 +01:00
RickDB
7adb339dea Updated orbIds config setting and sample config.
Former-commit-id: 350db40b53d04efbb43dc8c87c88bf2eb378fa6b
2016-03-15 18:37:55 +01:00
RickDB
f783c59185 Corrected indenting in LedDeviceFactory.cpp.
Former-commit-id: 31713a4a0ce9bd25fd1e39969bbb481363a80167
2016-03-15 12:06:24 +01:00
RickDB
e5545eaac0 Code reformatted.
Former-commit-id: 6f3688791602efb33389c3ba789e7a8a723ee290
2016-03-15 12:03:00 +01:00
RickDB
dcc6a9b449 Make sure the byte array is empty before filling it.
Former-commit-id: 64f76fa358234e131377ecfabf196f3c7324e79f
2016-03-15 11:45:25 +01:00
RickDB
5be072be24 Added more inline documentation.
Simplified joinedMulticastgroup.
Removed non-required functions and includes.


Former-commit-id: 829b5c6f89ee1e9a4789dbe18f911b05e3b5d8e1
2016-03-15 11:10:04 +01:00
RickDB
fdb164da0a Added multi Orb support, Orb ID should match that of leds index with a +1 offset (index 0 = Orb id 1 etc..)
Code cleanup.


Former-commit-id: af8a6df876f334c9a65b1a936b5bb85b380d86d1
2016-03-14 23:19:20 +01:00
RickDB
0d8c4ac5fb Correctly set buffer size based on number of leds so that it works with non-standard AtmoOrb setups.
Former-commit-id: 6aec2410d6e870c8489e565269f2990e3a9e1b85
2016-03-14 21:19:47 +01:00
RickDB
bd1a45216a Initial AtmoOrb support including sample json config.
Former-commit-id: 51ad57afd39695095b5886966e8c71c4e47f269e
2016-03-14 20:19:19 +01:00
AEtHeLsYn
1f1aee0c37 Final fixex
Former-commit-id: 7b2e1a33ab7705dddadfa1ec99d3d7c379ab10dd
2016-03-13 21:14:22 +01:00
AEtHeLsYn
28f67871dc More fixes
Former-commit-id: 331ba604dba8aa16f9cf42c5827c8542502be545
2016-03-13 13:05:47 +01:00
AEtHeLsYn
a5a17776d4 BugFix
Former-commit-id: 8887ee93d5bcaa7ee13f4f5afb601a65d59ee113
2016-03-13 12:10:54 +01:00
AEtHeLsYn
e4d77660a4 Bug fixes
Former-commit-id: a6783a75edb83988d1737df3d4a7a14c71ec4223
2016-03-13 11:59:36 +01:00
AEtHeLsYn
84c48b9a0a Merge remote-tracking branch 'refs/remotes/tvdzwan/master' into test
Former-commit-id: 19831aa23078659d7f285b0e91bffff21a932283
2016-03-13 11:52:38 +01:00
brindosch
deb010cc22 fix leddevicephue
Former-commit-id: eb4f93bf7a59d496f83d8db534f99cf589c46bc9
2016-03-12 00:55:28 +01:00
brindosch
7508b9c9b0 Merge pull request #535 from redPanther/prio_cleanup
Prio cleanup

Former-commit-id: 9b801630fe3c32232666cc2c5f3f3cfd43da381b
2016-03-11 19:26:01 +01:00
brindosch
e82643ff50 Merge pull request #533 from markwal/rpi_ws281x
Add new WS281x driver

Former-commit-id: 1264edf7f5e0bc29f091e72989ab7116b78056bf
2016-03-11 19:10:13 +01:00
brindosch
9e3b98dfc3 Merge pull request #538 from ntim/support_for_philips_hue
Reads hue light ids in case the user did not supply any.

Former-commit-id: 7dc1e6a14c0bd2b08439d13e7e2acf9f539cf1c1
2016-03-11 19:08:11 +01:00
brindosch
385d5a896d Cleanup and bugfixes
Former-commit-id: 8622ff7fb963eb7c52e816f1c779e9e9869ece53
2016-03-11 19:06:36 +01:00
AEtHeLsYn
28fd10cdcd Update JsonClientConnection.cpp
Former-commit-id: 6216d16565b82427094b030cede48ee589f5c969
2016-03-11 12:46:09 +01:00
AEtHeLsYn
c937dfa674 Update JsonClientConnection.h
Former-commit-id: adc564d5259638c3e79ab5a12550a89c0d719186
2016-03-11 12:32:48 +01:00
AEtHeLsYn
da7183d28b Update Hyperion.cpp
Former-commit-id: 5bad6209c49a8fd9eba5582119d9e130b9bea565
2016-03-10 18:13:46 +01:00
AEtHeLsYn
3370cc6271 Update MultiColorTransform.cpp
Former-commit-id: c743c2fec460d645b64c1172212469287af6a8db
2016-03-10 17:54:39 +01:00
AEtHeLsYn
b6c08ae34f Update CMakeLists.txt
Former-commit-id: 808a5c9a22a57f6d6ee77adb1c1f112b291b7188
2016-03-10 17:28:34 +01:00
AEtHeLsYn
9e13303a4a Added files via upload
Former-commit-id: 55b74524b06af6f5c443053a56216c0db465fb2f
2016-03-10 17:27:25 +01:00
ntim
7849e9f23e Reads hue light ids in case the user did not supply any.
Former-commit-id: 3323fe83e3bb5f42c4b6c98cbbb021fb929cf54d
2016-03-10 09:33:16 +01:00
AEtHeLsYn
90b9acf68e Update Hyperion.cpp
Former-commit-id: 4c3f0a561d7def20dd713add0d437bdf12431e0b
2016-03-09 19:57:03 +01:00
AEtHeLsYn
63e3380ff7 Update Hyperion.cpp
Former-commit-id: 24638e6009da0dc3a2168caef53e09664c1db095
2016-03-09 19:45:00 +01:00
AEtHeLsYn
88e4737b8b Update CMakeLists.txt
Former-commit-id: 8afa5615ac8ff62ac6492083f2d2c487cf305dbc
2016-03-09 19:42:54 +01:00
AEtHeLsYn
1fa54a1cee Update CMakeLists.txt
Former-commit-id: 5182f0e28c8914a970db7c4c0d9fee68d7481e65
2016-03-09 19:42:18 +01:00
AEtHeLsYn
9db45c0ffb Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
# Conflicts:
#	include/hyperion/Hyperion.h
#	libsrc/hyperion/CMakeLists.txt
#	libsrc/hyperion/Hyperion.cpp


Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e
2016-03-09 19:25:04 +01:00
redpanther
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
redpanther
eb64cc6601 Merge remote-tracking branch 'upstream/master/master' into prio_cleanup
Conflicts:
	config/hyperion.config.json

Former-commit-id: 7f6fd562b78a6c4b646d9f1587941265b2ca12e0
2016-03-09 07:09:20 +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
Mark Walker
78e606a1c4 Add new WS281x driver
Add a new WS281x driver which is a wrapper around jgarff's ws281x library which
works on Pi B+, Pi 2, Pi Zero and probably Pi 3 as well.

jgarff's ws281x library is included as a submodule


Former-commit-id: e473dfd36d31b14598da5e56e4b8bf9f2aa7bb24
2016-03-08 20:41:13 -08:00
brindosch
14fc1d9bb6 Merge pull request #514 from penfold42/master
add configuratble latch time for ws2801

Former-commit-id: cd226d63ebf4d158ce72cb88d49887d8e19a185c
2016-03-08 22:53:29 +01:00
redpanther
0bc725054c make all prios settable and make prios more consistent
Former-commit-id: f1d1c35063e98389d627f3535d2a94da33a22da4
2016-03-08 17:31:56 +01:00
Serhan
7f4ea9ae7b Merge pull request #509 from tpmodding/patch-1
Update CMakeLists.txt for OpenElec -> Python 2.7

Former-commit-id: 7a088e38a0079bef4a083a3336da92036773ef45
2016-03-08 15:52:50 +01:00
redpanther
ea89a85ddb make protoconnection to invalid host less blocking
Former-commit-id: e7a89c87b15fbe9809ec63468b59ecc55c6d3e72
2016-02-25 15:21:25 +01:00
penfold42
3be4ebe6dc clean up formatting
Former-commit-id: dc3a3c7597af42b8fb37f09011d52ebacffd8959
2016-02-25 22:33:13 +11:00
penfold42
c30879017c Merge branch 'master' of https://github.com/penfold42/hyperion
Former-commit-id: eb4dcbd95b97c70fd54a204a1028636237ddda0c
2016-02-25 22:25:19 +11:00
redpanther
e667be5e0b Merge remote-tracking branch 'upstream/master' into proto_json_forwarder
Former-commit-id: 6eb800d3ed5badd831bd79fc8cfb66115df8ec28
2016-02-24 15:07:30 +01:00
redpanther
8fdf97e693 prepare standalone amlogic grabber
activate internal amlogic grabber forwarding


Former-commit-id: 21dabf759935836eef556baeb8a27e362e95ae96
2016-02-24 14:42:25 +01:00
redpanther
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
tpmodding
63e150756d Update CMakeLists.txt
If you want to compile for OpenElec on Raspberry Pi, you must use Python 2.7

Former-commit-id: 813a997161461b90626359e2e23149f8fab59fbf
2016-02-24 00:24:46 +01:00
tvdzwan
9e03b4beec Merge pull request #496 from wisc17/blackborder
Blackborder Improved +

Former-commit-id: 7de859369bb5dec4bb3672079bb1169d87d12ad5
2016-02-23 21:03:05 +01:00
tvdzwan
257a63acf9 Merge pull request #495 from Danimal4326/master
Fix compile issue for missing ceil function

Former-commit-id: 4540e6ce6b7a5fe4b7c86e0489d62da840227ca7
2016-02-23 21:02:57 +01:00
tvdzwan
78b1c6fe39 Merge pull request #444 from penfold42/master
Add UDP protocol support

Former-commit-id: b2d91d3963e7eeacfc7d57a507cfc70f32ac9a5d
2016-02-23 21:02:39 +01:00
redpanther
ec67caf24e add ability to convert an image to RGB color order
forwarder: add flag to detect if forwarding is enabled

Former-commit-id: c814651ec4973fe3b2bfca7c0370a0bac752f025
2016-02-19 13:31:08 +01:00
redpanther
0f17e031e8 basic loop connection detection. prevent if you configure forward to 127.0.0.1:<port> and your server has the same port.
But this doesn't protect if not forwarded to localhost "127.0.0.1". Loop connections across different hosts arn't detected too.


Former-commit-id: 464a80708ebd11c0f7c83dc87a1afe0f10e0e078
2016-02-18 10:32:38 +01:00
redpanther
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
redpanther
46c5a2ec05 use correct include for std::runtime_error
Former-commit-id: a96b727cc0258fda9684f5df52084dd8d96068e3
2016-02-16 15:56:20 +01:00
redpanther
629461b944 implement proto forwarding for hyperiond internal v4l2 grabber
cleanup


Former-commit-id: 669f139386633e3435cdc33639134819464afd4d
2016-02-16 15:41:40 +01:00
redpanther
738bafee99 forwarder: add missing include
Former-commit-id: 58d07b73ff1ad321a9cfbf73895b438665ce3c14
2016-02-16 14:59:31 +01:00
redpanther
df91527557 implement json forwarder
Former-commit-id: 5519118304bd5690e6b512481347579339e78ac9
2016-02-15 20:53:03 +01:00
redpanther
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
penfold42
3bd03e73ff Merge branch 'master' of https://github.com/penfold42/hyperion
merge to local


Former-commit-id: ebba9a31b2139201b75dc098eba8c8ee9d630ebf
2016-02-13 23:01:04 +11:00
penfold42
ca24450618 added configurable latchtime for 2801 SPI driver
Former-commit-id: a10b0bd24a85580b021c735b30ebd2635180a514
2016-02-13 23:00:31 +11:00
Danimal4326
3996ff789c remove include of cmath lib
Former-commit-id: 004c76c724b9739d977a93d3574821db2c4de2e8
2016-02-11 12:55:41 -06:00
wisc
63ec2909eb added bottom right to osd mode
Former-commit-id: 3972abaf30d46558d310dbc5e2d164330e9a5b63
2016-02-11 15:50:51 +01:00
Danimal4326
0661ad74f6 Fx compile issue for missing ceil function
Former-commit-id: f5a6ac2c19b73aa48b5f4292cfa912dc2936701b
2016-02-10 12:22:19 -06:00
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
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
3280f7198d Merge pull request #469 from redPanther/fadecandy
fadecandy fix

Former-commit-id: 4686a0ead7ba44c13dbc4ac1f0f876d9a4d165c3
2016-02-08 14:52:48 +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
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
frostworx
bbfded147e minor qt5 fix
Former-commit-id: 65ab3bb14d6a7ab52e6ab1e8eaa85321dc5fa543
2016-01-22 17:17:45 +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
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
a53f65f3a0 Update X11Grabber.cpp
Former-commit-id: 08b227fba33ca0f6974f10b085cf57c18e716428
2016-01-21 16:40:46 +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
Paulchen-Panther
2a1673d8c3 Update X11Grabber.cpp
Former-commit-id: 849f1a2b6217b76739f84f6c9fb5645cab584f98
2016-01-17 18:04:08 +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
ntim
9c1e565d33 Transition to QNetworkAccessManager for compatibility to QT5
Former-commit-id: 6e65da9338d131d1017051e505db8c28696adf4f
2016-01-10 22:17:59 +01:00
wisc
4bc11548b4 faster detection less false positive
Former-commit-id: 501de9bca4c20600fe1e6250e82143f0b0d6ade3
2016-01-10 18:42:55 +01:00
wisc
ac86a779b0 cleanup
Former-commit-id: 39cb3f76379990085407791ec391732c986790e6
2016-01-10 14:55:23 +01:00
wisc
544ae68429 test old v1+ vs new v2
Former-commit-id: 5217ac135cd0c7a6907be0097df72506ca7f2d71
2016-01-10 14:41:47 +01:00
frostworx
defe217c89 added optional QT5 support - LedDevicePhilipsHue needs proper fixes
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
2016-01-06 17:31:23 +01:00
penfold42
382f22f23c add udp protocol support
Former-commit-id: a92810f14cf2af15710a38246a742ca2b94fd3bd
2016-01-06 20:40:48 +11:00
redpanther
9182dd5af7 fadecandy led device:
implement switchOff methode
tidy up code and add doxy comments


Former-commit-id: a162e2aae756f8b74b8e65f08740c00f3c820e50
2016-01-04 14:29:47 +01:00
redpanther
7f5a664864 set fadecandy default port to original fcserver port number
tune debug output of fadecandy device


Former-commit-id: 651459e5294ce5721ebe3bb2a6acdc1d096d9cfb
2016-01-04 12:26:06 +01:00
redpanther
13715202d8 add fadecandy led device
Former-commit-id: 490fd3ee66041b35b95d2c7ec110cc70e4c01d8d
2016-01-04 12:16:44 +01:00
redpanther
0dcacede81 add fadecandy led device
Former-commit-id: 4076e6ec2860ceaa53fdd07c47c40e45f2329de9
2016-01-04 12:06:56 +01:00
wisc
633985930b 3line detection
Former-commit-id: a63c03bc276ef218981213fbb9743a3d6d12d8b6
2016-01-04 00:20:47 +01:00
AEtHeLsYn
5215e45f10 Update MultiColorCorrection.cpp
Former-commit-id: ec17038daea5061bf4910a4884d715e767604155
2015-12-22 10:13:01 +01:00
AEtHeLsYn
0ba143cd20 Update MultiColorCorrection.h
Former-commit-id: 82dee880f9614e813758b2d5c7e08c3a33aa6d4d
2015-12-22 10:12:34 +01:00
AEtHeLsYn
27c41acdee Create MultiColorCorrection.cpp
Former-commit-id: 9a69072ba9306024338cfa03691c6705890bcee3
2015-12-22 10:08:55 +01:00
AEtHeLsYn
aeed93ac83 Create MultiColorCorrection.h
Former-commit-id: 09d90cb6c5fe0479e659028363391d9e5c846e14
2015-12-22 10:08:31 +01:00
AEtHeLsYn
516df4b83a Update Hyperion.cpp
Former-commit-id: f5cb215d9d6625102530b7f2b1ccce5145ec0768
2015-12-22 10:06:04 +01:00
AEtHeLsYn
9acdf946bf Update Hyperion.cpp
Former-commit-id: acf5e5c722402f7527ae0b942437d4c01917dccb
2015-12-22 10:01:47 +01:00
AEtHeLsYn
d3afc41040 Update CMakeLists.txt
Former-commit-id: 470a5b8f4a7c5a44b7aaff7a6c8f834ff55472bf
2015-12-22 10:01:08 +01:00
guddimon-
87f2883f56 replace decimal comma with decimal point
Former-commit-id: ec4b3c264fb06143b2e4d635358f259fb7099ed9
2015-12-14 00:23:53 +01:00
guddimon-
45d3572df1 always work with trimmed messages
Former-commit-id: a2b3236d22cd935c03a13dfe579c411c648c7dfd
2015-12-14 00:15:15 +01:00
tociek
e7c9d9decd Performance fixes for adalightapa102
Adalightapa102 now inherits from RS232Device.
Due to bad initialization, previous CPU usage on RPI1 could reach 60%.
ON RPi2 20%. Now its about 3% with grabber in use.


Former-commit-id: 7ebb72f503ad74a7768deedf648b9e84c0a7cf3c
2015-11-28 22:58:58 +01:00
tociek
e44db34969 Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
Former-commit-id: 0087b8cee957f0b87f722d02ef7fccbc1a34b118
2015-11-28 22:55:46 +01:00
Matthias Grimm
e76e41c046 fixed typo
forgot to pull my local changes to Mac :-/


Former-commit-id: 8e57cad4af836746ba6442443ace8d4521202151
2015-11-24 19:37:52 +01:00
Matthias Grimm
8ffbc16090 Added some more hue devices and Gamut-Profile
Added the new Lightstrip plus, hue go and Aura. The first two come with
a new Gamut profile and the Aura is from Living Colors.


Former-commit-id: 83b676bf136095f3069c219810ea361829d81558
2015-11-20 18:47:00 +01:00
tociek
7551a06cf4 Corrected APA102 USB (adalight) led device
I have removed the 'hack' that allowed to use APA102 with original
version of adalight. I have modified adalight code and placed it into
dependencies folder. This change is not backward compatible, so it won't
work with original adalight code.
The reason for the change is that last leds were not acting as they
should (last led red). Additionally with this change and new arduino
code, performance is  lot better and lights change much smoother.
I have also changed switchOff method that requires different data sent
to apa102 to turn all leds off.

Enjoy :)
Jacek


Former-commit-id: 624fe6c429aee896b150d23289f0be19e040474d
2015-11-12 00:22:11 +01:00
tvdzwan
42a6f72f06 Merge pull request #402 from AEtHeLsYn/master
APA102 end frame fixed (this time for real)

Former-commit-id: 92969b3b0c7b4cd8cc13c86e509274ec63c0b23b
2015-11-08 21:37:26 +01:00
NicoHood
1b2b3b3135 Added udev/sudo note to HID Device
Former-commit-id: 30e1524a5ca587cd5928aae028de868df2725aca
2015-11-08 21:05:12 +01:00
NicoHood
3595709099 Adapted Paintpack to HIDDevice API
Former-commit-id: 06101f0e99fbe99f8994193cea337b400acbafe3
2015-11-08 17:30:12 +01:00
NicoHood
a7d9a44dcc Fixed adalight typos
Former-commit-id: c4bccd1e6c036b244f69283d2edff41c618ffc1b
2015-11-08 17:30:01 +01:00
NicoHood
29d3209d7d Added Raw HID device
Former-commit-id: bd36530b6b63959ee4d83693e396cbb0af70ddb3
2015-11-08 17:29:53 +01:00
NicoHood
4d80fcb0f3 Added HID Device
Former-commit-id: 6284152fd9ffdad69fa1bbd4490da9547c4dbe87
2015-11-08 17:29:34 +01:00
AEtHeLsYn
1c41919c08 Update LedDeviceAPA102.cpp
Former-commit-id: f0b04ded96a9c9b99c2329e7889917645065382d
2015-11-04 14:08:33 +01:00
AEtHeLsYn
98d55e8cfc Update LedDeviceAdalightApa102.cpp
Former-commit-id: fbf05206e681fc5979a7241bcb1ee716ec088757
2015-11-04 14:07:15 +01:00
AEtHeLsYn
958aa428a3 Update LedDeviceAPA102.cpp
Former-commit-id: 164b396f7d779d01e2fc1df80438ad817a0ac712
2015-11-04 14:05:09 +01:00
AEtHeLsYn
9d004fa36e Update LedDeviceAdalightApa102.cpp
Former-commit-id: 2bbbb4756e6c3f8fe070ba73e63ce327e3f75ff4
2015-10-30 20:08:16 +01:00
AEtHeLsYn
acc1a1b397 Update LedDeviceAPA102.cpp
Problem with endFrame was not only endFrameSize, but ledValue index too

Former-commit-id: cc14e9d440a1d27f6a51c18f92aeba1f438c9c01
2015-10-30 20:07:21 +01:00
tociek
3f6c00966e Final adjustments for APA102 via Adalight
Former-commit-id: ba786d5c4165c992ce4671e487294547c8dae8c6
2015-10-13 23:35:27 +02:00
tociek
33edcddb1b APA102 device for use with Adalight (nominaly for ws2801)
Former-commit-id: 7fb9e8e84518be9387ea9feca11e93a8a5389e4f
2015-10-13 19:11:01 +02:00
tvdzwan
996c23a658 Merge pull request #370 from mrgreywater/gcc46-compat
Maintain compatibility with gcc 4.6

Former-commit-id: c8a2fe8b6b1becaf518c861e75fa78af40f810cd
2015-09-09 22:26:29 +02:00
T.van der Zwan
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
T.van der Zwan
5497fbf577 Finished the amlogic grabber for the 'WeTek Play'
Former-commit-id: e459cdfe6273ad2bfee92d2d190801ebdc691a5c
2015-08-20 09:51:44 +02:00
mrgreywater
c0c8490b95 Maintain compatibility with gcc 4.6
This fixes a compatibility issue when compiling with gcc 4.6 (which is
the version distributed with raspbian by default)


Former-commit-id: ff8518cbc0627049526138b67f4965cedfdfd4be
2015-08-11 12:47:44 +02:00
pcaffardi
2eea311dce Update LedDeviceAPA102.cpp
This fix the previous limit of 64 APA102 leds, because of too short end frame. Now the end frame is computed accordling to this documentation: https://cpldcpu.wordpress.com/2014/11/30/understanding-the-apa102-superled/. Tested on my 98 leds, it works fine.

I suggest to modify hyperion to allow LED drivers to apply the brightness parameter because APA102 has a parameter for that, without the need to elaborate RGB color to simulate it (result is wrong colors!). Is it possible to introduce such parameter in LED drivers and let the driver apply that?

Former-commit-id: 2d714e6eb075ec57e0973839fe96d2d7a051c57f
2015-08-09 16:15:25 +02:00
T.van der Zwan
348e0c1ee8 Fixed compile errors in amlogic grabber
Former-commit-id: b56a72681edbf442a28fb3106a4ca445b6e6aaa8
2015-08-08 08:13:59 +02:00
T.van der Zwan
2de173722d Added code for amlogic grabber.
Former-commit-id: fdb9c1c5d8ce02d531d2008057e22f1ae8f7d04e
2015-08-07 14:37:41 +02:00
AEtHeLsYn
c9636aaa6b Update LedDeviceAPA102.cpp
End frame fixed

Former-commit-id: 44107997d92d729f84adee368d12e35f1b5be6f1
2015-08-05 10:07:31 +02:00
Nico
aaf076b722 Fixed RS232 reconnect
Former-commit-id: d527e3261eebd7fa40855bfcc0fe343b1be41dcb
2015-07-20 14:01:24 +02:00
T. van der Zwan
a8c8a6a0d9 Second attempt to fix the pi-blaster device
Former-commit-id: 53764c0169093bb50e0e9a64dc9112c3bebdf0f4
2015-03-20 21:11:39 +01:00
T. van der Zwan
24af330cb4 Fixed error in Pi-Blaster
Former-commit-id: 28b0d2a43464a38c36fd49f4090a6d32795e9b5d
2015-03-20 20:53:27 +01:00
ntim
f83802f2b1 Corrected type of json array value index
Former-commit-id: f766365fc3be4d1b62c36ce05e8a6d818f73dede
2015-03-07 09:58:48 +01:00
Tim Niggemann
7292922309 Improved color space checks by adding latest model ids.
Former-commit-id: db3b067eabeaf36a2a9ab329614892e79d5089c4
2015-03-03 15:54:50 +01:00
Tim Niggemann
b2b4e17bb8 Renamed lamp to light to match HUE api convention.
Former-commit-id: f9b37989291a32162a41a7549fe4b050b79daba2
2015-03-03 15:46:53 +01:00
Tim Niggemann
ecea6e55ea Added light ids to device config.
Former-commit-id: 601616b0d7509b0e8ebb5226f00af5028fa905b5
2015-03-03 15:45:09 +01:00
ntim
acc0f61e60 Reverted last commit due to new api version.
Former-commit-id: 1b6a204183d43865d42d4ee9f3ecf28408c86a9c
2015-03-02 12:51:50 +00:00
ntim
aceb29c8c4 Merge remote-tracking branch 'upstream/master' into support_for_philips_hue
Former-commit-id: 86d827f2672adad200399baf4486f0d7ce3b7480
2015-03-02 12:48:18 +00:00
T. van der Zwan
9f5caacc75 Updated the way colororder is configured per led
Former-commit-id: 2a77b551c5b504f4ce9b0a179d4c20eaf6128f6b
2015-02-23 16:11:33 +01:00
tvdzwan
e8ae9c36e6 Merge pull request #238 from sweetpi/master
Added rgbOrder config for each led

Former-commit-id: 91881cdbe14a9fc33e12e91ef15b52faa66a6047
2015-02-23 15:53:44 +01:00
T. van der Zwan
888239e910 Fixed minor issue and removed unsued includes
Former-commit-id: 87c86459a7a1be1705a837ee0f73e88c8de2ae53
2015-02-23 15:53:05 +01:00
tvdzwan
0823ba4513 Merge pull request #257 from pckhib/patch-1
Update LedDevicePiBlaster.cpp

Former-commit-id: 8ca0054753652bddd61dde03bfa3ce143ba4649a
2015-02-23 15:38:56 +01:00
tvdzwan
b1f62cca40 Merge pull request #253 from aufano/master
Carsten Atmolight support

Former-commit-id: a1a3c245a037e3d9604cff6c5a228e9f2842a7fb
2015-02-23 15:38:02 +01:00
pckhib
2076675e8d Update LedDevicePiBlaster.cpp
updated for the new version of pi-blaster

Former-commit-id: 668084eefcb05f58e1f2e0ef6fc97ead2e540a65
2015-02-09 23:11:59 +01:00
ntim
4f7524d8de Small performance improvement if off on black is true.
Former-commit-id: dc69a21681432bef540c396847d64b07fa0bbb09
2015-02-05 09:50:05 +01:00
aufano
be3f3a968c Carsten Atmolight support
http://ca.rstenpresser.de/index.php/atmo-main.html

Former-commit-id: cd543a063af50455e3e92fc9e89c2503bef95188
2015-02-04 21:49:33 +01:00
Tim Niggemann
dfc2e6bfb5 Default setting of transition time to 100 ms.
Former-commit-id: c0981e09494c59456f45325cdcacf9bfa6e26c99
2015-02-01 15:56:51 +01:00
Tim Niggemann
9d506b888d Added config options for username and transitiontime
Former-commit-id: 2ae179c670fda838115d985f40d970e10ef002ef
2015-02-01 15:29:40 +01:00
Gamadril
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
poljvd
3488f23603 Update cross compile info
Former-commit-id: c604de9bc9e0dddc48abddccb93118b6568b6a85
2015-01-21 12:57:28 +01:00
Oliver Schneider
b86e08cf0a Added rgbOrder config for each led
Former-commit-id: 9c9f49d61b24267fe9ebe566600cdc42c78c1ab6
2015-01-20 21:16:55 +01:00
Gamadril
c4337ca2b3 fixed build dependency
Former-commit-id: 34682c499f8b7f951c28f647f482ad800ee69ae8
2015-01-18 00:58:23 +01:00
Gamadril
c89e1fcefa Added frame buffer grabber support
Former-commit-id: a73767a1abb2cac977492bd8c6cc593fb21840e1
2015-01-18 00:04:45 +01:00
T. van der Zwan
b1c1645790 Fixed missing build of AmbiLed source
Former-commit-id: bd6ad9ef5cd3df051f73f5650531c88af1d5b57e
2015-01-05 15:12:47 +01:00
T. van der Zwan
1bb93da59b Added support for AmbiLED-HD device (http://www.ambiledhd.com)
Former-commit-id: 60ec75898a04b5ca993242d0aef6edc01997fe82
2015-01-05 14:28:21 +01:00
poljvd
a041941e7a Fix build with embedded protobuf library
Former-commit-id: 5c60566f2d4a9c65fc0fe677841a34d7ef73549a
2014-12-20 20:15:04 +01:00
poljvd
f6ce35813a Merge branch 'add_x11'
Former-commit-id: d80efce3aa0413e4f63e9171dab438d03db9021c
2014-12-17 19:09:19 +01:00
poljvd
2b6d485ea7 Use ImageResampler in V4L2 grabber
Former-commit-id: c6ec92c17b07444a49a303cdced6f59347f98f76
2014-12-16 21:30:08 +01:00
poljvd
62b14c5077 Merge pull request #209 from thigg/master
fixed assembler instructions to work without optimization

Former-commit-id: 8bbb604daaffc4efa7f21cb2dd9487f25fa85bca
2014-12-15 19:47:32 +01:00
poljvd
e608b11caa Extract ImageResampler from X11Grabber
Former-commit-id: 63e95fa85fc0ef5a66f6eb8b396cf4b6370cf5dd
2014-12-14 14:26:59 +01:00
wayland
63d0f6652e Rewrote the class to make it work with apa102 led strips
Former-commit-id: 9f63b95fb635b15e550d9368c7c8dbc632572bc5
2014-12-11 13:48:14 +01:00
thigg
ac42b72253 fixed assembler instructions to work without optimization
Former-commit-id: 788583de5e7614a5450a533702e75baa5bf2f034
2014-12-11 14:30:36 +02:00
wayland
a4bcdcc10a Added APA102 device to factory
Former-commit-id: 4d7c8889aee2ca7b75c0e0ec90e9b5833257324d
2014-12-03 18:41:44 +01:00
wayland
bdbe6a8c85 Added APA102 to cmakelist
Former-commit-id: d495d538a46dc19e535a3ae0e2c1069954fdf963
2014-12-03 18:36:18 +01:00
wayland
4b716a9e2f Added the apa102 engine class
Former-commit-id: 03e11a19aed2ae782c5d134e1f4fcf9faea1969e
2014-12-03 09:35:10 +01:00
wayland
205fe8ab66 Added APA102 device to factory
Former-commit-id: ecea592ddf97bdcc2c54d12af194c15d6c09966a
2014-12-03 09:34:48 +01:00
poljvd
bf7ddf5991 Fix output size of X11 image after deciamtion
Former-commit-id: c6120c7c4116f855405f65c21b0c0f5e1e443b6b
2014-12-01 21:27:33 +01:00
wayland
6859841c3f Added APA102 Led Device headers
Former-commit-id: bd9a5d1216d37275bcb807e19d043e1ea1e3ead6
2014-12-01 10:04:27 +01:00
poljvd
d89f504d83 Refactor V4L2 and X11 grabbers to share more code
Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
2014-11-21 21:24:33 +01:00
Gamadril
9168ee5098 code refactoring
Former-commit-id: 157f424e83c58fca4ed1e3283899cbbdfadcffe1
2014-11-08 21:01:46 +01:00
Gamadril
6a9e75243d Update JsonClientConnection.cpp
small code cleanup

Former-commit-id: 82029cd23f77b393b2e6688ed6e65424cb676452
2014-10-26 10:55:40 +01:00
Gamadril
bbc6fe389d Added very basic WebSocket support to json server
Former-commit-id: 5d62331eecdbd10287ba0520bbb06814bca0bca7
2014-10-25 22:35:53 +02:00
T. van der Zwan
d1f043f233 Fixed switch-off on shutdown
Former-commit-id: 25438c11a3fdb14c89f946d02893a257aada67ea
2014-09-30 21:00:42 +02:00
T.van der Zwan
654f6416ea Updated proto-definition due to changes in newest protobuf library
Former-commit-id: 2e5a2de1a05bdd5c5ccc8668d6a6d050b5fbb1de
2014-09-26 18:27:30 +00:00
T. van der Zwan
11d29d02c5 Added debug statement to standard out
Former-commit-id: daaeb2a07931942bbeaf272775da81902169ad04
2014-09-25 22:31:20 +02:00
T. van der Zwan
fbe8e0ad4e Added some code comments
Former-commit-id: 58c1ec1fd2dcc210b6d162d1e8b6c40a502f30fa
2014-09-25 22:05:01 +02:00
T. van der Zwan
30cc14d9e8 Added delay to smoothing and changed the switch off to continue sending black
Former-commit-id: fa5a7f14b0fdf3a0a74169cfefbf5b625330b753
2014-09-22 21:28:38 +02:00
T. van der Zwan
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
T. van der Zwan
8ad0e88e2f Minor reformat of code to match hyperion-style. Added ws2812b as option to disable for devices without dma-pwm
Former-commit-id: 579f4426285fb537706a22af446f5280748f2ab7
2014-09-19 16:37:58 +02:00
T. van der Zwan
c0f0837b92 Added missing include
Former-commit-id: 1cf2f19a0a7e3fc9bef55979ce7e3221f3e66fec
2014-09-19 16:20:01 +02:00
tvdzwan
f33fcfffc0 Merge pull request #165 from kammerjaeger/master
Support for WS281b

Former-commit-id: 2f51f5fe6ac27a99896d15e7dabb9efc92916204
2014-09-19 16:14:46 +02:00
David Brodski
f41a0fc977 removed benchmark
Former-commit-id: e716fa337c4995a258c34200e14fd56ee8dae05c
2014-09-19 03:18:26 +02:00
David Brodski
0e55169f42 fixed strange bug with last led and pwm needs one more int
Former-commit-id: c5e20fed3d84c19032afb64e66a5934fc3db701c
2014-09-19 03:16:15 +02:00
David Brodski
961bef22f5 Assembler version 1: use roll and bit clear instructions
Former-commit-id: 4f27d34dd63c635a65ee33f2c368978d5b162974
2014-09-19 02:00:32 +02:00
David Brodski
d41857e626 Pre initialized bit pattern to speed things up
Former-commit-id: 08dc5ee53854997060af0257b5cff324d29f87b5
2014-09-18 23:41:46 +02:00
David Brodski
5ff05d58fd fixed potential buffer overflow
Former-commit-id: 2c9ea902fd563b909e6d0457c4957f80be86f93f
2014-09-18 20:56:32 +02:00
David Brodski
a92967fa7c Added benchmark define
some code cleanup and speedups


Former-commit-id: 8254c34e1d10c598e127f46635ae6bafcb97087a
2014-09-18 10:28:23 +02:00
David Brodski
39ddfca5c0 Rename WS2812s to WS2812b (spelling error)
Former-commit-id: 83c92c9ef99d45b8683860f199a14952c05d0f5d
2014-09-17 21:20:36 +02:00
David Brodski
61da05e108 Moved defines into cpp file make include of h file smaller
removed not needed includes
fixed warnings (removed some ascii art for that)


Former-commit-id: 71b16cf7e73a9463462820238d12069e4d1e6d6e
2014-09-17 21:12:46 +02:00
David Brodski
042d4b6e91 Added LedDevice for "ws2812s" leds
To activate: use led device "ws2812s" in the hyperion configuration


Former-commit-id: 0b5ee38679fe353f43bb4a347882d056ca237128
2014-09-16 00:17:23 +02: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
T. van der Zwan
f12bffb44f Merge remote-tracking branch 'origin/master'
Former-commit-id: b4eb2e7a1c78d107cb7bc69a04b1cff694f6e308
2014-08-19 10:54:39 +02:00
T. van der Zwan
089120fe9d Fixed error message for setImage
Former-commit-id: db0c38d865463048c6bb039c173e02ea685ae36e
2014-08-19 10:54:15 +02:00
ntim
507a237f47 Merge branch 'master' into support_for_philips_hue
Conflicts:
	libsrc/leddevice/LedDevicePhilipsHue.cpp
	libsrc/leddevice/LedDevicePhilipsHue.h

Former-commit-id: 5f0b05cce12ca5c42ac2cdd94b9418d6eaef0f57
2014-08-18 17:08:21 +02:00
Johan
b6fa306df7 Fix schema requirement for json transforms (use numbers instead of doubles to allow integer values for zero and one)
Former-commit-id: f65ea81c217bbf621184152fd913d58247d9b4db
2014-08-01 10:13:40 +02:00
ntim
dc2e173f04 Remove couts.
Former-commit-id: fdc93ea33644313277bd4b01c14e4a63396c077f
2014-07-16 20:46:59 +02:00
Tim Niggemann
dbd7a86665 Moved color logic to lamp class.
Former-commit-id: f450eebc8c9d0f29dc053f2115dac6576a5fa591
2014-07-16 20:22:37 +02:00
Tim Niggemann
f0d2c15aeb Fixed QString string formatting, added safety check in case the connection to the bridge might be lost.
Former-commit-id: fb1f5fd21cd3873fc1b92d763c682e75f345ab42
2014-07-16 16:45:45 +02:00
Tim Niggemann
f76b5ffbd8 Added author tag, added missing return statement.
Former-commit-id: 4d0a29a8ba3d33de6f86b90a4eaf2f0de12ea59a
2014-07-16 16:21:11 +02:00
Tim Niggemann
b055578759 Added config switch for turing off the lamps if the color black is written.
Former-commit-id: bb4f4bc74c035c10a8dc678a11052ea276ea0149
2014-07-16 11:49:34 +02:00
Tim Niggemann
fcb2ff6667 Renamed method parameters.
Former-commit-id: e10705dd6d93f5c1398a213583bbe349833d2648
2014-07-15 12:08:27 +02:00
Tim Niggemann
7e049273a8 Comments.
Former-commit-id: bb4573afa8072bf03a3ae7c1b8ece721c7ea91ff
2014-07-15 12:06:26 +02:00
Tim Niggemann
d2542142be Get the light id from the lamp object.
Former-commit-id: 7120af8551c185979c94b2a186f09c883784a882
2014-07-15 09:59:01 +02:00
Tim Niggemann
4af2b11d8f Get the light id from the lamp object.
Former-commit-id: dc7aa992386c2511261614a2a8fe3ccf15d9a591
2014-07-15 09:58:29 +02:00
Tim Niggemann
67970fce08 Created HueLamp class holding the color space as well as the original state and current color.
Former-commit-id: 129c34f6008a68bca6cafb63eb0c0ad6a37f5179
2014-07-15 09:55:58 +02:00
Tim Niggemann
9269b0a1e3 Removed saving of model ids. Save the corresponding color triangles instead for speedup.
Former-commit-id: 72e6031234e12a488a5425e80e73dc8b03ec364f
2014-07-15 08:54:40 +02:00
Tim Niggemann
f5a8174783 Implemented color triangle calculations.
Former-commit-id: dbde6635077a82ace5f4ed1fdf89458a28e7bf05
2014-07-15 08:51:07 +02:00
bimsarck
c1998da2ec Fixes saveState feature
Former-commit-id: 8158c77521727bf74875a5998c803212aece0645
2014-07-13 13:48:49 +02:00
bimsarck
e6d39b047c Remove unnecessary code
- reenable timer


Former-commit-id: b1a175a1f1e5c3a7da753240030815252b1b22bb
2014-07-12 14:56:39 +02:00
bimsarck
c4c7ed0331 Improved philip hue device:
add lamp types autodetection
add full xy-Colorspace implementations
reduce http requests to the hue bridge. This prevents DDOS -> 503
add color black -> lamps off
save state is temporary disabled


Former-commit-id: 5a0328fe80a06a9f670c5190190e239857cbd15c
2014-07-04 12:11:37 +02:00
Gamadril
3135b89255 Update LedDeviceTpm2.cpp
Former-commit-id: 8d51eb00044460002e29687468786e3056afd0bb
2014-06-18 13:49:27 +02:00
Gamadril
1d046ab35a Added support for tpm2 protocol. One frame used for all LEDs
Former-commit-id: 5b2ed33a50d90999c6f9508ba3782ad73838fb56
2014-06-15 02:19:09 +02:00
ntim
853d002894 Timer to restore light state properly implemented. Lights are not switched on after state has been saved.
Former-commit-id: 04959ea3731eb7de9f59b80a789f03cfeb2d4ba3
2014-05-07 15:22:13 +02:00
ntim
32f09dcc24 Merge branch 'master' into support_for_philips_hue
Former-commit-id: ee3816fde708fa2f9f9e6ad50ec1e6d2ff552b23
2014-05-07 07:44:11 +02:00
johan
d50b46bda2 Fix integration area = 0 for a led
Former-commit-id: b365c4c9605a84ea6b7f88043f6f9c70b7122931
2014-05-06 22:02:40 +02:00
johan
1e21602798 Changed connection delay to something non-blocking
Former-commit-id: b313005a29cb42eb6839060bc4c48e4cbd927d3b
2014-05-04 11:52:25 +02:00
johan
3eb29146dd Added a possible delay after connecting an Adalight device
Former-commit-id: 756fae2ebc57455bf6360dc96bf2ae5469460172
2014-05-04 11:31:13 +02:00
ntim
8cca280fdc Implemented timeout for restoring original state.
Former-commit-id: 925b063aba1a859b592ead9b75ce67d90fb81e28
2014-05-03 10:12:41 +02:00
ntim
9220c346bb Blocking PUT requests. Only save the brightness and [x,y] state of the lights.
Former-commit-id: 5887fdf1b350172dcdd52c46bd8da74dab521444
2014-05-01 00:02:10 +02:00
johan
d5597d55a7 Disable the blackborder detector for effects
Former-commit-id: 2d4660f48c17977aabff52b7cbbc8d832b216f00
2014-04-30 22:53:05 +02:00
johan
8d75a57f18 Cleanup of XBMC 3D checker code
Former-commit-id: 26acf7dceb3e26a2e59af82736dec9fdf09c26d5
2014-04-30 22:46:26 +02:00
johan
9da97c0698 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: b83c6850f6086f2d3e88bc94116f1b4f8ef61d0c
2014-04-30 22:39:51 +02:00
poljvd
019374f57d Merge pull request #94 from bimsarck/master
add 3D autodetection for xbmc with versions check

Former-commit-id: 683e152b5d419442a094cb2eee51b341e08b8f2d
2014-04-30 22:39:40 +02:00
johan
1e66045d3e Added author tag for Philps Hue device
Former-commit-id: 6fc5dc0ac7177ddd23e601c8ca1f65981ff0e778
2014-04-30 22:38:59 +02:00
Tim Niggemann
ab5e17e105 State of all lights is saved and restored on switchOff().
Former-commit-id: 1ee26e8c01d90456424c1b5ea3f113dfd0ff6525
2014-04-28 14:32:37 +02:00
ntim
ebb22cdc87 Removed rate limiting from code. Setting framegrabbing frequency of 10 Hz / number of lights is sufficient.
Former-commit-id: 0686a8d18c780038eb017fdf26b5faf4b8053f3a
2014-04-27 18:42:26 +02:00
ntim
88c523518a Initial commit of support for the Philips Hue system.
Former-commit-id: 5b7d802c326151ee96a5b950badb01e94adfe7f3
2014-04-27 12:59:44 +02:00
bimsarck
b619fcda55 add 3D autodetection for xbmc with versions check
Former-commit-id: 6fd0195fdae82ebe5a26a6ce1138164e09e8b929
2014-04-26 00:58:47 +02:00
johan
d102ffd043 V4L2: Fix error with byte order of RGB32
Former-commit-id: ad354369b22d4e85b0b2fbf2d1c33611632d7014
2014-04-15 20:44:16 +02:00
johan
ef6aa76409 V4L2: Fix error with frame size of RGB32
Former-commit-id: ab98c7b87acb7654c40a715ed21c0857c11a30ff
2014-04-14 19:19:47 +02:00
poljvd
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
poljvd
8eb43f0c90 Fix led mapping boundaries
Former-commit-id: 3f41d6b41ceff5c0b81c0041ea185233e37d363c
2014-03-26 16:26:11 +01:00
johan
40185e3c7c Only use center of V4L2 grabbed image to determine if there is a signal to allow some noise at the borders
Former-commit-id: f0c1920666297e06c9d29ef0128e0d3340851251
2014-03-22 16:19:38 +01:00
johan
6fafb23a3f Added functionality to disable the embedded v4l2 grabber when a higher priority source is active
Former-commit-id: 4c0403584093a1fac29d16b502773c3ed11a13a9
2014-03-22 15:35:25 +01:00
johan
c3ba03e0ee Fix v4l2 signal threshold comparison
Former-commit-id: 698a22af752fc42e778e97587938ed6542653bd9
2014-03-22 14:49:24 +01:00
johan
62291adb52 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: 4763dcd03897ee85df068d9f7dc4a5954cbb1a4f
2014-03-09 11:42:20 +01:00
johan
e22c720e68 Add hyperion-usbasp led devices
Remove all WS281x direct UART code (does not work reliable)


Former-commit-id: cd8103058d4ce0cd3280c7a2c5370397a14acf5c
2014-03-09 11:36:46 +01:00
T. van der Zwan
e549e15c3f Fixed call to thinkerforge library
Former-commit-id: e2764d3ecbf7d462ad5d967572b3ea37548fec73
2014-03-08 19:55:23 +01:00
T. van der Zwan
cbd354c18f Merge branch 'bbilger-master'
Former-commit-id: 4d5a4f9f2e867ab10ed0c483ecc3fd72c9be3a8c
2014-03-06 21:56:31 +01:00
T. van der Zwan
fdaa5c0068 Added tinkerforge as local dependency
Former-commit-id: b739eba0676d9c105416d9040ffbe78b2dc4bfbd
2014-03-06 21:48:11 +01:00
johan
5e3cb497fa Add support to set the threshold for each RGB channel separately
Former-commit-id: 5edb206bb2657e78f711f67625fd5f6164d8296c
2014-03-04 22:04:15 +01:00
Bjoern Bilger
2b683fdfaa add support for tinkerforge
Former-commit-id: 8dbd3d915f70ace8d1b27602f0d76a2a546ac043
2014-03-04 20:38:54 +01:00
johan
4888294e03 Reduce copying of data
Former-commit-id: 858ca2331d68458acf87359df87cb25fd051fa30
2014-03-04 20:32:54 +01:00
johan
e790cb87ca Fix embedded V4L2 grabber
Former-commit-id: f9dc759a8fcac8ac95288b12a007e9c78aed82c3
2014-03-04 20:17:38 +01:00
johan
69c64c379a Merge branch 'master' into merge_v4l2
Former-commit-id: 015ff84842dc7a90ff603234ed2bb2a6afd27ab2
2014-03-01 19:47:24 +01:00
johan
2a083f0293 Merge branch 'python3_support'
Former-commit-id: 919c67759aeaf05d181d3a79c9ce180023604a26
2014-03-01 19:32:57 +01:00
johan
e761a30b58 Support for Python3 tested
Former-commit-id: 987571bec31e72c4c5dad9b4ceebbca62de6c794
2014-03-01 19:28:57 +01:00
Johan
e0d405034f Add support for Python 3
Former-commit-id: b6aec954ba0e79ba5697ea8cc305eb9f7d29f332
2014-02-26 18:10:17 +01:00
T. van der Zwan
4b9dfe3e03 Added missing include
Former-commit-id: b35b00821740d48ba073344ac734a5a24c23637e
2014-02-25 20:49:43 +01:00
johan
99fd50805c Added image handler to v4l2 grabber to send colors to Hyperion
Former-commit-id: be6fb4dd8080b3325ba6161f48c093f8a145786d
2014-02-23 22:43:02 +01:00
johan
e58f84d5c8 Merge branch 'master' into merge_v4l2
Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
2014-02-23 21:53:13 +01:00
johan
1a92e6ccd2 Added additional zeroes after LPD6803 device message
Former-commit-id: ba15d222339736e5281e667270ddb37b50d1319f
2014-02-21 22:35:13 +01:00
johan
22472d8f95 Added v4l2 to hyperiond (partial)
Former-commit-id: 06684261ec3ac7bb4e8ff0479e5b1472823648ae
2014-02-21 22:30:34 +01:00
johan
69d6e47328 Create image callback using Qt signal
Former-commit-id: cf469ba01ffd26d286e6fb8d9f081cf126042e50
2014-02-19 21:52:37 +01:00
johan
f0c35071da Move V4L2 grabber code to separate library
Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc
2014-02-07 21:11:50 +01:00
Johan
99b3719cee STL include added
Former-commit-id: b99ccce4ac849914e0528ddf6255d52ba47b09c7
2014-02-07 14:55:54 +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
9dca67c3a3 Removed option from Sedu device as it is reported not to work
Former-commit-id: e3f5ad7be486dba9c7ecd15381a7216ba886054b
2014-02-04 20:47:02 +01:00
T. van der Zwan
b4c49c9ec4 Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: e21a530324abb6af92f4b34abdfbf23313775f4a
2014-01-27 19:16:45 +00:00
T. van der Zwan
0047b0de56 Numerous mods for ws2812b to no avail.
Former-commit-id: 1fda06d3df5e5394ff23277e1361ab1dc35c3205
2014-01-27 19:15:04 +00:00
johan
f5317bc2d9 Moved black border detection code to seperate library
Former-commit-id: 590029949b79689ea05409149677e51b748cb64f
2014-01-26 14:23:08 +01:00
johan
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
johan
a7110ec64c Configurable blackborder threshold added
Former-commit-id: 95b77dee2869b41bf556e0e374bea3c5e4534e61
2014-01-20 20:46:38 +01:00
T. van der Zwan
af08b9b5d0 Fixed bug in x86 compile
Former-commit-id: 022ed458e14a9692387ce382dbafb4cec4002c8e
2014-01-18 22:57:47 +00:00
T. van der Zwan
fd6d247506 Slight style changes to the pull of the P9813 device
Former-commit-id: 77892a5cfbcc4793061d518a761931be26ef842b
2014-01-18 22:49:32 +00:00
tostadora
d38ca7de68 add the new driver to the build factory and Cmake
Former-commit-id: 4d52569525137e3aa029ffa271fea076155c5a66
2014-01-18 13:43:39 +01:00
tostadora
fd0a69fb77 untested support for the P9813 chip
Former-commit-id: df7341af27503fffd5be9b0afd9525e52dccbebb
2014-01-16 20:34:56 +01:00
luisc
b31ad73beb add files for P9813 support
Former-commit-id: 66a4d02bf0e2c7f85d2713a906461df11931cfff
2014-01-15 17:54:10 +01:00
T. van der Zwan
890bb426f4 Added doxygen comment
Former-commit-id: d7b41ef9690130c98a6aca901af239d0f1be9e63
2014-01-07 13:24:56 +00:00
T. van der Zwan
7be5684831 Reduced default baudrate for the ws2812b to 2MHz
Former-commit-id: a2b38c6ff7a66da9d252a1801e86b4843bd6b65f
2014-01-07 13:21:19 +00:00
T. van der Zwan
ab0ea90b55 Fixed the open of device until device is available
Former-commit-id: b8700368fadb53784c5838ab046431a7f58f108c
2014-01-07 13:20:53 +00:00
T. van der Zwan
9396583551 Added PiBlaster device
Former-commit-id: d8559d17a5c1496aa5274da2b56a3e7b45a6d1f9
2014-01-04 10:35:11 +00:00
T. van der Zwan
4fe1a8de85 Fixed bug in leddevice factory
Former-commit-id: 260bcab6a2d7c521987667e263dbeae2997ebd1e
2013-12-29 19:43:01 +00:00
T. van der Zwan
9be0aa9715 Modified the ws2812b to use a 3bit encoding speed which allows operation of the uart at slower speed.
Former-commit-id: fb89050546f85f82fb1fcc4cc2d24f95d8f78de5
2013-12-29 19:22:55 +00:00
T. van der Zwan
fd835b5bfb Merge branch 'master' into macos_compile
Conflicts:
	libsrc/leddevice/CMakeLists.txt
	libsrc/leddevice/LedDeviceFactory.cpp
	test/TestRs232HighSpeed.cpp

Former-commit-id: 5583f2f881afd1a9b0c8ec3a52d7d3b54fe1dff7
2013-12-28 08:55:06 +01:00
T. van der Zwan
e84f9eb147 merge remote-tracking branch 'origin/macos_compile' into macos_compile
Former-commit-id: 9e76cece0e44a7b8112b6053ae5da44059bde61f
2013-12-28 08:41:42 +01:00
T. van der Zwan
47d3f475ed Removed bug in Hyperion.cpp and warning in TestRs232HighSpeed.cpp
Former-commit-id: 63e992a3590db5a4e2c8d121b08291588f347ac7
2013-12-28 08:41:23 +01:00
T. van der Zwan
71b8fd4879 Modification and additions to test working of ws2812b
Former-commit-id: 2a7eb3cb67c85a4a4042bd0f1a6ea4d58792b1c2
2013-12-28 07:34:49 +00:00
T. van der Zwan
eaa4b0bae5 Added comments to the LedDeviceWs2812b
Former-commit-id: 4314edf59a776f2424d0066c14ba41c7b3162842
2013-12-25 15:37:59 +00:00
T. van der Zwan
01b5dcdd5c Added Ws2812b specific device
Former-commit-id: 675c8f578de42d12e25162065c0d0381ad0e08f6
2013-12-23 21:58:54 +00:00
johan
3d3c8c93b8 fixed some XBMC checker reconnection
Former-commit-id: ec9c327965597b4b552d939cfb664ca95e2f1786
2013-12-21 17:20:51 +01:00
johan
f598f6e417 Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: cd8dcbef62cb2280d5abd9bbe6624bfb2479a61d
2013-12-21 14:36:05 +01:00
johan
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
T. van der Zwan
8033615119 Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: dccdee578b5df43c4a8123349397be4a1b54f4c6
2013-12-20 21:02:36 +00:00
T. van der Zwan
b63fdb0333 Merge remote-tracking branch 'origin' into macos_compile
Conflicts:
	test/CMakeLists.txt

Former-commit-id: b91fa41ebbd5ec96f6a98dddc49f86b4b8af15d8
2013-12-20 20:02:02 +01:00
T. van der Zwan
e6fb2ad53c Fixed minor bug (found by clang :-) ) with incorrect ; after if statemtn
Former-commit-id: 12353a7b0cc67e0496c7f28baf063eddfcc973a9
2013-12-20 20:55:23 +00:00
Johan
4f3db5e1c0 Re-included adalight in no-spidev build
Former-commit-id: 0e0d6504b0fe77def6f917ab6cda16a42e3b9bff
2013-12-19 09:29:26 +01:00
johan
7b401f26fb Fix bug in Boblight server (no green and blue values)
Former-commit-id: fa5349a4945025151d81109f22c20c631eb87aee
2013-12-18 21:02:17 +01:00
Timo van der Zwan
6f15e89d29 Implemented compile capability for MacOS.
Former-commit-id: 86e560e0d4f03251ee08a648ffa6fd9a0e01ae78
2013-12-17 22:53:16 +01:00
T. van der Zwan
6cb0fdf072 Added some try-catch to handle device reset
Former-commit-id: 98caccf476fbd703adea1f2c5a19dabb6626e50f
2013-12-17 19:28:57 +00:00
T. van der Zwan
c3bd109a99 Disabled the ws2811 (for now)
Former-commit-id: db2028ab7e588dd88ea5966b15b4f5e2657e79e9
2013-12-17 19:07:57 +00:00
T. van der Zwan
b63753f5dc Moved all devices to separate library and added 'Factory' for device creation.
Former-commit-id: 26cab1b85b00406240689ad9c1018f0307028fe4
2013-12-17 18:50:15 +00:00
T. van der Zwan
9bfaffe93b Merge branch 'ws2811' into device_factory
Former-commit-id: 54b5d4a0b1d19aa5ee31a9f43c20af762f9bdb18
2013-12-17 16:04:10 +00:00
T. van der Zwan
90150b06dc Updated constructor of ws2811 to contain chip configuration
Former-commit-id: 330056ce83edb3e7fa4d36961a52f8d413e289bb
2013-12-17 15:59:25 +00:00
T. van der Zwan
bd6e0f0d2a Added comments, renamed ws2811 options, moved implementation to cpp-file.
Former-commit-id: 102e394d445abed39444dd5f9519ff8bda50d7e9
2013-12-17 09:03:34 +00:00
T. van der Zwan
5377c5adca Updated the ws2811 to allow for different timing schemes
Former-commit-id: b58a9766da9e4f6b2f64683574cddb964aaf3b04
2013-12-16 20:36:54 +00:00
T. van der Zwan
f8fdcb0c10 Merge branch 'add_effect_engine' of https://github.com/tvdzwan/hyperion.git into add_effect_engine
Former-commit-id: 34587c803308d43d2fabf3eed5e19727acf18901
2013-12-13 21:58:17 +00:00
T. van der Zwan
b38a98c3ad Added '*' option to led indices of transform
Former-commit-id: 2a6af2ad4ba9e4577b466ac7401528a6df84ef0b
2013-12-13 21:58:09 +00:00
johan
c751561f2f Removed runEffectScript from Hyperion class
Former-commit-id: 459b9178cc138d54a238ae7c72bb2a52d4bfcc3f
2013-12-13 22:41:24 +01:00
T. van der Zwan
2efd751c76 Removed bootsequence library
Former-commit-id: 5f3f927236a26ae00299a8e7a914e98ace3b328a
2013-12-13 14:55:34 +00:00
johan
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
johan
cf7f66bc40 Make the Json server more flexible for set color commands. Commands can now contain multiple colors which are repeated over the entire string
Former-commit-id: e763f574a8d481a2d21e764d9b9ef2bfd6f1723a
2013-12-12 23:39:17 +01:00
johan
83051543d2 Boblight server: Added a sync after writing led N-1. Added clipping to a parsed RGB value instead of the modulo
Former-commit-id: 9080c04a0f09f536587867912231b29565a31b5d
2013-12-12 23:12:39 +01:00