g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Simon 2016-07-03 10:21:05 +01:00
parent 48c273814c e3a799f21e
commit 9016eb125b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HD44780.cpp
View file

@ -752,7 +752,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

2
Nextion.cpp
View file

@ -246,7 +246,7 @@ void CNextion::clockInt(unsigned int ms)
else
Time = ::localtime(&currentTime);
setlocale(LC_ALL,"");
setlocale(LC_TIME,"");
char text[50U];
strftime(text, 50, "t2.txt=\"%x %X\"", Time);
sendCommand(text);