mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-15 11:07:32 +02:00
parent 5a43934c6b 8b3c5e2fab
commit faa10f0ed6
39 changed files with 430 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hardware/coolstream/hardware_caps.cpp
View File

@@ -75,6 +75,7 @@ hw_caps_t *get_hwcaps(void) {
strcpy(caps.boxname, "Trinity V2");
strcpy(caps.boxarch, "Kronos");
}
caps.can_set_display_brightness = 0;
break;
case 12:
strcpy(caps.boxname, "Zee2");
@@ -87,6 +88,7 @@ hw_caps_t *get_hwcaps(void) {
case 14:
strcpy(caps.boxname, "Trinity Duo");
strcpy(caps.boxarch, "Kronos");
caps.can_set_display_brightness = 0;
break;
default:
strcpy(caps.boxname, "UNKNOWN_BOX");