- vuultimo4k added

Conflicts:
	acinclude.m4
	data/y-web/Y_Blocks.txt
	src/driver/nglcd.cpp
	src/gui/vfd_setup.cpp
	src/neutrino.cpp
This commit is contained in:
max_10
2019-10-27 16:24:47 +01:00
committed by Thilo Graf
parent 71288139a5
commit 3e9416eb6d
9 changed files with 990 additions and 7 deletions

View File

@@ -460,7 +460,7 @@ AC_ARG_WITH(boxtype,
AC_ARG_WITH(boxmodel,
AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
AS_HELP_STRING([], [valid for coolstream: hd1, hd2])
AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuzero4k, h7])
AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuzero4k, h7])
AS_HELP_STRING([], [valid for mipsbox: vuduo]),
[case "${withval}" in
generic|raspi)
@@ -489,7 +489,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]),
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuzero4k|h7)
hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuzero4k|h7)
if test "$BOXTYPE" = "armbox"; then
BOXMODEL="$withval"
else
@@ -534,6 +534,7 @@ AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
@@ -582,6 +583,9 @@ elif test "$BOXMODEL" = "vusolo4k"; then
elif test "$BOXMODEL" = "vuduo4k"; then
AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "vuultimo4k"; then
AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "vuzero4k"; then
AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])