Skip to content

Commit

Permalink
mips dm820 added
Browse files Browse the repository at this point in the history
  • Loading branch information
BPanther committed May 14, 2024
1 parent 2d63f3f commit 32d73d2
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 26 deletions.
11 changes: 7 additions & 4 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ AC_ARG_WITH(boxtype,
BOXTYPE="armbox"
BOXMODEL="$withval"
;;
vuduo|vuduo2|vuuno|vuultimo|dm8000)
vuduo|vuduo2|vuuno|vuultimo|dm820|dm8000)
BOXTYPE="mipsbox"
BOXMODEL="$withval"
;;
Expand All @@ -333,7 +333,7 @@ AC_ARG_WITH(boxmodel,
AS_HELP_STRING([--with-boxmodel], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, tf7700])
AS_HELP_STRING([], [valid for spark: spark, spark7162])
AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, e4hdultra, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7])
AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm8000])
AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm820, dm8000])
AS_HELP_STRING([], [valid for generic: raspi]),
[case "${withval}" in
ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|tf7700)
Expand All @@ -357,7 +357,7 @@ AS_HELP_STRING([], [valid for generic: raspi]),
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
vuduo|vuduo2|vuuno|vuultimo|dm8000)
vuduo|vuduo2|vuuno|vuultimo|dm820|dm8000)
if test "$BOXTYPE" = "mipsbox"; then
BOXMODEL="$withval"
else
Expand Down Expand Up @@ -424,6 +424,7 @@ AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2")
AM_CONDITIONAL(BOXMODEL_VUUNO, test "$BOXMODEL" = "vuuno")
AM_CONDITIONAL(BOXMODEL_VUULTIMO, test "$BOXMODEL" = "vuultimo")
AM_CONDITIONAL(BOXMODEL_DM820, test "$BOXMODEL" = "dm820")
AM_CONDITIONAL(BOXMODEL_DM8000, test "$BOXMODEL" = "dm8000")
AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
Expand Down Expand Up @@ -520,6 +521,8 @@ elif test "$BOXMODEL" = "vuuno"; then
AC_DEFINE(BOXMODEL_VUUNO, 1, [vuuno])
elif test "$BOXMODEL" = "vuultimo"; then
AC_DEFINE(BOXMODEL_VUULTIMO, 1, [vuultimo])
elif test "$BOXMODEL" = "dm820"; then
AC_DEFINE(BOXMODEL_DM820, 1, [dm820])
elif test "$BOXMODEL" = "dm8000"; then
AC_DEFINE(BOXMODEL_DM8000, 1, [dm8000])
elif test "$BOXMODEL" = "h7"; then
Expand All @@ -534,7 +537,7 @@ fi
# Support Boxmodel with OSD-Resolution
case "$BOXMODEL" in
bre2ze4k|hd51|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus)
bre2ze4k|hd51|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm820)
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion src/driver/display.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <driver/vfd.h>
#endif
#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#if BOXMODEL_DM8000
#if BOXMODEL_DM8000 || BOXMODEL_DM820
#include <driver/lcdd.h>
#define CVFD CLCD
#else
Expand Down
4 changes: 2 additions & 2 deletions src/driver/rcinput.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class CRCInput
RC_play = KEY_PLAY,
RC_pause = KEY_PAUSE,
RC_pvr = KEY_PVR,
#if BOXMODEL_DM8000
#if BOXMODEL_DM820 || BOXMODEL_DM8000
RC_forward = KEY_NEXTSONG,
RC_rewind = KEY_PREVIOUSSONG,
#else
Expand Down Expand Up @@ -279,7 +279,7 @@ class CRCInput
RC_prog4 = KEY_PROG4,
RC_media = KEY_MEDIA,
RC_search = KEY_SEARCH,
#if BOXMODEL_DM8000
#if BOXMODEL_DM820 || BOXMODEL_DM8000
RC_nextsong = KEY_FORWARD,
RC_previoussong = KEY_REWIND,
#else
Expand Down
8 changes: 4 additions & 4 deletions src/gui/miscsettings_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ CMiscMenue::CMiscMenue()
{
width = 40;

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
fanNotifier = NULL;
#endif
sectionsdConfigNotifier = NULL;
Expand Down Expand Up @@ -279,7 +279,7 @@ int CMiscMenue::showMiscSettingsMenu()

int res = misc_menue.exec(NULL, "");

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
delete fanNotifier;
fanNotifier = NULL;
#endif
Expand Down Expand Up @@ -310,11 +310,11 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
mc->setHint("", LOCALE_MENU_HINT_CACHE_TXT);
ms_general->addItem(mc);

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
//fan speed
if (fanNotifier == NULL)
fanNotifier = new CFanControlNotifier();
#if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000)
#if defined (BOXMODEL_IPBOX9900) || defined (BOXMODEL_IPBOX99) || defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820)
CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 0, 1, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
#elif BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 10, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/miscsettings_menu.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
class CMiscMenue : public CMenuTarget, CChangeObserver
{
private:
#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
CFanControlNotifier *fanNotifier;
#endif
CSectionsdConfigNotifier* sectionsdConfigNotifier;
Expand Down
6 changes: 3 additions & 3 deletions src/gui/vfd_setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ int CVfdSetup::showSetup()
vfds->addItem(led_num);
}

#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2
#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2
#if ENABLE_LCD4LINUX && ENABLE_GRAPHLCD
if (g_settings.glcd_enable != 0 && g_settings.lcd4l_support != 0) {
g_settings.glcd_enable = 0;
Expand All @@ -217,7 +217,7 @@ int CVfdSetup::showSetup()
#endif

#ifdef ENABLE_LCD4LINUX
#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 && defined (ENABLE_GRAPHLCD)
#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2 && defined (ENABLE_GRAPHLCD)
if (g_settings.glcd_enable == 0)
#endif
{
Expand All @@ -229,7 +229,7 @@ int CVfdSetup::showSetup()
#ifdef ENABLE_GRAPHLCD
GLCD_Menu glcdMenu;
#ifdef ENABLE_LCD4LINUX
#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2
#if !defined BOXMODEL_VUSOLO4K && !defined BOXMODEL_VUDUO4K && !defined BOXMODEL_VUDUO4KSE && !defined BOXMODEL_VUULTIMO4K && !defined BOXMODEL_VUUNO4KSE && !defined BOXMODEL_DM820 && !defined BOXMODEL_DM8000 && !defined BOXMODEL_E4HDULTRA && !defined BOXMODEL_VUDUO2
if (g_settings.lcd4l_support == 0)
#endif
#endif
Expand Down
14 changes: 7 additions & 7 deletions src/neutrino.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
if (g_settings.channel_mode_initial_radio > -1)
g_settings.channel_mode_radio = g_settings.channel_mode_initial_radio;

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
g_settings.fan_speed = configfile.getInt32( "fan_speed", 1);
if (g_settings.fan_speed < 1) g_settings.fan_speed = 1;
#endif
Expand Down Expand Up @@ -1298,7 +1298,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "channel_mode_initial", g_settings.channel_mode_initial );
configfile.setInt32( "channel_mode_initial_radio", g_settings.channel_mode_initial_radio );

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
configfile.setInt32( "fan_speed", g_settings.fan_speed);
#endif

Expand Down Expand Up @@ -2579,7 +2579,7 @@ TIMER_START();
powerManager = new cPowerManager;
powerManager->Open();

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
//fan speed
CFanControlNotifier::setSpeed(g_settings.fan_speed);
#endif
Expand Down Expand Up @@ -4303,7 +4303,7 @@ void CNeutrinoApp::ExitRun(int exit_code)
delete g_RCInput;
g_RCInput = NULL;

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
CFanControlNotifier::setSpeed(0);
#endif

Expand Down Expand Up @@ -4553,7 +4553,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby)
bool alive = recordingstatus || CEpgScan::getInstance()->Running() ||
CStreamManager::getInstance()->StreamStatus();
#endif
#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
//fan speed
CFanControlNotifier::setSpeed(1);
#endif
Expand Down Expand Up @@ -4602,7 +4602,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby)
}
#endif
frameBuffer->setActive(true);
#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
//fan speed
CFanControlNotifier::setSpeed(g_settings.fan_speed);
#endif
Expand Down Expand Up @@ -5219,7 +5219,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#else
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play );
#if BOXMODEL_DM8000
#if BOXMODEL_DM820 || BOXMODEL_DM8000
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_play );
#else
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_pause );
Expand Down
4 changes: 2 additions & 2 deletions src/system/setting_helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ int CDataResetNotifier::exec(CMenuTarget * /*parent*/, const std::string &action
return ret;
}

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if HAVE_DUCKBOX_HARDWARE
void CFanControlNotifier::setSpeed(unsigned int speed)
{
Expand Down Expand Up @@ -698,7 +698,7 @@ void CFanControlNotifier::setSpeed(unsigned int speed)
#else
void CFanControlNotifier::setSpeed(unsigned int __attribute__((unused)) speed)
{
#if defined (BOXMODEL_DM8000)
#if defined (BOXMODEL_DM8000) || defined (BOXMODEL_DM820)
int cfd;
cfd = open("/proc/stb/fp/fan_vlt", O_WRONLY);
if (cfd < 0)
Expand Down
2 changes: 1 addition & 1 deletion src/system/setting_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class CDataResetNotifier : public CMenuTarget
int exec(CMenuTarget *parent, const std::string &actionKey);
};

#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
class CFanControlNotifier : public CChangeObserver
{
public:
Expand Down
2 changes: 1 addition & 1 deletion src/system/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ struct SNeutrinoSettings
int infobar_subchan_disp_pos;
int infobar_buttons_usertitle;
int infobar_analogclock;
#if BOXMODEL_DM8000 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
#if BOXMODEL_DM8000 || BOXMODEL_DM820 || BOXMODEL_UFS922 || BOXMODEL_CUBEREVO || BOXMODEL_CUBEREVO_MINI2 || BOXMODEL_CUBEREVO_250HD || BOXMODEL_CUBEREVO_3000HD || BOXMODEL_IPBOX9900 || BOXMODEL_IPBOX99 || BOXMODEL_VUDUO2 || BOXMODEL_VUULTIMO || BOXMODEL_VUUNO
int fan_speed;
#endif
int infobar_show;
Expand Down
2 changes: 2 additions & 0 deletions src/zapit/src/frontend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,12 @@ void CFrontend::getFEInfo(void)
}
#endif
break;
#if _HAVE_DVB57
case SYS_DTMB:
deliverySystemMask |= DTMB;
printf("[fe%d/%d] add delivery system DTMB (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);
break;
#endif
default:
printf("[fe%d/%d] ERROR: delivery system unknown (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);
continue;
Expand Down

0 comments on commit 32d73d2

Please sign in to comment.