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

2,3

Browse Source
This commit is contained in:
dimoniche 2019-07-28 11:53:49 +03:00
parent aec63a4b80
commit 03f0ce46f6
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROJECT/app/journal.c
View File

@ -399,7 +399,7 @@ void PrintEventJournalRecordEng(char* str, TEventRecord *record)
GetEventStrEng(&str[strlen(str)], record->event); GetEventStrEng(&str[strlen(str)], record->event);
// íàïå÷àòàåì äîïîëíèòåëüíûå ïîëÿ // íàïå÷àòàåì äîïîëíèòåëüíûå ïîëÿ
if ((record->event >= JOURNAL_EVENT_MONEY_NOTE_POST1) && (record->event <= JOURNAL_EVENT_MONEY_COIN_POST6)) if ((record->event >= JOURNAL_EVENT_MONEY_NOTE_POST1) && (record->event <= JOURNAL_EVENT_MONEY_COIN_VACUUM2))
{ {
sprintf(&str[strlen(str)], "%d rub.", record->data); sprintf(&str[strlen(str)], "%d rub.", record->data);
} }

10
PROJECT/menu/menudesc.c
View File

@ -1563,13 +1563,17 @@ void PrintEventJournalRecord(TEventRecord *record)
if (record->event) if (record->event)
{ // åñòü ñîáûòèå { // åñòü ñîáûòèå
GetEventStr(str_EventNumber, record->event); GetEventStr(str_EventNumber, record->event);
if ((record->event >= JOURNAL_EVENT_MONEY_NOTE_POST1) && (record->event <= JOURNAL_EVENT_MONEY_COIN_POST6)) if ((record->event >= JOURNAL_EVENT_MONEY_NOTE_POST1) && (record->event <= JOURNAL_EVENT_MONEY_NOTE_POST6))
{ {
sprintf(str_EventData, "%d ðóá.ïîñò %d", record->data, record->event%6); sprintf(str_EventData, "%d ðóá.", record->data);
}
else if ((record->event >= JOURNAL_EVENT_MONEY_COIN_POST1) && (record->event <= JOURNAL_EVENT_MONEY_COIN_VACUUM2))
{
sprintf(str_EventData, "%d ðóá.", record->data);
} }
else if ((record->event >= JOURNAL_EVENT_MONEY_BANK_POST1) && (record->event <= JOURNAL_EVENT_MONEY_BANK_POST6)) else if ((record->event >= JOURNAL_EVENT_MONEY_BANK_POST1) && (record->event <= JOURNAL_EVENT_MONEY_BANK_POST6))
{ {
sprintf(str_EventData, "%d ðóá.ïîñò %d", record->data, record->event%6); sprintf(str_EventData, "%d ðóá.", record->data);
} }
else if (record->event == JOURNAL_EVENT_START_SESSION) else if (record->event == JOURNAL_EVENT_START_SESSION)
{ {

2
PROJECT/services/coin.c
View File

@ -270,7 +270,7 @@ void CoinTask(void *p_arg)
{ {
if (last_cash_count[i] == GetCashCount(i)) if (last_cash_count[i] == GetCashCount(i))
{ {
if (labs(OSTimeGet() - last_cash_time[i]) > 500) if (labs(OSTimeGet() - last_cash_time[i]) > 1000)
{ {
PostUserEvent(EVENT_CASH_INSERTED_POST1 + i); PostUserEvent(EVENT_CASH_INSERTED_POST1 + i);
} }

4
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long