Vladimir N. Shilov 1 жил өмнө
parent
commit
ace0da4998
1 өөрчлөгдсөн 18 нэмэгдсэн , 22 устгасан
  1. 18 22
      app/application.cpp

+ 18 - 22
app/application.cpp

@@ -21,7 +21,7 @@ void onTimer_readDHT22();
 Timer procTimer, procRTimer;
 Timer displayTimer, tmpTimer;
 Timer showHighTimer, showLowTimer;
-Timer brightTimer;
+Timer dotTimer;
 // Sensors values
 ahtxx_t sensorData;
 String StrCF;
@@ -37,10 +37,10 @@ void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway);
 
 void showWatch(void);
 void showTime(void);
+void dotOff(void);
 void showTemperature(void);
 void showHumidity(void);
 void showError(void);
-void setBright(void);
 
 // NTP Client
 void onNtpReceive(NtpClient& client, time_t timestamp);
@@ -75,10 +75,9 @@ void init(void) {
 
 	// Low LED output
 	TM1650_Init();
-	brightTimer.initializeMs(1000, setBright).start();
-
+	
 	// refresh big led
-	displayTimer.initializeMs(500, showWatch).start();
+	displayTimer.initializeMs(1000, showWatch).start();
 
 	/* AHTxx Sensor */
 //	AHTxx_Init();
@@ -107,16 +106,10 @@ void showWatch(void) {
 	 * 	int16_t Year;  // Full Year numer
 	 */
 
-	if (oldTime == Time) {
-		// Old Second
-		LED_SemicolonOFF();
-	}	else {
+	if (oldTime != Time) {
 		// New Second
 		oldTime = Time;
-		LED_ShowBin(dt.Hour, dt.Minute);
-//		LED_ShowBin(dt.Minute, dt.Second);
-		LED_SemicolonOn();
-
+		showTime();
 		if (dt.Second == 0x00) {
 			Serial.printf("Time: %02d:%02d:00\r\n", dt.Hour, dt.Minute);
 		}
@@ -140,6 +133,18 @@ void showTime(void) {
 			// ...
 		} // new hour
 	} // new minute
+	TM1650_Out(dt.Hour>>4, dt.Hour&0xf, dt.Minute>>4, dt.Minute&0xf);
+	TM1650_DotSet(Dig_2);
+	TM1650_DotSet(Dig_3);
+
+	dotTimer.initializeMs(500, dotOff);
+	dotTimer.startOnce();
+}
+
+void dotOff(void)
+{
+	TM1650_DotRes(Dig_2);
+	TM1650_DotRes(Dig_3);
 }
 
 /*
@@ -156,7 +161,6 @@ void showTemperature(void)
 	TM1650_Out4(Sym_C);
 }
 
-
 /*
  * Show humidity, small indicators
  */
@@ -188,14 +192,6 @@ void showError(void) {
  		// ...
 }
 
-/*
- * Автоматическая регулировка яркости индикаторов
- * GY-49 (MAX44009)
- */
-void setBright(void) {
-		// ...
-}
-
 /**
  * @brief Get data from Temperature/Humidity Sensor.
  */