From 32d73d254023e95bda6dfc7dc7c42a2fd8d6ea5a Mon Sep 17 00:00:00 2001 From: BPanther Date: Wed, 15 May 2024 01:43:11 +0200 Subject: [PATCH] mips dm820 added --- acinclude.m4 | 11 +++++++---- src/driver/display.h | 2 +- src/driver/rcinput.h | 4 ++-- src/gui/miscsettings_menu.cpp | 8 ++++---- src/gui/miscsettings_menu.h | 2 +- src/gui/vfd_setup.cpp | 6 +++--- src/neutrino.cpp | 14 +++++++------- src/system/setting_helpers.cpp | 4 ++-- src/system/setting_helpers.h | 2 +- src/system/settings.h | 2 +- src/zapit/src/frontend.cpp | 2 ++ 11 files changed, 31 insertions(+), 26 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 81cbdd96b..24966a190 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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" ;; @@ -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) @@ -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 @@ -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") @@ -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 @@ -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 diff --git a/src/driver/display.h b/src/driver/display.h index c539d1f3d..31dec6f5f 100644 --- a/src/driver/display.h +++ b/src/driver/display.h @@ -3,7 +3,7 @@ #include #endif #if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_DM8000 +#if BOXMODEL_DM8000 || BOXMODEL_DM820 #include #define CVFD CLCD #else diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 60577ab3a..6790cf1d8 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -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 @@ -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 diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 2d406476f..b605b4745 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -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; @@ -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 @@ -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); diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index a2c08e270..6684ecc70 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -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; diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index bb7e6c327..9ca95b87b 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -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; @@ -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 { @@ -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 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index dc34f012f..69d3ca8d5 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 ); diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 09392e8eb..9657187e0 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -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) { @@ -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) diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 8906f2c43..eecc56b86 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -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: diff --git a/src/system/settings.h b/src/system/settings.h index 2fb955e27..4a2bab11b 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -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; diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 6e2a410d9..8d4164945 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -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;