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

Таймеры отсчета теперь должны идти

Browse Source
This commit is contained in:
Dmitriy 2023-08-04 03:53:08 +03:00
parent b97232b057
commit 8441e682f6
7 changed files with 5985 additions and 774 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.

5218
Flash/Exe/solarium_3_44.hex Normal file
View File

File diff suppressed because it is too large Load Diff

13
PROJECT/app/app_serv.c
View File

@ -1141,27 +1141,20 @@ void UserPrintFirstMenu(CPU_INT08U recentchannel)
// ïîëó÷èòü âðåìÿ äî îêîí÷àíèÿ çàíÿòîñòè êàíàëà // ïîëó÷èòü âðåìÿ äî îêîí÷àíèÿ çàíÿòîñòè êàíàëà
CPU_INT32U GetChannelsTimeForFree(CPU_INT08U ch) CPU_INT32U GetChannelsTimeForFree(CPU_INT08U ch)
{ {
CPU_INT32U payedtime = ChannelsPayedTime[ch];
CPU_INT32U beforetime = 0;
CPU_INT32U aftertime = 0;
CPU_INT32U res = 0; CPU_INT32U res = 0;
GetData(&TimeOutBeforeDesc, &beforetime, ch, DATA_FLAG_DIRECT_INDEX);
GetData(&TimeOutAfterDesc, &aftertime, ch, DATA_FLAG_DIRECT_INDEX);
aftertime *= 60;
switch (ChannelsState[ch]) switch (ChannelsState[ch])
{ {
case CHANNEL_STATE_EMPTY: case CHANNEL_STATE_EMPTY:
break; break;
case CHANNEL_STATE_PAUSE_BEFORE: case CHANNEL_STATE_PAUSE_BEFORE:
res = beforetime; res = ChannelsCounters[ch];
break; break;
case CHANNEL_STATE_WORK: case CHANNEL_STATE_WORK:
res = payedtime; res = ChannelsCounters[ch];
break; break;
case CHANNEL_STATE_PAUSE_AFTER: case CHANNEL_STATE_PAUSE_AFTER:
res = aftertime; res = ChannelsCounters[ch];
break; break;
} }

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.43" #define DEVICE_FW_VERSION "03.44"
#endif // #ifndef _VERSION_H_ #endif // #ifndef _VERSION_H_

30
settings/solarium.wsdt
View File

File diff suppressed because one or more lines are too long

1492
solarium.dep
View File

File diff suppressed because it is too large Load Diff

4
solarium.ewp
View File

@ -650,7 +650,7 @@
</option> </option>
<option> <option>
<name>OOCOutputFile</name> <name>OOCOutputFile</name>
<state>solarium_3_43.hex</state> <state>solarium_3_44.hex</state>
</option> </option>
<option> <option>
<name>OOCCommandLineProducer</name> <name>OOCCommandLineProducer</name>
@ -668,7 +668,7 @@
<data> <data>
<extensions></extensions> <extensions></extensions>
<cmdline></cmdline> <cmdline></cmdline>
<hasPrio>128</hasPrio> <hasPrio>1</hasPrio>
<buildSequence>inputOutputBased</buildSequence> <buildSequence>inputOutputBased</buildSequence>
</data> </data>
</settings> </settings>