Commit Graph

2124 Commits

Author SHA1 Message Date
Bjoern Bilger
c909ed1764 Merge branch 'master' of https://github.com/bbilger/add_tinkerforge
Conflicts:
	cmake/Findlibtinkerforge-1.0.cmake

Former-commit-id: d4ddb3c39d373bcfb6b47f14961cd4f3e5853279
2014-03-04 20:54:49 +01:00
Bjoern Bilger
d990afb89b added cmake finder
Former-commit-id: b71cf3d7d70c9a79fbfb7c62ec737abdadcc06fd
2014-03-04 20:52:23 +01:00
Bjoern Bilger
cf21ba76c9 add support for tinkerforge
Former-commit-id: f624e4ea226365d6cc832ebbe51b471559341f33
2014-03-04 20:38:54 +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
6b63b57f17 Added performance test for x11 grabbing
Former-commit-id: b8c60cf9984c6961675b41002bed40d251bff9fa
2014-02-25 22:09:59 +01:00
T. van der Zwan
591a071856 Fixed missing include
Former-commit-id: 53dab1a29d04b9cf083461caa20249b78600440d
2014-02-25 22:08:26 +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
fe6bfb0ad2 Missing include added
Former-commit-id: e8bde1967c71b2171de270b25d7474a1a528c56a
2014-02-07 15:28:14 +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
T. van der Zwan
7a51c3e4ac Merge branch 'snake' of https://github.com/tostadora/hyperion
Former-commit-id: 6ce0b1213b291032fd9ac3ed3eb96027671d2f0a
2014-02-06 19:47:52 +01:00
tostadora
b781c4403a back to the old decrement. It had a better effect
Former-commit-id: a00b1c8c84c7846f760e7c0cec7d08949bd6e6b7
2014-02-05 19:24:36 +01:00
tostadora
e6ebd6696b clear code and change the decrement of value to make it even
Former-commit-id: c13cb44cfe48314c087cf6b80257317a38f260ba
2014-02-05 09:14:42 +01:00
tostadora
faee31c83f new effect!
Former-commit-id: e19975e298fd6b11e7012739ac37ee3047d2c184
2014-02-04 23:51:11 +01:00
johan
62c1d36195 Switched added to hyperion-v4l2 to process the video stream as a 3D SBS or TAB
Former-commit-id: cdd121f172f4e42e301f63a3a2a51ec97ac97e3b
2014-02-04 21:53:36 +01:00
johan
bad5b34796 Individual cropping values aded for all sides
Former-commit-id: 7e4013f745669bf38a9d2043731e0747d81241d5
2014-02-04 21:12:51 +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
poljvd
ff0fb78e33 Update CompileHowto.txt
Former-commit-id: 85a1139f39545b84bab2671cb8384c779c45750f
2014-02-03 16:49:00 +01:00
T. van der Zwan
2fa46fdd98 Fixed correct addres configuration
Former-commit-id: b001df5968f009cf9686a3741170790d82eaba1f
2014-02-02 16:58:46 +01:00
T. van der Zwan
8e446bf883 Implemented the X11-grabber (based on v4l code).
Former-commit-id: 17ad66ff7e2a1e3fae2d853e5360f791934b6563
2014-01-30 12:35:29 +00:00
johan
ba73fbd470 Set qt locale to 'C'
Former-commit-id: d2c0b2ea61c8444169a8d8635adf7af5d3b5c67b
2014-01-28 22:27:02 +01:00
T. van der Zwan
6864ef6e43 Increased the timeout of grabbed images.
Former-commit-id: efc9d44a51ffd50e3233c6460a70335205b0c9f3
2014-01-28 08:55:54 +00:00
T. van der Zwan
2d7d18b34d Added coding framework for X11
Former-commit-id: 2915defe12e23d328716eade251849d40d098a8a
2014-01-28 08:47:16 +00:00
johan
1bc65a78ac Merge branch 'master' of https://github.com/tvdzwan/hyperion
Former-commit-id: bb47417f5e1dcee74b6e6791083b888a9e871f72
2014-01-28 00:39:23 +01:00
johan
b846b0b15d Set C locale at startup
Former-commit-id: 2f47a595266e5b865aa70a65bbc8d29c0c515eed
2014-01-28 00:39:04 +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
2085e3909f Added creation of symbolic link /usr/bin/hyperion-v4l2 in install script
Former-commit-id: f45b8424968aa7ef5f0ca96cd716b6e3cf3b622a
2014-01-26 22:55:17 +01:00
johan
ad8afb0f12 Added support for YUYV
Former-commit-id: 2e867b53b129af5c5f6d443a197721a3c8852a1b
2014-01-26 20:20:55 +01:00
johan
beddd7ccc4 Changed default video standard
Former-commit-id: fb1452ee49b188082bdbd01c8241d451f6edc704
2014-01-26 18:02:33 +01:00
johan
6b609fe9d7 Update program description
Former-commit-id: 6c6e7972e25c7eb7b3e575273cbeb91f27578f79
2014-01-26 16:34:13 +01:00
johan
6a1ba0bcff New release created
Former-commit-id: 32cea464297936ab978575203be70b8ba5371b42
2014-01-26 16:12:07 +01:00
johan
305a2e856a Added signal detection option
Former-commit-id: 1bd70d02814d6238c488db765d9d25af655c1872
2014-01-26 16:00:33 +01:00
johan
f5317bc2d9 Moved black border detection code to seperate library
Former-commit-id: 590029949b79689ea05409149677e51b748cb64f
2014-01-26 14:23:08 +01:00
johan
8cf39a9f6f Added logic to reconnect after connection failure;
Implemented option to stop receiving the proto replies;


Former-commit-id: d8dfc3f36e81d727c4b7d449888f781b7b57c99e
2014-01-26 13:33:19 +01:00
johan
c96be1cf38 Added option to stop receiving the proto replies
Former-commit-id: b15c31b8aa500b8d7253d0c2b2368eab6a11ed50
2014-01-26 13:00:23 +01:00
johan
df9b33f560 Replaced exit statements for exceptions
Former-commit-id: 1eb180620fb59613eaa02da84026ffdcb28803a4
2014-01-26 12:35:31 +01:00
johan
4f7997bbfe Switched json to proto
Former-commit-id: 1a1c70b93c9b4efe17f1c1d2da246c949affa1f0
2014-01-25 21:00:48 +01:00