diff --git a/ESPClock.ino b/ESPClock.ino index 5ca028d..09c5123 100644 --- a/ESPClock.ino +++ b/ESPClock.ino @@ -24,7 +24,14 @@ void setup() { matrix.fillScreen(LOW); matrix.write(); - matrix.setIntensity(8); // set brightness + matrix.setIntensity(analogRead(A0)/64); // set brightness + + matrix.drawChar(2,0, 'W', HIGH,LOW,1); // W + matrix.drawChar(8,0, '-', HIGH,LOW,1); // W- + matrix.drawChar(14,0,'L', HIGH,LOW,1); // W-L + matrix.drawChar(20,0,'A', HIGH,LOW,1); // W-LA + matrix.drawChar(26,0,'N', HIGH,LOW,1); // W-LAN + matrix.write(); // Send bitmap to display // Init Wifi WiFi.mode(WIFI_STA); @@ -42,6 +49,35 @@ void setup() { configTime(0, 0, "at.pool.ntp.org", "time.nist.gov"); } + // Display message on OTA update + ArduinoOTA.onStart([]() { + matrix.fillScreen(LOW); + matrix.drawChar(2,0, 'U', HIGH,LOW,1); + matrix.drawChar(8,0, 'p', HIGH,LOW,1); + matrix.drawChar(14,0,'d', HIGH,LOW,1); + matrix.drawChar(20,0,'a', HIGH,LOW,1); + matrix.drawChar(26,0,'t', HIGH,LOW,1); + matrix.drawChar(32,0,'e', HIGH,LOW,1); // Update + matrix.setIntensity(analogRead(A0)/64); + matrix.write(); // Send bitmap to display + }); + + // Use dots to indicate the progress of the OTA update + ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) { + matrix.setIntensity(analogRead(A0)/64); + if (progress/(total/100)>25) { + matrix.drawChar(38,0,'.', HIGH,LOW,1); + matrix.write(); + } + if (progress/(total/100)>50) { + matrix.drawChar(44,0,'.', HIGH,LOW,1); + matrix.write(); + } + if (progress/(total/100)>75) { + matrix.drawChar(50,0,'.', HIGH,LOW,1); + matrix.write(); + } + }); // Init OTA ArduinoOTA.begin(); } @@ -56,21 +92,33 @@ void loop() { matrix.fillScreen(LOW); // clear LEDs - // display date on LED panel - matrix.drawChar(0,0, (timeinfo->tm_mday)/10?'0'+(timeinfo->tm_mday)/10:' ', HIGH,LOW,1); // day of month, blank if zero - matrix.drawChar(6,0, '0'+(timeinfo->tm_mday)%10, HIGH,LOW,1); // day of month - matrix.drawChar(11,0,'.', HIGH,LOW,1); // . - matrix.drawChar(17,0, '0'+(timeinfo->tm_mon+1)/10, HIGH,LOW,1); // month - matrix.drawChar(23,0, '0'+(timeinfo->tm_mon+1)%10, HIGH,LOW,1); // month - matrix.drawChar(28,0,'.', HIGH,LOW,1); - - // display time - matrix.drawChar(36,0, (timeinfo->tm_hour)/10?'0'+(timeinfo->tm_hour)/10:' ', HIGH,LOW,1); // hour, blank if zero - matrix.drawChar(42,0, '0'+(timeinfo->tm_hour)%10, HIGH,LOW,1); // hour - matrix.drawChar(47,0,timeinfo->tm_sec&1?':':' ', HIGH,LOW,1); // blinking : - matrix.drawChar(52,0,'0'+(timeinfo->tm_min)/10, HIGH,LOW,1); // minute - matrix.drawChar(58,0,'0'+(timeinfo->tm_min)%10, HIGH,LOW,1); // minute + if (timeinfo->tm_year==70) { + + matrix.drawChar(2,0, 'T', HIGH,LOW,1); // H + matrix.drawChar(8,0, 'I', HIGH,LOW,1); // HH + matrix.drawChar(14,0,'M', HIGH,LOW,1); // HH: + matrix.drawChar(20,0,'E', HIGH,LOW,1); // HH:M + + } else { + + // display date on LED panel + matrix.drawChar(0,0, (timeinfo->tm_mday)/10?'0'+(timeinfo->tm_mday)/10:' ', HIGH,LOW,1); // day of month, blank if zero + matrix.drawChar(6,0, '0'+(timeinfo->tm_mday)%10, HIGH,LOW,1); // day of month + matrix.drawChar(11,0,'.', HIGH,LOW,1); // . + matrix.drawChar(17,0, '0'+(timeinfo->tm_mon+1)/10, HIGH,LOW,1); // month + matrix.drawChar(23,0, '0'+(timeinfo->tm_mon+1)%10, HIGH,LOW,1); // month + matrix.drawChar(28,0,'.', HIGH,LOW,1); + + // display time + matrix.drawChar(36,0, (timeinfo->tm_hour)/10?'0'+(timeinfo->tm_hour)/10:' ', HIGH,LOW,1); // hour, blank if zero + matrix.drawChar(42,0, '0'+(timeinfo->tm_hour)%10, HIGH,LOW,1); // hour + matrix.drawChar(47,0,timeinfo->tm_sec&1?':':' ', HIGH,LOW,1); // blinking : + matrix.drawChar(52,0,'0'+(timeinfo->tm_min)/10, HIGH,LOW,1); // minute + matrix.drawChar(58,0,'0'+(timeinfo->tm_min)%10, HIGH,LOW,1); // minute + + } + matrix.setIntensity(analogRead(A0)/64); matrix.write(); // Send bitmap to display // Over The Air Update