Commit Graph

550 Commits

Author SHA1 Message Date
tvdzwan
8d2da249ae Merge pull request #147 from ntim/support_for_philips_hue
Support for philips hue

Former-commit-id: 6cdaeb838b00d00d5de2570339ef3da0375c44d6
2014-08-24 20:55:36 +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
poljvd
04c54ee7eb Fix typo error
Former-commit-id: 664fc81f7bcfab58ac543f08725992044e51d8db
2014-08-18 13:50:19 +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
tvdzwan
769d550167 Merge pull request #130 from bimsarck/master
Remove unnecessary code

Former-commit-id: 265b481bc708fdcf4294b9fb92bbc1fcee05844c
2014-07-15 20:14:25 +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
tvdzwan
dc4d660b21 Merge pull request #124 from bimsarck/master
improved philips hue device

Former-commit-id: da26ec8f111f0e3f64914b5f3cf9742470fe3f0d
2014-07-10 21:53:26 +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
bimsarck
7aa88088f4 Merge pull request #1 from tvdzwan/master
sync to tvdzwan:master

Former-commit-id: c94a711f7c45eea1391bc18f9ca96d4d3b6b6e14
2014-06-20 03:11:05 +02:00
T. van der Zwan
ba4d2b45d5 Updated release package to include new device (tpm2)
Former-commit-id: 24decda30a774b4d3702ec8fa375bc1ac4b849d7
2014-06-19 22:16:03 +02:00
tvdzwan
a3f9d15a4a Merge pull request #118 from Gamadril/master
Added support for tpm2 protocol. One frame used for all LEDs

Former-commit-id: ebc61d126f89f1efec9975454115a0ded2a68af4
2014-06-19 22:06:56 +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
T. van der Zwan
98dfe7997f Updated release with updated blob effect
Former-commit-id: 3d859fb7283961152ff67eb8101db89bdcd21847
2014-06-02 21:38:41 +02:00
tvdzwan
62b78fca06 Merge pull request #109 from Fabi1080/feature/moodblobs_upgrade
Effect mood blob upgrade

Former-commit-id: 8c5769ed2242e72f8447c11ac3cb02881b80b1ce
2014-06-02 21:32:45 +02:00
T. van der Zwan
d37960c609 Merge branch 'master' of https://github.com/tvdzwan/hyperion.git
Former-commit-id: deb8e613728d62804d72716bcebaf87b660f5290
2014-05-24 21:11:31 +02:00
T. van der Zwan
8f1bb8e9db Updated hyperion release to include philips hue
Former-commit-id: d46ccf12d1f2a8059d45f946fe0f4c43e8b5bc9e
2014-05-24 21:05:59 +02:00
tvdzwan
4ff400000e Merge pull request #104 from ntim/support_for_philips_hue
Support for philips hue

Former-commit-id: ff2c0b1071cb6a94eb792e590c74fc6eee98c0d9
2014-05-24 20:51:10 +02:00
Fabian Hertwig
2b3a3be0d3 Added the possibility to change the base color of the mood blobs over time.
The base Color is moved 1 degree in baseColorChangeRate seconds if activated.
It is moved between baseColorRangeLeft and baseColorRangeRight. These Values are in degrees. When these borders are set to the full circle (eg. 0 and 360), the base color moves around the colorwheel, otherwise it moves from left to right and back again.
Furthermore there are three effects script for this feature: "Full color mood blobs" which moves around the full circle, "Warm mood blobs" and "Cold mood blobs" which only shows the warm, cold colors.
This update wont change the functionality of the old scripts.


Former-commit-id: 0c7a2ad280e49cd1ac0d6a9fbc9d1a9ff0eea236
2014-05-24 13:03:46 +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
dca9371f6d Update binaries
Former-commit-id: d1dc28de9db9a90ecfc185882f994d917bce8e6f
2014-05-06 22:05:41 +02:00
johan
d50b46bda2 Fix integration area = 0 for a led
Former-commit-id: b365c4c9605a84ea6b7f88043f6f9c70b7122931
2014-05-06 22:02:40 +02:00
poljvd
2d16d369a3 Merge pull request #100 from MarcDahlem/master
Added ability to define effect arguments for the bootsequence

Former-commit-id: afc8e8ea4e7f02039092bfca698e5e3e491604c2
2014-05-06 22:01:35 +02:00
Marc Dahlem
106257181b Added ability to define effect arguments for the bootsequence
Former-commit-id: b9827bb7af6c2cfdd8b1b0388d16541612b360d4
2014-05-06 18:36:34 +02:00
johan
f9906845e0 Update the install script
- follow =github redirections when using curl under OpenElec
- Use raw.githubusercontent.com iso raw.github.com to prevent a redirection


Former-commit-id: af76999acd598d4383b3a64b09e1407cd666ff99
2014-05-04 14:20:25 +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
8c1f14f8dc Update binaries for RPi
Former-commit-id: dadd309b43dd982d8ddb1452b9e3c5d656391246
2014-04-30 22:55:39 +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
poljvd
3acfde8d22 Merge pull request #95 from ntim/support_for_philips_hue
Support for the Philips Hue system.

Former-commit-id: 28352b1356c2e67320f3e305c0b87f8195dd7e47
2014-04-30 22:29:45 +02:00