Merged branch master into develop

This commit is contained in:
Tony Corbett G0WFV
2016-07-03 11:28:45 +01:00
3 changed files with 19 additions and 18 deletions

View File

@@ -753,7 +753,7 @@ void CHD44780::clockInt(unsigned int ms)
Time = localtime(&currentTime);
}
setlocale(LC_ALL,"");
setlocale(LC_TIME,"");
strftime(m_buffer1, 128, "%X", Time); // Time
strftime(m_buffer2, 128, "%x", Time); // Date