Commit Graph

1091 Commits

Author SHA1 Message Date
brindosch
ff7154adad Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: 92d7b7170f9e8f698c844a9a78ac58bdcdd8f778
2016-03-15 20:33:50 +01:00
brindosch
144d1ba840 32bit deprecated
Former-commit-id: dd3e9c404f4162febf78cbd98b6ccf9511f7e855
2016-03-15 20:33: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
AEtHeLsYn
ef92488c97 Update hyperion.config.json
Former-commit-id: 0febd7e5e4651880d9debd6516e47f1700bd351e
2016-03-15 11:01:29 +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
brindosch
935e400a4a Merge pull request #547 from penfold42/master
updated reference to rpi_ws281x sub module

Former-commit-id: f649f4bbd4fcd4781ee0e7e29e61fe10088df330
2016-03-14 00:38:06 +01:00
penfold42
cda2232080 updating reference to rpi_ws281x
Former-commit-id: 6949fe847d9c4181c924a13ed0715ecd71b98499
2016-03-14 10:02:10 +11:00
AEtHeLsYn
901876246e Merge remote-tracking branch 'refs/remotes/origin/test'
Former-commit-id: 009da18a860ea64f2921d4c34229749539d1e990
2016-03-13 21:19:34 +01:00
AEtHeLsYn
0708d47457 Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
Former-commit-id: d6129482381dba63e5c1a4026932f01a3beafbef
2016-03-13 21:14:43 +01:00
AEtHeLsYn
1f1aee0c37 Final fixex
Former-commit-id: 7b2e1a33ab7705dddadfa1ec99d3d7c379ab10dd
2016-03-13 21:14:22 +01:00
AEtHeLsYn
ae23c96b91 Merge remote-tracking branch 'refs/remotes/tvdzwan/master' into test
Former-commit-id: 00f923e9b8fe892cd2f5117e0d81743471d2a6ad
2016-03-13 20:53:28 +01:00
brindosch
09c1a6448e add x32x64 oe dependencies
Former-commit-id: 77dfd9acb888a373fc46f4dcc905ebe9d3a3d93e
2016-03-13 20:04:42 +01:00
brindosch
33d7e54f1f fix createrelease.sh
Former-commit-id: d004178819bb9ac41b042149da3b5ef30a43d890
2016-03-13 17:56:00 +01:00
brindosch
b3e929af3e extend create release.sh
Former-commit-id: 52e24ff533bc2d3d3d81f8f1b45c33b3bfe1fcfa
2016-03-13 15:40:49 +01:00
brindosch
357790c84c cleanup and addition
Former-commit-id: b47e5b99eb535aa98b90dfb111618c0055b00993
2016-03-13 13:55:56 +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
AEtHeLsYn
37c54d733d Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
Former-commit-id: 59c1c363863c950e91ac57cc2ff39a722359634b
2016-03-13 11:49:49 +01:00
redpanther
fd2cb44b1c merge upstream
Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47
2016-03-13 08:07:58 +01:00
redpanther
c7df8c23c6 Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id
Conflicts:
	src/hyperion-aml/CMakeLists.txt
	src/hyperion-remote/CMakeLists.txt
	src/hyperion-v4l2/CMakeLists.txt

Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb
2016-03-13 08:04:49 +01:00
penfold42
bc3e724413 Merge pull request #6 from tvdzwan/master
updating my fork again

Former-commit-id: 0014a1280dd8d164e5ff79c3a2f4c6fa72792d73
2016-03-13 13:21:59 +11:00
tpmodding
66cb9c3714 Merge pull request #542 from redPanther/bootsequence
fix bootsequence

Former-commit-id: a02ab756a8da1de8f863d5b723eed96e46d7777b
2016-03-13 03:04:57 +01:00
tpmodding
30e4ba47d9 Update create_all_release.sh
Added "-DCMAKE_BUILD_TYPE=Release -Wno-dev" to make everything ready for release!

Former-commit-id: 1c4f6e4b829afbe782dff63c7d16ece8562146fa
2016-03-13 02:35:17 +01:00
tpmodding
2dae58f070 Update CrossCompileHowTo.txt
Updated instructions and build script, save as .sh and run it!

Fixed typos also!

Former-commit-id: 53b6f896de2e28d8fe7d6d37abe296272c71032e
2016-03-13 02:27:12 +01:00
redpanther
3dae8d069c fix bootsequence.
if boot duration not 0 then boot prio is set to 0 to avoid start of grabber overrules boot efx
cleanup bootseq code


Former-commit-id: 85c9f099bd9a2e8d695117a24164d8ce81ad2a36
2016-03-12 19:21:47 +01:00
brindosch
e9e43e2ba0 compatiblitiy with ne script
Former-commit-id: cf390012c6973d6223c8f60b9679b6d782a1fbde
2016-03-12 12:04:54 +01:00
brindosch
97ba9560e8 Update images and introduce new install script, cleanup
Former-commit-id: 4f38353c420f5b82de509c36d4444bc8d32566e3
2016-03-12 03:49:19 +01:00
penfold42
614ffac421 Merge pull request #5 from tvdzwan/master
Merging again

Former-commit-id: 83dfa4a4aafbcb8c3bb8818fa22bcab453861824
2016-03-12 11:55:56 +11:00
brindosch
deb010cc22 fix leddevicephue
Former-commit-id: eb4f93bf7a59d496f83d8db534f99cf589c46bc9
2016-03-12 00:55:28 +01:00
brindosch
93e33c16a0 Merge remote-tracking branch 'origin/master'
Former-commit-id: 8b2c8b1c284cfdf6ab29c209c454452bff37c4ec
2016-03-11 22:16:08 +01:00
brindosch
fd69788352 Revert "re add config"
This reverts commit 90081b7f65 [formerly d004e7dd5331ce4740682cf33960a2e0b79686ae].


Former-commit-id: df749dd75cd06a3091ed5480063948013485fe4f
2016-03-11 22:16:01 +01:00
brindosch
90081b7f65 re add config
Former-commit-id: d004e7dd5331ce4740682cf33960a2e0b79686ae
2016-03-11 19:28:38 +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
e813bf3278 fixconflict
Former-commit-id: 07882fe323b23178a04ce187eccddb0f71c357ff
2016-03-11 19:25:48 +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
a5e042225e Update JsonConnection.cpp
Former-commit-id: 7b748e605939b65f02cb768a924faa48787618c3
2016-03-11 12:30:32 +01:00
AEtHeLsYn
8fce604ccb Update JsonConnection.h
Former-commit-id: 5d44428cd95e2b81b867ace67eb1f77aceb47856
2016-03-11 12:29:07 +01:00
AEtHeLsYn
39b318e842 Update JsonConnection.h
Former-commit-id: 5191309bb65f446d8d60e21193ece00560d5e67b
2016-03-11 12:28:45 +01:00