From d2ed390c5ea38ab1a649b666e5a25fa5c48784d9 Mon Sep 17 00:00:00 2001
From: Dmitriy <dimoniche@gmail.com>
Date: Fri, 22 Nov 2024 00:03:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BE=D1=82=D1=81=D1=87=D0=B5=D1=82=20=D0=B2=20=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 solarium/solarium.ino | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/solarium/solarium.ino b/solarium/solarium.ino
index 8c1cd28..348a4b1 100644
--- a/solarium/solarium.ino
+++ b/solarium/solarium.ino
@@ -402,7 +402,7 @@ const menu_screen menu_main[] PROGMEM = {
         {0}
       },
       {
-        "     ПАУЗА",
+        "  ВЕНТИЛЯЦИЯ",
         FIXED_LINE,
         {0}
       },
@@ -1109,8 +1109,8 @@ void isButtonHold(byte x)
       return;
   }
 
-  if(!menu_enable)
-  {
+  if(!menu_enable && (all_long_parameters[money_counter] == 0) || (bill_enable == false))
+  {   // в меню входим только если нет внесенных денег и не запрещен прием денег, тк идет работа соляриев
       menu_index = MAIN_MENU;
 
       memcpy_P( &current_menu_screen, &menu_settings[menu_index], sizeof(menu_screen));
@@ -1674,7 +1674,13 @@ void get_money ()
               sprintf(text_parameters[time_delay],"%2d", all_byte_parameters[pause_before]);
               lcd.clear();
               show_menu();
-              delay(all_byte_parameters[pause_before] * 1000);
+
+              for(int i = 0; i < all_byte_parameters[pause_before]; i++)
+              {
+                  delay(1000);
+                  sprintf(text_parameters[time_delay],"%2d", all_byte_parameters[pause_before] - i);
+                  show_menu();
+              }
           }
 
           memcpy_P( &current_menu_screen, &menu_main[SEANCE_SCREEN], sizeof(menu_screen));
@@ -1858,7 +1864,7 @@ void loop()
   hide_cursor();
   need_hide_cursor = true;
 
-  if (menu_enable == true)                          // если флаг menu_enable = ИСТИНА, то входим в меню 
+  if (menu_enable == true)
   {
       menu();
       need_reload_menu = true;
@@ -1866,7 +1872,7 @@ void loop()
   }
   else
   {
-    if (bill_enable == true && menu_enable == false)  
+    if (bill_enable == true && menu_enable == false)
     {
         get_money();
     }