dimoniche/solarium
1
0
Fork 0
mirror of https://github.com/dimoniche/solarium.git synced 2026-01-30 01:43:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dmitriy 2023-08-22 00:08:43 +03:00
parent 8441e682f6
commit 067e029937
7 changed files with 5959 additions and 724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Flash/Exe/solarium.out
View File

Binary file not shown.

5219
Flash/Exe/solarium_3_45.hex Normal file
View File

File diff suppressed because it is too large Load Diff

24
PROJECT/app/app_serv.c
View File

@ -1117,16 +1117,32 @@ void UserPrintFirstMenu(CPU_INT08U recentchannel)
GetDataStr(&NameChannelDesc, (CPU_INT08U*)buf, recentchannel, DATA_FLAG_DIRECT_INDEX); GetDataStr(&NameChannelDesc, (CPU_INT08U*)buf, recentchannel, DATA_FLAG_DIRECT_INDEX);
sprintf(&buf[strlen(buf)], " %d", recentchannel+1); sprintf(&buf[strlen(buf)], " %d", recentchannel+1);
PrintUserMenuStr(buf, 0); PrintUserMenuStr(buf, 0);
CPU_INT32U price=1, time=0; CPU_INT32U price=1, time=0;
GetRecentChannelPrice(recentchannel, &price, &time); GetRecentChannelPrice(recentchannel, &price, &time);
sprintf(buf, "ÖÅÍÀ %dðóá./%dìèí.", price, time); sprintf(buf, "ÖÅÍÀ %dðóá./%dìèí.", price, time);
PrintUserMenuStr(buf, 1); PrintUserMenuStr(buf, 1);
if (IsChannelOn(recentchannel)) if (IsChannelOn(recentchannel))
{ {
sprintf(buf, "ÂÛÁÅĞÈÒÅ ÄĞ.ÊÀÍÀË"); 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); PrintUserMenuStr(buf, 2);
sprintf(buf, "ÎÑÒÀËÎÑb: ");
PrintSecToHourMinSec(&buf[strlen(buf)], GetChannelsTimeForFree(recentchannel)); PrintSecToMinSec(buf, GetChannelsTimeForFree(recentchannel));
PrintUserMenuStr(buf, 3);
} }
else else
{ {
@ -1134,9 +1150,9 @@ void UserPrintFirstMenu(CPU_INT08U recentchannel)
PrintUserMenuStr(buf, 2); PrintUserMenuStr(buf, 2);
sprintf(buf, "È ÍÀÆÌÈÒÅ "); sprintf(buf, "È ÍÀÆÌÈÒÅ ");
GetDataStr(&StartButtonNameDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX); GetDataStr(&StartButtonNameDesc, (CPU_INT08U*)&buf[strlen(buf)], 0, DATA_FLAG_SYSTEM_INDEX);
}
PrintUserMenuStr(buf, 3); PrintUserMenuStr(buf, 3);
} }
}
// ïîëó÷èòü âðåìÿ äî îêîí÷àíèÿ çàíÿòîñòè êàíàëà // ïîëó÷èòü âðåìÿ äî îêîí÷àíèÿ çàíÿòîñòè êàíàëà
CPU_INT32U GetChannelsTimeForFree(CPU_INT08U ch) CPU_INT32U GetChannelsTimeForFree(CPU_INT08U ch)

2
PROJECT/version.h
View File

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

38
settings/solarium.wsdt
View File

File diff suppressed because one or more lines are too long

1396
solarium.dep
View File

File diff suppressed because it is too large Load Diff

2
solarium.ewp
View File

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