Commit Graph

1067 Commits

Author SHA1 Message Date
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
AEtHeLsYn
8caf69e541 Update JsonConnection.h
Former-commit-id: fa07c01ab5bb34029d8b13ea93187a54686d784c
2016-03-11 12:21:04 +01:00
AEtHeLsYn
0baebe3873 Update hyperion-remote.cpp
Former-commit-id: bb2282e48bdd93d4dffcd763ff34e33d3f00670c
2016-03-11 12:20:59 +01:00
AEtHeLsYn
d7546dc042 Merge pull request #5 from tvdzwan/master
Update CompileHowto.txt

Former-commit-id: 22c733aa48d1f12dfc21c06d84276e59820f84c8
2016-03-11 11:42:31 +01:00
Serhan
d97d31fe3d Update CompileHowto.txt
Typos and OSX build updated

Former-commit-id: b8817888cf5b9867ca3514ffac760188693b610f
2016-03-10 22:25:04 +01:00
redPanther
9a175a007c Merge pull request #2 from tpmodding/patch-2
Update OsxWrapper.cpp

Former-commit-id: 8662343b88b668f8f50bee7ca8ae9bd1a8ee0f73
2016-03-10 22:18:01 +01:00
Serhan
a25d8328f4 Update OsxWrapper.cpp
typooooo :D

Former-commit-id: 61df249f76c500845a460888b5f64dd70c056d28
2016-03-10 21:34:02 +01:00
AEtHeLsYn
da7183d28b Update Hyperion.cpp
Former-commit-id: 5bad6209c49a8fd9eba5582119d9e130b9bea565
2016-03-10 18:13:46 +01:00
AEtHeLsYn
6e7157c571 Update Hyperion.h
Former-commit-id: c1bd4a7397e8ae2e72b9ef5dcc32ee3b866e2c36
2016-03-10 18:08:34 +01:00
AEtHeLsYn
b0d74b2dd8 Update ColorTransform.h
Former-commit-id: 4c944b94cf26720906efa63ea4266064dc092134
2016-03-10 17:57:52 +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
redpanther
e848411785 install proto to binary dir
Former-commit-id: aaac3a7094442b0bfc51a572fcfa6f7cc59b81a2
2016-03-10 17:11:02 +01:00
redpanther
e01bcd708d add install commands
instead of "make" use "make install/strip" release compile


Former-commit-id: f4dd2d9e1a4d815b667665892a3bd9cec64218a3
2016-03-10 12:22:44 +01:00
redpanther
12b406dd4b make compile of tests optional and disabled by default
Former-commit-id: dc05b637391ec5b7e79d66d94724828e8dbd2653
2016-03-10 12:06:03 +01:00
redpanther
153d1f0999 print version for every standalone grabber and hyperiond
Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
2016-03-10 12:01:10 +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
9f273410a1 Update .gitignore
Former-commit-id: 416ddb32c74a723acc019283ab3330f88666a1e9
2016-03-10 07:58:30 +01:00
AEtHeLsYn
266f0e6694 Update .gitignore
Former-commit-id: b33283298729bdca7c78d855964c3126735fd57b
2016-03-10 07:57:47 +01:00
redpanther
49e867f5fc add an auto generated version id
Former-commit-id: df3ad6b08e24e73d957611e8be45e7e8cc717b8c
2016-03-10 06:53:21 +01:00
Mark Walker
7cb34733fd Actually, you can enable both flavors of PWM
If you do a build with both ENABLE_WS2812BPWM and ENABLE_WS281XPWM and
choose which LED driver using the device.type in the config.json


Former-commit-id: 35ae88ad8739cac406a9b8792e2223010bf5d144
2016-03-09 12:27:07 -08:00
AEtHeLsYn
8b26033915 Update Hyperion.h
Former-commit-id: 9e4ab548db0f2805386d90bfe9cde3aa9426aab5
2016-03-09 19:58:49 +01:00
AEtHeLsYn
90b9acf68e Update Hyperion.cpp
Former-commit-id: 4c3f0a561d7def20dd713add0d437bdf12431e0b
2016-03-09 19:57:03 +01:00
AEtHeLsYn
bcb0802542 Update Hyperion.h
Former-commit-id: 877c98ea4c6f5503fda14914e315c2b9eb301a44
2016-03-09 19:55:55 +01:00