Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-06-15 12:32:31 +02:00
43 changed files with 473 additions and 295 deletions

View File

@@ -127,12 +127,16 @@ int CVfdSetup::showSetup()
vfds->addItem(mf);
}
if (CVFD::getInstance()->has_lcd) {
if (g_info.hw_caps->can_set_display_brightness)
{
//vfd brightness menu
mf = new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, this, "brightness", CRCInput::RC_green);
mf->setHint("", LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP);
vfds->addItem(mf);
}
if (CVFD::getInstance()->has_lcd)
{
if (cs_get_revision() == 9) // Tank only
{
//backlight menu