g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 14:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into DimOnIdle

Browse source
This commit is contained in:
phl0 2016-06-24 10:14:38 +02:00
commit 6628a613e8
No known key found for this signature in database
GPG key ID: 48EA1E640798CA9A
10 changed files with 99 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Nextion.cpp
View file

@ -260,10 +260,12 @@ void CNextion::clockInt(unsigned int ms)
int Sec = Time->tm_sec;
char text[50U];
if (strcmp(m_dateformat.c_str(), "English") == 0) {
if (strcmp(m_dateformat.c_str(), "British") == 0) {
::sprintf(text, "t2.txt=\"%02d:%02d:%02d %02d/%02d/%2d\"", Hour, Min, Sec, Day, Month, Year % 100);
} else if (strcmp(m_dateformat.c_str(), "German") == 0) {
::sprintf(text, "t2.txt=\"%02d:%02d:%02d %02d.%02d.%2d\"", Hour, Min, Sec, Day, Month, Year % 100);
} else if (strcmp(m_dateformat.c_str(), "American") == 0) {
::sprintf(text, "t2.txt=\"%02d:%02d:%02d %02d/%02d/%2d\"", Hour, Min, Sec, Month, Day, Year % 100);
}
sendCommand(text);