Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Commit: 4edc580529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)
This commit is contained in:
Michael Liebmann
2016-01-21 01:34:58 +01:00
14 changed files with 115 additions and 67 deletions

View File

@@ -404,8 +404,18 @@ void CVFD::showTime(bool force)
recstatus = tmp_recstatus;
}
void CVFD::showRCLock(int /*duration*/)
void CVFD::showRCLock(int duration)
{
if (!has_lcd)
{
sleep(duration);
return;
}
std::string _text = text;
ShowText(g_Locale->getText(LOCALE_RCLOCK_LOCKED));
sleep(duration);
ShowText(_text.c_str());
}
void CVFD::showVolume(const char vol, const bool force_update)