Commit Graph

49 Commits

Author SHA1 Message Date
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
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
Paulchen-Panther
536b51dba1 Update JsonClientConnection.cpp
JSON API: Get current LED color

Former-commit-id: 0b40c1eb1627afd8077bdf690109609fd531c2fb
2016-05-06 15:05:28 +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
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
fa66c3b2b5 Rework log messages
Former-commit-id: eac93c0fd78fdf353e940d08df3cabf0b962a3e2
2016-03-23 17:40:45 +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
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
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
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
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
frostworx
defe217c89 added optional QT5 support - LedDevicePhilipsHue needs proper fixes
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
2016-01-06 17:31:23 +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
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
Johan
c5b18d5925 Removed use of qt4_use_modules from build files
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
2014-02-07 09:20:00 +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
T. van der Zwan
59eb7f788e Merge branch 'master' into add_effect_engine
Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 53467c63b97c7dc370f04357588f7cf1ad0e3ada
2013-12-05 21:01:52 +00:00
johan
ea1b8315c4 Added a notify that color transforms have changed
Former-commit-id: 28eb82f4e6f646ffcb6ed1b013a9ec60de53e657
2013-12-03 22:56:46 +01:00
johan
515ae3e8c0 Added the possibility to set effect arguments over json
Former-commit-id: 4bc2920c04853e549c712ec70492371b14d20877
2013-12-01 14:09:01 +01:00
johan
ae1bd7d254 Effects added to configuration file
Former-commit-id: 2ff4700ee5d5bc3a7dd5a29ecd35c1c9dd189873
2013-11-30 12:42:08 +01:00
johan
5454ddb375 Added skeleton for effect engine development
Former-commit-id: e1fb69fd4de4b8968075660e3ba7f7add021c152
2013-11-24 16:10:48 +01:00
T. van der Zwan
826b964bf6 Implemented the multi-color transform including in hyperion-remote
Former-commit-id: ebdb0688b47d51bd6dccf6dafd580d3ce9ed80a7
2013-11-22 10:48:10 +00:00
johan
d60cca9e20 Added flag to disable dispmanx from build
Former-commit-id: 6630f588a739a08601c0db79abd2cdf0b1c1839c
2013-11-19 23:02:41 +01:00
T. van der Zwan
dd16af0df5 Changed RgbImage to template based Image (with template for pixel type)
Former-commit-id: ef02f164eaf3c2f9dd552c1c17b525cf6eed499c
2013-11-11 09:00:37 +00:00
johan
7300413015 BoblightServer added
Former-commit-id: deb3479ee673d763ad2e5451fcd35a0febedb4f3
2013-11-08 22:18:10 +01:00
T. van der Zwan
ecdd7775c5 Fixed doxygen warnings 2013-09-09 20:35:28 +00:00
T. van der Zwan
8441dd51cc Added/Updated/Fixed doxygen comments 2013-09-09 02:54:13 +00:00
johan
3187fc84a6 Doxygen comments added 2013-08-31 14:36:54 +02:00
johan
9fe2fcfdd0 Changed hue in HsvTransform from uint_8 to uint16_t 2013-08-22 20:31:57 +02:00
johan
ee7a596d53 - HSV transform added
- Moved transform of led values to before the device write so transform changes are taken into account
2013-08-21 21:50:17 +02:00
johan
10a566e2ca Get server info implemented for jsonserver 2013-08-19 20:33:36 +02:00
johan
cb38baa985 Implemented set transform for the json server 2013-08-19 19:57:35 +02:00
johan
0a9bbe86a4 Set image implemented 2013-08-18 20:55:59 +02:00
johan
1766212b70 clear and clear all implemented 2013-08-18 13:33:56 +02:00
johan
638d5aa424 set color on json connection implemented 2013-08-18 12:21:07 +02:00
johan
46076998a0 Schema checking for all commands added 2013-08-18 12:02:17 +02:00
johan
b66c397a46 json schema added for checking incoming messages 2013-08-17 19:20:19 +02:00
johan
16c260b3dc added skeleton for the json connection server 2013-08-17 15:39:29 +02:00