Commit Graph

81 Commits

Author SHA1 Message Date
Michael Liebmann
420efbcc4e CRCInput::setKeyRepeatDelay: Change hardware dependency,
HD2 driver is not so very ugly. ;)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 383af04cb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
CRCInput::setKeyRepeatDelay: Change hardware dependency,

 HD2 driver is not so very ugly. ;)


------------------
This commit was generated by Migit
2017-02-22 12:04:58 +01:00
vanhofen
41f5815172 rc_input: we have d_printf, so let's use it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1eec78ccfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rc_input: we have d_printf, so let's use it

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 11:50:09 +01:00
vanhofen
bab85d298c rc_input: just cosmetics to satisfy syntax-highlighters
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ed439e53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rc_input: just cosmetics to satisfy syntax-highlighters

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 08:59:56 +01:00
vanhofen
a0481953d0 rc_input: rename checkLnkDev() to checkdev_lnk(); ...
just to align form-style to latest changes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e435bb389
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rc_input: rename checkLnkDev() to checkdev_lnk(); ...

just to align form-style to latest changes


------------------
This commit was generated by Migit
2017-02-22 08:59:56 +01:00
Michael Liebmann
abe232fc6c CRCInput::set_rc_hw: Fix device check for cs hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cac45ccb8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
85b82bd12f rcinput: remove unused/unimplemented click functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: f45456d7a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
8071a9d51b rcinput: fix set_rc_hw() after dynamic devices patch
...this could use some tests... :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 41958cc029
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
475c8878f8 rcinput: add setKeyRepeatDelay() function
this allows to get rid of the broken getFileHandle function later


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0df5a8df7f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Michael Liebmann
7345242772 rcinput: Add exception handling for cs hd2
- Supplement to previous commit


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b79faff78
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
b5ec2b42df rcinput: use a dynamic list of input devices
Instead of the fixed, static list of input devices, scan /dev/input/ for
proper event devices. A "good" input device is one that supports the
EVIOCGBIT ioctl and at least the EV_KEY event type.
This probably needs further fixes, e.g. in repeat rate setting code.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b3aa2b181
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Michael Liebmann
8c4609a9b0 rcinput: Transfer from neutrino-mp for better compatibility
Origin commit data
------------------
Branch: ni/coolstream
Commit: d932a1a326
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
GetAway
4164c31d7b pzapit: add -lockrc/-unlockrc options; port from martii
I've pulled it from Duckbox-Developers/neutrino-mp-cst-next
and modified it to work


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0330515abc
Author: GetAway <get-away@t-online.de>
Date: 2016-12-11 (Sun, 11 Dec 2016)



