vuultimo4k added

Conflicts:
	acinclude.m4
	data/y-web/Y_Blocks.txt
	src/driver/nglcd.cpp
	src/gui/vfd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b6bf0b1991
Author: max_10 <max_10@gmx.de>
Date: 2019-09-11 (Wed, 11 Sep 2019)

Origin message was:
------------------
- 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 was generated by Migit
This commit is contained in:
max_10
2019-09-11 21:50:36 +02:00
committed by vanhofen
parent 4600295495
commit 12d4b39a82
9 changed files with 991 additions and 8 deletions

View File

@@ -223,7 +223,7 @@ class CRCInput
RC_tv = KEY_TV,
RC_radio = KEY_RADIO,
RC_text = KEY_TEXT,
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
RC_info = 0xFFFE,
RC_epg = KEY_INFO,
#else