Экран если больше 1 солярия

PROJECT/app/app_serv.c

@@ -1117,16 +1117,32 @@ void UserPrintFirstMenu(CPU_INT08U recentchannel)
   GetDataStr(&NameChannelDesc, (CPU_INT08U*)buf, recentchannel, DATA_FLAG_DIRECT_INDEX);
   sprintf(&buf[strlen(buf)], " %d", recentchannel+1);
   PrintUserMenuStr(buf, 0);
+  
   CPU_INT32U price=1, time=0;
   GetRecentChannelPrice(recentchannel, &price, &time);
   sprintf(buf, "ÖÅÍÀ %dðóá./%dìèí.", price, time);
   PrintUserMenuStr(buf, 1);
+
   if (IsChannelOn(recentchannel))
     {
-      sprintf(buf, "ÂÛÁÅĞÈÒÅ ÄĞ.ÊÀÍÀË");
-      PrintUserMenuStr(buf, 2);
-      sprintf(buf, "ÎÑÒÀËÎÑb: ");
-      PrintSecToHourMinSec(&buf[strlen(buf)], GetChannelsTimeForFree(recentchannel));
+          switch (ChannelsState[recentchannel])
+          {
+            case CHANNEL_STATE_EMPTY:
+              break;
+            case CHANNEL_STATE_PAUSE_BEFORE:
+              sprintf(buf, "ÍŔ×ŔËÎ ŃĹŔÍŃŔ:");
+              break;
+            case CHANNEL_STATE_WORK:
+              sprintf(buf, "ČÄĹŇ ŃĹŔÍŃ ÇŔĂŔĐŔ:");
+              break;
+            case CHANNEL_STATE_PAUSE_AFTER:
+              sprintf(buf, "ÂĹÍŇČËßÖČß:");
+              break;
+          }
+          PrintUserMenuStr(buf, 2);
+
+          PrintSecToMinSec(buf, GetChannelsTimeForFree(recentchannel));
+          PrintUserMenuStr(buf, 3);
     }
   else
     {
@@ -1134,8 +1150,8 @@ void UserPrintFirstMenu(CPU_INT08U recentchannel)
       PrintUserMenuStr(buf, 2);
       sprintf(buf, "È ÍÀÆÌÈÒÅ ");
       GetDataStr(&StartButtonNameDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
+      PrintUserMenuStr(buf, 3);
     }
-  PrintUserMenuStr(buf, 3);
 }
 
 // ïîëó÷èòü âðåìÿ äî îêîí÷àíèÿ çàíÿòîñòè êàíàëà

PROJECT/version.h

@@ -1,7 +1,7 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define   DEVICE_FW_VERSION   "03.44"
+#define   DEVICE_FW_VERSION   "03.45"
 
 
 #endif // #ifndef _VERSION_H_

solarium.ewp

@@ -650,7 +650,7 @@
                 </option>
                 <option>
                     <name>OOCOutputFile</name>
-                    <state>solarium_3_44.hex</state>
+                    <state>solarium_3_45.hex</state>
                 </option>
                 <option>
                     <name>OOCCommandLineProducer</name>