Merge branch 'main' of github.com:rvbglas/esp_clock

[esp-clock.git] / panel.cpp

diff --git a/panel.cpp b/panel.cpp
index a02b52a696ecf355c55518a30cc6a6931bffb198..fc072610656625760e5553278d91628622a93a15 100644 (file)
--- a/panel.cpp
+++ b/panel.cpp
@@ -133,6 +133,7 @@ void drawScroll() {
 
 void message(const char* str, int priority) {
   if (priority > currentPriority) return;
 
 void message(const char* str, int priority) {
   if (priority > currentPriority) return;

+  currentPriority = priority;

   utf8rus(str, msgBuf, 255);
   Panel->displayClear();
   Panel->setFont(RomanCyrillic);
   utf8rus(str, msgBuf, 255);
   Panel->displayClear();
   Panel->setFont(RomanCyrillic);


@@ -143,6 +144,7 @@ void message(const char* str, int priority) {
 
 void message(const __FlashStringHelper*  str, int priority) {
   if (priority > currentPriority) return;
 
 void message(const __FlashStringHelper*  str, int priority) {
   if (priority > currentPriority) return;

+  currentPriority = priority;

   char buf[256];
   strncpy_P(buf, (PGM_P)str, 255);
   utf8rus(buf, msgBuf, 255);
   char buf[256];
   strncpy_P(buf, (PGM_P)str, 255);
   utf8rus(buf, msgBuf, 255);


@@ -155,12 +157,12 @@ void message(const __FlashStringHelper*  str, int priority) {
 
 void messageModal(const char* str) {
   message(str);
 
 void messageModal(const char* str) {
   message(str);

-  while (!(Panel->displayAnimate())) { delay(50); }
+  while (!(Panel->displayAnimate())) { delay(10); }

 }
 
 void messageModal(const __FlashStringHelper*  str) {
   message(str);
 }
 
 void messageModal(const __FlashStringHelper*  str) {
   message(str);

-  while (!(Panel->displayAnimate())) { delay(50); }
+  while (!(Panel->displayAnimate())) { delay(10); }

 }
 
 void scroll(const char* str, bool force) {
 }
 
 void scroll(const char* str, bool force) {