diff --git a/PROJECT/app/journal.c b/PROJECT/app/journal.c
index 58b60e6..28722ee 100644
--- a/PROJECT/app/journal.c
+++ b/PROJECT/app/journal.c
@@ -399,7 +399,7 @@ void PrintEventJournalRecordEng(char* str, TEventRecord *record)
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);
}
diff --git a/PROJECT/menu/menudesc.c b/PROJECT/menu/menudesc.c
index 1fa47e6..9ccbda1 100644
--- a/PROJECT/menu/menudesc.c
+++ b/PROJECT/menu/menudesc.c
@@ -1563,13 +1563,17 @@ void PrintEventJournalRecord(TEventRecord *record)
if (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))
{
- sprintf(str_EventData, "%d руб.пост %d", record->data, record->event%6);
+ sprintf(str_EventData, "%d руб.", record->data);
}
else if (record->event == JOURNAL_EVENT_START_SESSION)
{
diff --git a/PROJECT/services/coin.c b/PROJECT/services/coin.c
index 961c6a9..ac9ea03 100644
--- a/PROJECT/services/coin.c
+++ b/PROJECT/services/coin.c
@@ -270,7 +270,7 @@ void CoinTask(void *p_arg)
{
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);
}
diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt
index dcc4979..c4a8fb3 100644
--- a/settings/sk-mlpc2368.wsdt
+++ b/settings/sk-mlpc2368.wsdt
@@ -34,7 +34,7 @@
TabID-28963-15244Find in FilesFind-in-FilesTabID-3677-8150Debug LogDebug-Log
- 1
+ 0
TabID-1122-24249
@@ -52,7 +52,7 @@
- TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h05015361536TextEditor$WS_DIR$\PROJECT\menu\menu.c016245484548TextEditor$WS_DIR$\PROJECT\drivers\lcd\lcd.c028669536953TextEditor$WS_DIR$\PROJECT\menu\menu.h06292292TextEditor$WS_DIR$\PROJECT\menu\menudesc.h03622922292TextEditor$WS_DIR$\PROJECT\app\journal.h02418661866TextEditor$WS_DIR$\OS\uc\os_ii\source\os_q.c04342250222502TextEditor$WS_DIR$\PROJECT\services\coin.c03015721589TextEditor$WS_DIR$\PROJECT\data\data.h04011851185TextEditor$WS_DIR$\PROJECT\data\datadesc.c07431733173TextEditor$WS_DIR$\OS\uc\os_ii\source\os_time.c02171031110311TextEditor$WS_DIR$\PROJECT\app\app_serv.c05121785017850TextEditor$WS_DIR$\PROJECT\data\datadesc.h015257355735TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c017958958TextEditor$WS_DIR$\PROJECT\menu\menudesc.c0911369613696125TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08712023620391TextEditor$WS_DIR$\OS\uc\os_ii\port\os_cpu_c.c023199829982TextEditor$WS_DIR$\PROJECT\services\fr.c08622348723487TextEditor$WS_DIR$\PROJECT\services\coin.h03565565TextEditor$WS_DIR$\PROJECT\data\fram_map.h061431430100000010000001
+ TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h05015361536TextEditor$WS_DIR$\PROJECT\menu\menu.c016245484548TextEditor$WS_DIR$\PROJECT\drivers\lcd\lcd.c028669536953TextEditor$WS_DIR$\PROJECT\menu\menu.h06292292TextEditor$WS_DIR$\PROJECT\menu\menudesc.h03622922292TextEditor$WS_DIR$\OS\uc\os_ii\source\os_q.c04342250222502TextEditor$WS_DIR$\PROJECT\services\coin.c03015721589TextEditor$WS_DIR$\PROJECT\data\data.h04011851185TextEditor$WS_DIR$\PROJECT\data\datadesc.c013796481164811TextEditor$WS_DIR$\PROJECT\app\journal.h01818661866TextEditor$WS_DIR$\OS\uc\os_ii\source\os_time.c02171031110311TextEditor$WS_DIR$\PROJECT\app\app_serv.c03261059010590TextEditor$WS_DIR$\PROJECT\data\datadesc.h015257355735TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c03851121811218TextEditor$WS_DIR$\PROJECT\menu\menudesc.c01596637136371325TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08712023620391TextEditor$WS_DIR$\OS\uc\os_ii\port\os_cpu_c.c023199829982TextEditor$WS_DIR$\PROJECT\services\fr.c08622348723487TextEditor$WS_DIR$\PROJECT\services\coin.h03565565TextEditor$WS_DIR$\PROJECT\data\fram_map.h061431430100000010000001