mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,398 Commits 2 Branches 9 Tags
985b7e6866f96e63c70690b6d5b12ec4e50569bc
Commit Graph

35 Commits

Author SHA1 Message Date
vanhofen
985b7e6866 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Origin commit data
------------------
Commit: 491ca15848
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal
 2017-11-01 15:10:38 +01:00
vanhofen
73c370ab33 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
 2017-08-30 18:11:59 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +02:00
Jacek Jendrzej
a887d8b2e9 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 13:13:03 +02:00
vanhofen
cce5365b59 hw_caps: remove CFEManager-code; ... 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
 2017-08-21 12:56:00 +02:00
Jacek Jendrzej
f9a565da5d part from c2095e1759 
Origin commit data
------------------
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 10:57:18 +02:00
Stefan Seyfried
32b8b3b54f Revert "- hardware_caps: fix has_fan and add detection of Neo Twin" 
This reverts commit ee911957d4.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Commit: e2db590797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
 2017-08-21 10:17:05 +02:00
vanhofen
c2095e1759 hw_caps: remove CFEManager-code; ... 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Commit: 382181e289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
 2017-08-14 10:56:45 +02:00
Michael Liebmann
606abfa9ce Revert "HD1: Workaround for missing cs_get_chip_type" 
This reverts commit eac2dccfb6.


Origin commit data
------------------
Commit: e3cc6cee67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 19:33:29 +02:00
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 11:07:32 +02:00
vanhofen
93b1e05e4a vfd-setup: fix brightness setup for CST's boxmodel "Link" ... 
and hide the brightness menu for all "Trinity" models. There's no display.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4295839526
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-15 01:01:55 +02:00
vanhofen
45392dd9cd vfd-setup: fix brightness setup for CST's boxmodel "Link" ... 
and hide the brightness menu for all "Trinity" models. There's no display.


Origin commit data
------------------
Commit: c0d367dca9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-12 (Mon, 12 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.
 2017-06-12 13:14:32 +02:00
vanhofen
2deb414738 Revert "HD1: Workaround for missing cs_get_chip_type" 
This reverts commit eac2dccfb6.


Origin commit data
------------------
Commit: 54d7350a11
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 23:38:40 +02:00
Michael Liebmann
eac2dccfb6 HD1: Workaround for missing cs_get_chip_type 
Origin commit data
------------------
Commit: a6fe60d60a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:16:11 +02:00
vanhofen
c271e77e9d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:25:43 +02:00
Michael Liebmann
6823fd44d3 hd[1|2]/libcoolstream: Update headers for new libcoolstream functions 
libcoolstream-mt.so version 3.2.0 required

 Functions:
 - updateOsdScreenInfo()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - fbCopy()
 - fbFill()
 - cs_set_extra_debug()


Origin commit data
------------------
Commit: 9bc2d9b95e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
hd[1|2]/libcoolstream: Update headers for new libcoolstream functions

 libcoolstream-mt.so version 3.2.0 required

 Functions:
  - updateOsdScreenInfo()
  - GetVideoSystem()
  - GetVideoSystemFormatName()
  - fbCopy()
  - fbFill()
  - cs_set_extra_debug()
 2017-03-22 01:23:45 +01:00
vanhofen
d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:07:17 +01:00
vanhofen
ee911957d4 hardware_caps: fix has_fan and add detection of Neo Twin 
Origin commit data
------------------
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin
 2017-03-19 01:04:48 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
b90bc955c3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 114392256c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:21:17 +01:00
vanhofen
a8db520beb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:10:04 +01:00
vanhofen
e96b2f0178 hardware_caps: just changes in comments 
Origin commit data
------------------
Commit: ff6046bb56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: just changes in comments
 2017-03-10 15:07:52 +01:00
vanhofen
4ccc9cbdaf hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines 
Origin commit data
------------------
Commit: 24b159f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines
 2017-03-10 15:07:52 +01:00
vanhofen
2fd434895b hardware_caps: use define instead of value; better readability 
Origin commit data
------------------
Commit: 7cca1e02c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: use define instead of value; better readability
 2017-03-10 15:07:52 +01:00
vanhofen
86c64163c7 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()" 
This reverts commit ec191c5a38
because libcoolstream now is updated


Origin commit data
------------------
Commit: 83de4ba055
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:07:52 +01:00
Michael Liebmann
cd4922c0c2 hd2/libcoolstream/*.h: Update for new libcoolstream functions 
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - Add CS_CHIP_NEVIS definitions


Origin commit data
------------------
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
Michael Liebmann
5b136d4c55 hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions 
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - cs_get_chip_type() (dummy function for compatibility with hd2)
 - Add CS_CHIP_xxx definitions


Origin commit data
------------------
Commit: 7eecd09eca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
vanhofen
38dd0be012 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8fb706226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 00:31:02 +01:00
Michael Liebmann
ec191c5a38 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type() 
Origin commit data
------------------
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:25 +01:00
vanhofen
afe0a772a9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 13:43:47 +01:00
vanhofen
17fd0362e1 hardware_caps: add latest coolstream models 
Origin commit data
------------------
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)

Origin message was:
------------------
- hardware_caps: add latest coolstream models
 2017-03-09 12:51:44 +01:00
vanhofen
3a863c91f0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:40:18 +01:00
vanhofen
fdda0de766 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:07:52 +01:00
vanhofen
97391211a4 move public libcoolstream-headers to hardware directory 
Origin commit data
------------------
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- move public libcoolstream-headers to hardware directory
 2017-03-06 21:49:32 +01:00
vanhofen
459cf4d8ea port hardware_caps from Neutrino-MP 
Origin commit data
------------------
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP
 2017-03-06 21:49:32 +01:00