------------------
This commit was generated by Migit
2016-12-11 20:20:02 +01:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
Jacek Jendrzej
00617f957a src/driver/rcinput.cpp revert (not sure)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b33d1ef38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-26 19:38:24 +02:00
Jacek Jendrzej
0c56a98b46 fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f371cc918
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-25 (Mon, 25 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-25 15:41:06 +02:00
Jacek Jendrzej
3f67f95753 avoid pssible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d1e34a527
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-21 18:14:46 +02:00
[CST] Focus
70ea917953 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-02 14:30:51 +03:00
vanhofen
bfdb68d9ca Revert "rcinput/neutrino: avoid the use of EVT_TIMESET"
This reverts commit 00bf8a7e92.

In some cases keys are don't used immediately:
---
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
CVFD::ShowText: [14:14]
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
2 key: 0074 value 2, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
[/.../cst-next/src/neutrino.cpp:standbyMode:3615] OFF
CSAPI (POWER-CLK): new CPU frequency: 600000000Hz
CSAPI (VIDEO): Standby 1 -> 0
CSAPI (HDMI-CEC): Power Status: STANDBY -> ON
CSAPI (HDMI-CEC): Device free (Logical Address: 03)
CSAPI (HDMI-CEC): Power Status: ON
---


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c64d2fb2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-18 (Mon, 18 Jan 2016)



------------------
This commit was generated by Migit
2016-01-18 08:10:23 +01:00
Stefan Seyfried
00bf8a7e92 rcinput/neutrino: avoid the use of EVT_TIMESET
sectionsd's EVT_TIMESET was only used to fix time calculations
for input repeat detection. I doubt this reliably worked anyway.
Just calculate an absolute input timestamp from CLOCK_MONOTONIC
and use that. Even better solution would be to use a newer
kernel with EVIOCSCLOCKID ioctl, leave that for later :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: b307b78bf8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
1adf757e65 rcinput: remove unused code, comment FIXME
I think I have mostly deciphered the meaning of this :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89f6da98f1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Jacek Jendrzej
3240811349 fix compiling warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bfcad398f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-11 19:21:54 +01:00
[CST] Focus
c0bb459726 driver/rcinput.cpp: reset first key press only on key press event
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1398736bd8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-15 (Thu, 15 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-15 15:26:58 +03:00
[CST] Focus
3491bf1e64 neutrino, zapit: drop EVT_SCAN_REPORT_FREQUENCY,
use EVT_SCAN_REPORT_FREQUENCYP to pass full feparams,
fix scan transponder display info


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e9b71af90
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)



------------------
This commit was generated by Migit
2014-10-02 14:23:36 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
[CST] Focus
fe24da94d0 driver/rcinput.cpp: re-add shutdown after wakeup cancel,
code from commit af3bd6e922 is lost after some pick ?


Origin commit data
------------------
Branch: ni/coolstream
Commit: c359fe4eaa
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-08 (Thu, 08 May 2014)



------------------
This commit was generated by Migit
2014-05-08 12:36:56 +04:00
Stefan Seyfried
938f19d739 rcinput: fix invalid narrowing cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33d2fb319a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-05-02 (Fri, 02 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-02 09:47:42 +02:00
[CST] Focus
00ac5c6c0c driver/rcinput.cpp: add NeutrinoMessages::EVT_HOTPLUG
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a6ef5b30d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-23 17:44:12 +04:00
martii
9e3a9af952 driver/rcinput: let getUnicodeValue() return const char *
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34c23ed7a5
Author: martii <m4rtii@gmx.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-25 00:17:09 +01:00
martii
e0a255fd5a driver/rcinput: implement long key press support (but no rcsim/yWeb support at this time)
driver/rcinput: drop unused gettimeofday code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7826ab0fca
Author: martii <m4rtii@gmx.de>
Date: 2014-02-25 (Tue, 25 Feb 2014)



------------------
This commit was generated by Migit
2014-02-25 00:09:14 +01:00
martii
1b03ad3abc driver/rcinput: minor cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 088a75b6e2
Author: martii <m4rtii@gmx.de>
Date: 2014-02-17 (Mon, 17 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-18 20:07:39 +01:00
Michael Liebmann
4abf2a80f8 yWeb: Synchronize volume/audiomute settings yWeb => GUI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-12 06:02:27 +01:00
Jacek Jendrzej
8126ba13a5 webif standby -add option CEC standby off (dont use TV off)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-28 10:30:29 +01:00
Jacek Jendrzej
e9643a6d05 add webif option dont use CEC with standbyoff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4be0273083
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)

Origin message was:
------------------
-add webif option dont use CEC with standbyoff

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-26 22:24:17 +01:00
Stefan Seyfried
fc478d0ee1 rcinput: avoid theoretically possible timerid overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 081e35b3e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-26 13:37:36 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
[CST] Focus
bcf600d605 driver/rcinput.cpp: increase neutrino.sock listen backlog -
try to avoid dead-lock on zap flood, when neutrino wait response for command,
while zapit try to send event to neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: af49e54d22
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-25 13:03:11 +04:00
vanhofen
dc660e7e7f yweb: fix /control/reboot
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5227f726c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)

Origin message was:
------------------
- yweb: fix /control/reboot

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-28 22:25:41 +02:00
[CST] Focus
2175d4baa0 neutrino: add EVT_BACK_ZAP_COMPLETE event for background epg scan zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: f210a8c048
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-13 20:10:02 +04:00
[CST] Focus
af3bd6e922 try to fix shutdown after wakeup, if several recordings was done,
cancel shutdown after wakeup, if remote used, based on code (c) martii <m4rtii@gmx.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d886a95acd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)



------------------
This commit was generated by Migit
2013-07-30 14:10:21 +04:00
[CST] Focus
b3208470f1 neutrinoMessages.h, rcinput.cpp: add NeutrinoMessages::EVT_EIT_COMPLETE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cf3ceef4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-12 18:46:34 +04:00
Jacek Jendrzej
75f50de7eb fix comma at end of enumerator list
Origin commit data
------------------
Branch: ni/coolstream
Commit: a549b97924
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-28 15:52:31 +02:00
[CST] Focus
21ffb607d0 driver/rcinput.cpp: add missing sleep, sub, pos keys
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65bd112d78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-06 (Wed, 06 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 15:42:23 +04:00
[CST] Focus
d0ccb2c97d Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
Stefan Seyfried
0e01a7b32c neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00
[CST] Focus
77da6db789 driver/rcinput.cpp: change device back to /dev/input/nevis_ir, apollo has link
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8267a53049
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-11 15:16:52 +04:00
[CST] Focus
b6e23fe1e3 src/driver/rcinput.cpp: change ifdefs for headers and set_rc_hw
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6380763209
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-11 14:04:07 +04:00
[CST] Bas
fe727eb954 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



------------------
This commit was generated by Migit
2012-12-07 14:39:05 +08:00
[CST] Bas
849d5ca191 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)



------------------
This commit was generated by Migit
2012-11-13 12:51:18 +08:00
Jacek Jendrzej
963dc53213 src/driver/rcinput.cpp: use standby_rc in repeat mode only if need
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d570537fd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-12 (Mon, 12 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-12 12:23:23 +01:00