mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-23 10:46:31 +00:00
Merge pull request #14710 from pkkrusty/patch-4
Add seconds to MAX7219 DisplayClock command
This commit is contained in:
commit
58289a59f1
@ -979,6 +979,7 @@ void TM1637ShowTime()
|
|||||||
{
|
{
|
||||||
uint8_t hr = RtcTime.hour;
|
uint8_t hr = RtcTime.hour;
|
||||||
uint8_t mn = RtcTime.minute;
|
uint8_t mn = RtcTime.minute;
|
||||||
|
uint8_t sc = RtcTime.second;
|
||||||
// uint8_t hr = 1;
|
// uint8_t hr = 1;
|
||||||
// uint8_t mn = 0;
|
// uint8_t mn = 0;
|
||||||
char z = ' ';
|
char z = ' ';
|
||||||
@ -994,21 +995,8 @@ void TM1637ShowTime()
|
|||||||
hr = 12;
|
hr = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
char tm[5];
|
char tm[9];
|
||||||
if (hr < 10)
|
snprintf_P(tm, sizeof(tm), PSTR("%c%d%02d%02d"), z, hr, mn, sc);
|
||||||
{
|
|
||||||
if (mn < 10)
|
|
||||||
snprintf(tm, sizeof(tm), PSTR("%c%d0%d"), z, hr, mn);
|
|
||||||
else
|
|
||||||
snprintf(tm, sizeof(tm), PSTR("%c%d%d"), z, hr, mn);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (mn < 10)
|
|
||||||
snprintf(tm, sizeof(tm), PSTR("%d0%d"), hr, mn);
|
|
||||||
else
|
|
||||||
snprintf(tm, sizeof(tm), PSTR("%d%d"), hr, mn);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TM1637 == TM1637Data.display_type)
|
if (TM1637 == TM1637Data.display_type)
|
||||||
{
|
{
|
||||||
@ -1035,7 +1023,8 @@ void TM1637ShowTime()
|
|||||||
{
|
{
|
||||||
for (uint32_t i = 0; i < 4; i++)
|
for (uint32_t i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
if ((millis() % 1000) > 500 && (i == 1))
|
//if ((millis() % 1000) > 500 && (i == 3))
|
||||||
|
if ((i == 1) || (i == 3))
|
||||||
displayMAX7219ASCIIwDot(i, tm[i]);
|
displayMAX7219ASCIIwDot(i, tm[i]);
|
||||||
else
|
else
|
||||||
displayMAX7219ASCII(i, tm[i]);
|
displayMAX7219ASCII(i, tm[i]);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user