update boxtype

Origin commit data
------------------
Branch: master
Commit: 93dce8ef8b
Author: max_10 <max_10@gmx.de>
Date: 2014-09-29 (Mon, 29 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

acinclude.m4

@@ -307,6 +307,14 @@ AC_ARG_WITH(boxtype,
 			BOXTYPE="duckbox"
 			BOXMODEL="$withval"
 			;;
+		hs7*)
+			BOXTYPE="duckbox"
+			BOXMODEL="$withval"
+			;;
+		dp*)
+			BOXTYPE="duckbox"
+			BOXMODEL="$withval"
+			;;
 		cuberevo*)
 			BOXTYPE="duckbox"
 			BOXMODEL="$withval"
@@ -322,7 +330,7 @@ AC_ARG_WITH(boxtype,
 AC_ARG_WITH(boxmodel,
 	[  --with-boxmodel         valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
                           valid for ipbox: ip200, ip250, ip350, ip400
-                          valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini2, cuberevo_2000hd, tf7700],
+                          valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini2, cuberevo_2000hd, tf7700],
 	[case "${withval}" in
 		dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
 			if test "$BOXTYPE" = "dreambox"; then
@@ -338,7 +346,7 @@ AC_ARG_WITH(boxmodel,
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 			;;
-		ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|cuberevo|cuberevo_mini2|cuberevo_2000hd|tf7700)
+		ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini2|cuberevo_2000hd|tf7700)
 			if test "$BOXTYPE" = "duckbox"; then
 				BOXMODEL="$withval"
 			else
@@ -394,6 +402,12 @@ AM_CONDITIONAL(BOXMODEL_SPARK7162,test "$BOXMODEL" = "spark7162")
 AM_CONDITIONAL(BOXMODEL_ATEVIO7500, test "$BOXMODEL" = "atevio7500")
 AM_CONDITIONAL(BOXMODEL_FORTIS_HDBOX,test "$BOXMODEL" = "fortis_hdbox")
 AM_CONDITIONAL(BOXMODEL_OCTAGON1008,test "$BOXMODEL" = "octagon1008")
+AM_CONDITIONAL(BOXMODEL_HS7110,test "$BOXMODEL" = "hs7110")
+AM_CONDITIONAL(BOXMODEL_HS7810A,test "$BOXMODEL" = "hs7810a")
+AM_CONDITIONAL(BOXMODEL_HS7119,test "$BOXMODEL" = "hs7119")
+AM_CONDITIONAL(BOXMODEL_HS7819,test "$BOXMODEL" = "hs7819")
+AM_CONDITIONAL(BOXMODEL_DP7000,test "$BOXMODEL" = "dp7000")
+
 AM_CONDITIONAL(BOXMODEL_CUBEREVO,test "$BOXMODEL" = "cuberevo")
 AM_CONDITIONAL(BOXMODEL_CUBEREVO_MINI2,test "$BOXMODEL" = "cuberevo_mini2")
 AM_CONDITIONAL(BOXMODEL_CUBEREVO_2000HD,test "$BOXMODEL" = "cuberevo_2000hd")
@@ -449,6 +463,16 @@ elif test "$BOXMODEL" = "fortis_hdbox"; then
 	AC_DEFINE(BOXMODEL_FORTIS_HDBOX, 1, [fortis_hdbox])
 elif test "$BOXMODEL" = "octagon1008"; then
 	AC_DEFINE(BOXMODEL_OCTAGON1008, 1, [octagon1008])
+elif test "$BOXMODEL" = "hs7110"; then
+	AC_DEFINE(BOXMODEL_HS7110, 1, [hs7110])
+elif test "$BOXMODEL" = "hs7810a"; then
+	AC_DEFINE(BOXMODEL_HS7810A, 1, [hs7810a])
+elif test "$BOXMODEL" = "hs7119"; then
+	AC_DEFINE(BOXMODEL_HS7119, 1, [hs7119])
+elif test "$BOXMODEL" = "hs7819"; then
+	AC_DEFINE(BOXMODEL_HS7819, 1, [hs7819])
+elif test "$BOXMODEL" = "dp7000"; then
+	AC_DEFINE(BOXMODEL_DP7000, 1, [dp7000])
 elif test "$BOXMODEL" = "cuberevo"; then
 	AC_DEFINE(BOXMODEL_CUBEREVO, 1, [cuberevo])
 elif test "$BOXMODEL" = "cuberevo_mini2"; then

include/cs_frontpanel.h

@@ -28,6 +28,7 @@
 
 typedef enum {
 #if defined(BOXMODEL_OCTAGON1008)
+	ICON_DOLBY = 0x10,
 	ICON_DTS,
 	ICON_VIDEO,
 	ICON_AUDIO,
@@ -35,30 +36,54 @@ typedef enum {
 	ICON_HDD,
 	ICON_DISC,
 	ICON_DVB,
-	FP_ICON_USB = 0x27,
+	ICON_DVD,
-	FP_ICON_HD = 0x27,
+	ICON_TIME,
+	ICON_TIMER,
+	ICON_CARD,
+	ICON_1,
+	ICON_2,
+	ICON_KEY,
+	ICON_16_9,
+	ICON_USB,
+	ICON_CRYPTED,
+	ICON_PLAY,
+	ICON_REWIND,
+	ICON_PAUSE,
+	ICON_FF,
+	ICON_REC,
+	ICON_ARROW,
+	ICON_COLON1,
+	ICON_COLON2,
+	ICON_COLON3,
+	ICON_MAX,
+	FP_ICON_USB = ICON_USB,
+	FP_ICON_HD = ICON_16_9,
 	FP_ICON_HDD = ICON_HDD,
-	FP_ICON_LOCK = 0x27,
+	FP_ICON_LOCK = ICON_CRYPTED,
-	FP_ICON_BT = 0x27,
+	FP_ICON_BT,
-	FP_ICON_MP3 = 0x27,
+	FP_ICON_MP3,
-	FP_ICON_MUSIC = 0x27,
+	FP_ICON_MUSIC,
-	FP_ICON_DD = 0x27,
+	FP_ICON_DD = ICON_DOLBY,
-	FP_ICON_MAIL = 0x27,
+	FP_ICON_MAIL,
-	FP_ICON_MUTE = 0x27,
+	FP_ICON_MUTE = ICON_TIME,
-	FP_ICON_PLAY = 0x27,
+	FP_ICON_PLAY = ICON_PLAY,
-	FP_ICON_PAUSE = 0x27,
+	FP_ICON_PAUSE = ICON_PAUSE,
-	FP_ICON_FF = 0x27,
+	FP_ICON_FF = ICON_FF,
-	FP_ICON_FR = 0x27,
+	FP_ICON_FR = ICON_REWIND,
-	FP_ICON_REC = 0x27,
+	FP_ICON_REC = ICON_REC,
-	FP_ICON_CLOCK = 0x27,
+	FP_ICON_CLOCK = ICON_TIMER,
+//	FP_ICON_CAM1 = ICON_1,
+	FP_ICON_RADIO = ICON_AUDIO,
+	FP_ICON_TV = ICON_VIDEO,
+	FP_ICON_DOWNLOAD = ICON_LINK,
 #elif defined(BOXMODEL_FORTIS_HDBOX)
-	ICON_STANDBY = 0x10,
+	ICON_USB = 0x10,
+	ICON_STANDBY,
 	ICON_SAT,
 	ICON_REC,
 	ICON_TIMESHIFT,
 	ICON_TIMER,
 	ICON_HD,
-	ICON_USB,
 	ICON_SCRAMBLED,
 	ICON_DOLBY,
 	ICON_MUTE,
@@ -67,7 +92,6 @@ typedef enum {
 	ICON_MP3,
 	ICON_REPEAT,
 	ICON_Play,
-	FP_ICON_PAUSE,
 	ICON_TER,
 	ICON_FILE,
 	ICON_480i,
@@ -77,21 +101,41 @@ typedef enum {
 	ICON_720p,
 	ICON_1080i,
 	ICON_1080p,
-	ICON_Play_1,
+	ICON_Circ0,
+	ICON_Circ1,
+	ICON_Circ2,
+	ICON_Circ3,
+	ICON_Circ4,
+	ICON_Circ5,
+	ICON_Circ6,
+	ICON_Circ7,
+	ICON_Circ8,
+	ICON_COLON1,
+	ICON_COLON2,
+	ICON_COLON3,
+	ICON_COLON4,
+	ICON_TV,
+	ICON_RADIO,
+	ICON_MAX,
 	FP_ICON_USB = ICON_USB,
 	FP_ICON_REC = ICON_REC,
+	FP_ICON_TIMESHIFT = ICON_TIMESHIFT,
 	FP_ICON_CLOCK = ICON_TIMER,
 	FP_ICON_HD = ICON_HD,
 	FP_ICON_LOCK = ICON_SCRAMBLED,
 	FP_ICON_DD = ICON_DOLBY,
 	FP_ICON_MUTE = ICON_MUTE,
+	FP_ICON_BT,
 	FP_ICON_MP3 = ICON_MP3,
 	FP_ICON_PLAY = ICON_Play,
+	FP_ICON_PAUSE,
 	FP_ICON_HDD,
-	FP_ICON_MUSIC,
 	FP_ICON_MAIL,
 	FP_ICON_FF,
 	FP_ICON_FR,
+	FP_ICON_RADIO = ICON_RADIO,
+	FP_ICON_TV = ICON_TV,
+	FP_ICON_MUSIC,
 #elif defined(BOXMODEL_UFS910)
 	FP_ICON_USB = 0x10,
 	FP_ICON_HD,
@@ -127,12 +171,24 @@ typedef enum {
 	FP_ICON_REC,
 	FP_ICON_CLOCK,
 #endif
+#if !defined(FP_ICON_CAM1)
 	FP_ICON_CAM1 = FP_ICON_REC,
+#endif
+#if !defined(FP_ICON_TV)
 	FP_ICON_TV = FP_ICON_MUSIC,
+#endif
+#if !defined(FP_ICON_RADIO)
 	FP_ICON_RADIO = FP_ICON_MUSIC,
+#endif
+#if !defined(FP_ICON_RECORD)
 	FP_ICON_RECORD = FP_ICON_REC,
+#endif
+#if !defined(FP_ICON_DOWNLOAD)
 	FP_ICON_DOWNLOAD,
+#endif
+#if !defined(FP_ICON_TIMESHIFT)
 	FP_ICON_TIMESHIFT,
+#endif
 	FP_ICON_MAX
 } fp_icon;
 

libduckbox/hardware_caps.c

@@ -105,6 +105,51 @@ hw_caps_t *get_hwcaps(void)
 			caps.has_fan = 0;
 			caps.has_CI = 2;
 		}
+		else if (!strncmp(buf, "hs7110", 6)) {
+			strcpy(caps.boxvendor, "DUCKBOX");
+			strcpy(caps.boxname, buf);
+			caps.can_shutdown = 1;
+			caps.has_HDMI = 1;
+			caps.has_SCART = 1;
+			caps.can_cec = 1;
+			caps.has_fan = 0;
+		}
+		else if (!strncmp(buf, "hs7810a", 7)) {
+			strcpy(caps.boxvendor, "DUCKBOX");
+			strcpy(caps.boxname, buf);
+			caps.can_shutdown = 1;
+			caps.has_HDMI = 1;
+			caps.has_SCART = 1;
+			caps.can_cec = 1;
+			caps.has_fan = 0;
+		}
+		else if (!strncmp(buf, "hs7119", 6)) {
+			strcpy(caps.boxvendor, "DUCKBOX");
+			strcpy(caps.boxname, buf);
+			caps.can_shutdown = 1;
+			caps.has_HDMI = 1;
+			caps.has_SCART = 1;
+			caps.can_cec = 1;
+			caps.has_fan = 0;
+		}
+		else if (!strncmp(buf, "hs7819", 6)) {
+			strcpy(caps.boxvendor, "DUCKBOX");
+			strcpy(caps.boxname, buf);
+			caps.can_shutdown = 1;
+			caps.has_HDMI = 1;
+			caps.has_SCART = 1;
+			caps.can_cec = 1;
+			caps.has_fan = 0;
+		}
+		else if (!strncmp(buf, "dp7000", 6)) {
+			strcpy(caps.boxvendor, "DUCKBOX");
+			strcpy(caps.boxname, buf);
+			caps.can_shutdown = 1;
+			caps.has_HDMI = 1;
+			caps.has_SCART = 1;
+			caps.can_cec = 1;
+			caps.has_fan = 0;
+		}
 		else if (!strncmp(buf, "cuberevo", 8)) {
 			strcpy(caps.boxvendor, "DUCKBOX");
 			strcpy(caps.boxname, buf);