|
@@ -107,14 +107,19 @@ void showWatch()
|
|
*/
|
|
*/
|
|
if (oldTime == Time)
|
|
if (oldTime == Time)
|
|
{
|
|
{
|
|
|
|
+ // Старая секунда
|
|
// time the same, output blank for [HH MM]
|
|
// time the same, output blank for [HH MM]
|
|
|
|
+ MAX7219_writeData(MAX7219_DIGIT2, SYM_BLANK);
|
|
|
|
+ /*
|
|
if (si != 5 || si != 11)
|
|
if (si != 5 || si != 11)
|
|
{
|
|
{
|
|
MAX7219_writeData(MAX7219_DIGIT2, SYM_BLANK);
|
|
MAX7219_writeData(MAX7219_DIGIT2, SYM_BLANK);
|
|
}
|
|
}
|
|
|
|
+ */
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
|
|
+ // Новая секунда
|
|
oldTime = Time;
|
|
oldTime = Time;
|
|
|
|
|
|
if (oldMinute != dt.Minute)
|
|
if (oldMinute != dt.Minute)
|
|
@@ -202,13 +207,13 @@ void showTime(void)
|
|
{
|
|
{
|
|
// уберём ведущий ноль у часов
|
|
// уберём ведущий ноль у часов
|
|
if (dt.Hour >= 9)
|
|
if (dt.Hour >= 9)
|
|
- {
|
|
|
|
- MAX7219_writeData(MAX7219_DIGIT0, dt.Hour / 10);
|
|
|
|
- }
|
|
|
|
|
|
+ {
|
|
|
|
+ MAX7219_writeData(MAX7219_DIGIT0, dt.Hour / 10);
|
|
|
|
+ }
|
|
else
|
|
else
|
|
- {
|
|
|
|
- MAX7219_writeData(MAX7219_DIGIT0, MAX7219_CHAR_BLANK);
|
|
|
|
- }
|
|
|
|
|
|
+ {
|
|
|
|
+ MAX7219_writeData(MAX7219_DIGIT0, MAX7219_CHAR_BLANK);
|
|
|
|
+ }
|
|
MAX7219_writeData(MAX7219_DIGIT1, dt.Hour % 10);
|
|
MAX7219_writeData(MAX7219_DIGIT1, dt.Hour % 10);
|
|
MAX7219_writeData(MAX7219_DIGIT3, dt.Minute / 10);
|
|
MAX7219_writeData(MAX7219_DIGIT3, dt.Minute / 10);
|
|
MAX7219_writeData(MAX7219_DIGIT4, dt.Minute % 10);
|
|
MAX7219_writeData(MAX7219_DIGIT4, dt.Minute % 10);
|
|
@@ -229,7 +234,7 @@ void showTemperature(void)
|
|
*/
|
|
*/
|
|
void showHumidity(void)
|
|
void showHumidity(void)
|
|
{
|
|
{
|
|
- MAX7219_writeData(MAX7219_DIGIT5, SYM_H);
|
|
|
|
|
|
+ MAX7219_writeData(MAX7219_DIGIT5, SYM_H_SM);
|
|
MAX7219_writeData(MAX7219_DIGIT6, (int) (SensorH) / 10);
|
|
MAX7219_writeData(MAX7219_DIGIT6, (int) (SensorH) / 10);
|
|
MAX7219_writeData(MAX7219_DIGIT7, (int) (SensorH) % 10);
|
|
MAX7219_writeData(MAX7219_DIGIT7, (int) (SensorH) % 10);
|
|
}
|
|
}
|