Merge remote-tracking branch 'tuxbox/pu/fb-modules'

only compile tested ;-)
This commit is contained in:
Stefan Seyfried
2017-02-12 21:29:10 +01:00
45 changed files with 859 additions and 157 deletions

View File

@@ -852,7 +852,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
if( boxname == "Armas ")
boxname += "TripleDragon";
break;
#ifdef BOXMODEL_NEVIS
#ifdef BOXMODEL_CS_HD1
case 6:
boxname += "HD1";
break;
@@ -868,7 +868,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
boxname += "Zee";
break;
#endif
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
case 9:
boxname += "Tank";
break;
@@ -916,7 +916,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
switch(system_rev)
{
#ifdef BOXMODEL_NEVIS
#ifdef BOXMODEL_CS_HD1
case 6:
case 7:
case 8:
@@ -924,7 +924,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
boxmodel = "Nevis";
break;
#endif
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
case 9:
boxmodel = "Apollo";
break;